104596 2012-12-10 14:21:54 -0800 REGRESSION(r136817): This patch was an unnecessarily complex solution to handling conversion of union types. (Requested by mpruett on #webkit). 2012-12-10 14:32:47 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96614 1 webkit.review.bot webkit.review.bot haraken jsbell michael sam oldest_to_newest 787715 0 webkit.review.bot 2012-12-10 14:21:54 -0800 http://trac.webkit.org/changeset/136817 broke the build: This patch was an unnecessarily complex solution to handling conversion of union types. (Requested by mpruett on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 787716 1 178633 webkit.review.bot 2012-12-10 14:22:34 -0800 Created attachment 178633 ROLLOUT of r136817 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 787719 2 178633 webkit.review.bot 2012-12-10 14:32:43 -0800 Comment on attachment 178633 ROLLOUT of r136817 Clearing flags on attachment: 178633 Committed r137207: <http://trac.webkit.org/changeset/137207> 787720 3 webkit.review.bot 2012-12-10 14:32:47 -0800 All reviewed patches have been landed. Closing bug. 178633 2012-12-10 14:22:34 -0800 2012-12-10 14:32:43 -0800 ROLLOUT of r136817 bug-104596-20121210222853.patch text/plain 13665 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTg0NWFmNjQ2ZDg5Mjk0 NTY4NjdiNjIwNWQ5NjM3OGQwZjRlOGYyZi4uNThiZjY0MWZiNDIxNWVmMjM3ZDllMDQ2MDZlMGYy ODlmNjRiMDc4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTEyLTEwICBTaGVy aWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KKworICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMTM2ODE3LgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC8xMzY4MTcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwNDU5NgorCisgICAgICAgIFRoaXMgcGF0Y2ggd2FzIGFuIHVubmVjZXNzYXJp bHkgY29tcGxleCBzb2x1dGlvbiB0byBoYW5kbGluZworICAgICAgICBjb252ZXJzaW9uIG9mIHVu aW9uIHR5cGVzLiAoUmVxdWVzdGVkIGJ5IG1wcnVldHQgb24gI3dlYmtpdCkuCisKKyAgICAgICAg KiBiaW5kaW5ncy9qcy9KU0RpY3Rpb25hcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNEaWN0 aW9uYXJ5Ojpjb252ZXJ0VmFsdWUpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRGljdGlvbmFy eS5oOgorICAgICAgICAoV2ViQ29yZTo6SlNEaWN0aW9uYXJ5Ojp0cnlHZXRQcm9wZXJ0eUFuZFJl c3VsdCk6CisKIDIwMTItMTItMTAgIFRhYiBBdGtpbnMgIDxqYWNrYWxtYWdlQGdtYWlsLmNvbT4K IAogICAgICAgICBEZXByZWNhdGUgcHJlZml4ZWQgbGluZWFyLWdyYWRpZW50IGFuZCByYWRpYWwt Z3JhZGllbnQgZnVuY3Rpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0RpY3Rpb25hcnkuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNEaWN0aW9u YXJ5LmNwcAppbmRleCBkOTM5YjAyN2U1ZWZmYzk3NzhlODQ3YzgzMTM2YTQ0MzVlNTYyMGYyLi40 ZTJkZDRjNmE5MjBjNmJmMGM5ZjU5Y2QxZjVlNjkyODY5ODMxNDE3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RpY3Rpb25hcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTRGljdGlvbmFyeS5jcHAKQEAgLTY4LDE4MiArNjgsMTUyIEBAIEpT RGljdGlvbmFyeTo6R2V0UHJvcGVydHlSZXN1bHQgSlNEaWN0aW9uYXJ5Ojp0cnlHZXRQcm9wZXJ0 eShjb25zdCBjaGFyKiBwcm9wZXJ0CiAgICAgcmV0dXJuIFByb3BlcnR5Rm91bmQ7CiB9CiAKLWJv b2wgSlNEaWN0aW9uYXJ5Ojpjb252ZXJ0VmFsdWUoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZh bHVlLCBib29sJiByZXN1bHQpCit2b2lkIEpTRGljdGlvbmFyeTo6Y29udmVydFZhbHVlKEV4ZWNT dGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgYm9vbCYgcmVzdWx0KQogewogICAgIHJlc3VsdCA9 IHZhbHVlLnRvQm9vbGVhbihleGVjKTsKLSAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBKU0Rp Y3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIGlu dCYgcmVzdWx0KQordm9pZCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVjU3RhdGUqIGV4 ZWMsIEpTVmFsdWUgdmFsdWUsIGludCYgcmVzdWx0KQogewogICAgIHJlc3VsdCA9IHZhbHVlLnRv SW50MzIoZXhlYyk7Ci0gICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgSlNEaWN0aW9uYXJ5Ojpj b252ZXJ0VmFsdWUoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVlLCB1bnNpZ25lZCYgcmVz dWx0KQordm9pZCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIEpT VmFsdWUgdmFsdWUsIHVuc2lnbmVkJiByZXN1bHQpCiB7CiAgICAgcmVzdWx0ID0gdmFsdWUudG9V SW50MzIoZXhlYyk7Ci0gICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgSlNEaWN0aW9uYXJ5Ojpj b252ZXJ0VmFsdWUoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVlLCB1bnNpZ25lZCBzaG9y dCYgcmVzdWx0KQordm9pZCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVjU3RhdGUqIGV4 ZWMsIEpTVmFsdWUgdmFsdWUsIHVuc2lnbmVkIHNob3J0JiByZXN1bHQpCiB7CiAgICAgcmVzdWx0 ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQgc2hvcnQ+KHZhbHVlLnRvVUludDMyKGV4ZWMpKTsKLSAg ICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVj U3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIHVuc2lnbmVkIGxvbmcmIHJlc3VsdCkKK3ZvaWQg SlNEaWN0aW9uYXJ5Ojpjb252ZXJ0VmFsdWUoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVl LCB1bnNpZ25lZCBsb25nJiByZXN1bHQpCiB7CiAgICAgcmVzdWx0ID0gc3RhdGljX2Nhc3Q8dW5z aWduZWQgbG9uZz4odmFsdWUudG9VSW50MzIoZXhlYykpOwotICAgIHJldHVybiB0cnVlOwogfQog Ci1ib29sIEpTRGljdGlvbmFyeTo6Y29udmVydFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1 ZSB2YWx1ZSwgdW5zaWduZWQgbG9uZyBsb25nJiByZXN1bHQpCit2b2lkIEpTRGljdGlvbmFyeTo6 Y29udmVydFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgdW5zaWduZWQgbG9u ZyBsb25nJiByZXN1bHQpCiB7CiAgICAgZG91YmxlIGQgPSB2YWx1ZS50b051bWJlcihleGVjKTsK ICAgICBkb3VibGVUb0ludGVnZXIoZCwgcmVzdWx0KTsKLSAgICByZXR1cm4gdHJ1ZTsKIH0KIAot Ym9vbCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUg dmFsdWUsIGRvdWJsZSYgcmVzdWx0KQordm9pZCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShF eGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIGRvdWJsZSYgcmVzdWx0KQogewogICAgIHJl c3VsdCA9IHZhbHVlLnRvTnVtYmVyKGV4ZWMpOwotICAgIHJldHVybiB0cnVlOwogfQogCi1ib29s IEpTRGljdGlvbmFyeTo6Y29udmVydFZhbHVlKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBKU0M6OkpT VmFsdWUgdmFsdWUsIERpY3Rpb25hcnkmIHJlc3VsdCkKK3ZvaWQgSlNEaWN0aW9uYXJ5Ojpjb252 ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqIGV4ZWMsIEpTQzo6SlNWYWx1ZSB2YWx1ZSwgRGljdGlv bmFyeSYgcmVzdWx0KQogewogICAgIHJlc3VsdCA9IERpY3Rpb25hcnkoZXhlYywgdmFsdWUpOwot ICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEpTRGljdGlvbmFyeTo6Y29udmVydFZhbHVlKEV4 ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgU3RyaW5nJiByZXN1bHQpCit2b2lkIEpTRGlj dGlvbmFyeTo6Y29udmVydFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgU3Ry aW5nJiByZXN1bHQpCiB7CiAgICAgcmVzdWx0ID0gdmFsdWUudG9TdHJpbmcoZXhlYyktPnZhbHVl KGV4ZWMpOwotICAgIHJldHVybiAhZXhlYy0+aGFkRXhjZXB0aW9uKCk7CiB9CiAKLWJvb2wgSlNE aWN0aW9uYXJ5Ojpjb252ZXJ0VmFsdWUoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBW ZWN0b3I8U3RyaW5nPiYgcmVzdWx0KQordm9pZCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShF eGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIFZlY3RvcjxTdHJpbmc+JiByZXN1bHQpCiB7 CiAgICAgaWYgKHZhbHVlLmlzVW5kZWZpbmVkT3JOdWxsKCkpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQotICAgIGlmICghdmFsdWUuaXNPYmplY3QoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgIEpTT2JqZWN0KiBvYmplY3QgPSBhc09iamVjdCh2YWx1ZSk7Ci0gICAgaWYgKCFpc0pTQXJy YXkob2JqZWN0KSAmJiAhb2JqZWN0LT5pbmhlcml0cygmSlNBcnJheTo6c19pbmZvKSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm47CiAKICAgICB1bnNpZ25lZCBsZW5ndGgg PSAwOwotICAgIG9iamVjdCA9IHRvSlNTZXF1ZW5jZShleGVjLCB2YWx1ZSwgbGVuZ3RoKTsKKyAg ICBKU09iamVjdCogb2JqZWN0ID0gdG9KU1NlcXVlbmNlKGV4ZWMsIHZhbHVlLCBsZW5ndGgpOwog ICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICByZXR1cm47CiAKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwIDsgaSA8IGxlbmd0aDsgKytp KSB7CiAgICAgICAgIEpTVmFsdWUgaXRlbVZhbHVlID0gb2JqZWN0LT5nZXQoZXhlYywgaSk7CiAg ICAgICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgcmVzdWx0LmFwcGVuZChpdGVtVmFsdWUu dG9TdHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMpKTsKICAgICB9Ci0KLSAgICByZXR1cm4gIWV4ZWMt PmhhZEV4Y2VwdGlvbigpOwogfQogCi1ib29sIEpTRGljdGlvbmFyeTo6Y29udmVydFZhbHVlKEV4 ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgU2NyaXB0VmFsdWUmIHJlc3VsdCkKK3ZvaWQg SlNEaWN0aW9uYXJ5Ojpjb252ZXJ0VmFsdWUoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVl LCBTY3JpcHRWYWx1ZSYgcmVzdWx0KQogewogICAgIHJlc3VsdCA9IFNjcmlwdFZhbHVlKGV4ZWMt Pmdsb2JhbERhdGEoKSwgdmFsdWUpOwotICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEpTRGlj dGlvbmFyeTo6Y29udmVydFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUmVm UHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4mIHJlc3VsdCkKK3ZvaWQgSlNEaWN0aW9uYXJ5Ojpj b252ZXJ0VmFsdWUoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBSZWZQdHI8U2VyaWFs aXplZFNjcmlwdFZhbHVlPiYgcmVzdWx0KQogewogICAgIHJlc3VsdCA9IFNlcmlhbGl6ZWRTY3Jp cHRWYWx1ZTo6Y3JlYXRlKGV4ZWMsIHZhbHVlLCAwLCAwKTsKLSAgICByZXR1cm4gIWV4ZWMtPmhh ZEV4Y2VwdGlvbigpOwogfQogCi1ib29sIEpTRGljdGlvbmFyeTo6Y29udmVydFZhbHVlKEV4ZWNT dGF0ZSosIEpTVmFsdWUgdmFsdWUsIFJlZlB0cjxET01XaW5kb3c+JiByZXN1bHQpCit2b2lkIEpT RGljdGlvbmFyeTo6Y29udmVydFZhbHVlKEV4ZWNTdGF0ZSosIEpTVmFsdWUgdmFsdWUsIFJlZlB0 cjxET01XaW5kb3c+JiByZXN1bHQpCiB7CiAgICAgcmVzdWx0ID0gdG9ET01XaW5kb3codmFsdWUp OwotICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEpTRGljdGlvbmFyeTo6Y29udmVydFZhbHVl KEV4ZWNTdGF0ZSosIEpTVmFsdWUgdmFsdWUsIFJlZlB0cjxFdmVudFRhcmdldD4mIHJlc3VsdCkK K3ZvaWQgSlNEaWN0aW9uYXJ5Ojpjb252ZXJ0VmFsdWUoRXhlY1N0YXRlKiwgSlNWYWx1ZSB2YWx1 ZSwgUmVmUHRyPEV2ZW50VGFyZ2V0PiYgcmVzdWx0KQogewogICAgIHJlc3VsdCA9IHRvRXZlbnRU YXJnZXQodmFsdWUpOwotICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEpTRGljdGlvbmFyeTo6 Y29udmVydFZhbHVlKEV4ZWNTdGF0ZSosIEpTVmFsdWUgdmFsdWUsIFJlZlB0cjxOb2RlPiYgcmVz dWx0KQordm9pZCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVjU3RhdGUqLCBKU1ZhbHVl IHZhbHVlLCBSZWZQdHI8Tm9kZT4mIHJlc3VsdCkKIHsKICAgICByZXN1bHQgPSB0b05vZGUodmFs dWUpOwotICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEpTRGljdGlvbmFyeTo6Y29udmVydFZh bHVlKEV4ZWNTdGF0ZSosIEpTVmFsdWUgdmFsdWUsIFJlZlB0cjxTdG9yYWdlPiYgcmVzdWx0KQor dm9pZCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVjU3RhdGUqLCBKU1ZhbHVlIHZhbHVl LCBSZWZQdHI8U3RvcmFnZT4mIHJlc3VsdCkKIHsKICAgICByZXN1bHQgPSB0b1N0b3JhZ2UodmFs dWUpOwotICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEpTRGljdGlvbmFyeTo6Y29udmVydFZh bHVlKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgTWVzc2FnZVBvcnRBcnJheSYgcmVz dWx0KQordm9pZCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIEpT VmFsdWUgdmFsdWUsIE1lc3NhZ2VQb3J0QXJyYXkmIHJlc3VsdCkKIHsKICAgICBBcnJheUJ1ZmZl ckFycmF5IGFycmF5QnVmZmVyczsKICAgICBmaWxsTWVzc2FnZVBvcnRBcnJheShleGVjLCB2YWx1 ZSwgcmVzdWx0LCBhcnJheUJ1ZmZlcnMpOwotICAgIHJldHVybiB0cnVlOwogfQogCiAjaWYgRU5B QkxFKFZJREVPX1RSQUNLKQotYm9vbCBKU0RpY3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVjU3Rh dGUqLCBKU1ZhbHVlIHZhbHVlLCBSZWZQdHI8VHJhY2tCYXNlPiYgcmVzdWx0KQordm9pZCBKU0Rp Y3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShFeGVjU3RhdGUqLCBKU1ZhbHVlIHZhbHVlLCBSZWZQdHI8 VHJhY2tCYXNlPiYgcmVzdWx0KQogewogICAgIHJlc3VsdCA9IHRvVHJhY2sodmFsdWUpOwotICAg IHJldHVybiB0cnVlOwogfQogI2VuZGlmCiAKICNpZiBFTkFCTEUoTVVUQVRJT05fT0JTRVJWRVJT KSB8fCBFTkFCTEUoV0VCX0lOVEVOVFMpCi1ib29sIEpTRGljdGlvbmFyeTo6Y29udmVydFZhbHVl KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgSGFzaFNldDxBdG9taWNTdHJpbmc+JiBy ZXN1bHQpCit2b2lkIEpTRGljdGlvbmFyeTo6Y29udmVydFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywg SlNWYWx1ZSB2YWx1ZSwgSGFzaFNldDxBdG9taWNTdHJpbmc+JiByZXN1bHQpCiB7CiAgICAgcmVz dWx0LmNsZWFyKCk7CiAKICAgICBpZiAodmFsdWUuaXNVbmRlZmluZWRPck51bGwoKSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm47CiAKICAgICB1bnNpZ25lZCBsZW5ndGgg PSAwOwogICAgIEpTT2JqZWN0KiBvYmplY3QgPSB0b0pTU2VxdWVuY2UoZXhlYywgdmFsdWUsIGxl bmd0aCk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQotICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgIHJldHVybjsKIAogICAgIGZvciAodW5zaWduZWQgaSA9IDAgOyBpIDwgbGVu Z3RoOyArK2kpIHsKICAgICAgICAgSlNWYWx1ZSBpdGVtVmFsdWUgPSBvYmplY3QtPmdldChleGVj LCBpKTsKICAgICAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQotICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICByZXN1bHQuYWRkKGl0ZW1W YWx1ZS50b1N0cmluZyhleGVjKS0+dmFsdWUoZXhlYykpOwogICAgIH0KLQotICAgIHJldHVybiAh ZXhlYy0+aGFkRXhjZXB0aW9uKCk7CiB9CiAjZW5kaWYKIAotYm9vbCBKU0RpY3Rpb25hcnk6OmNv bnZlcnRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIEFycmF5VmFsdWUmIHJl c3VsdCkKK3ZvaWQgSlNEaWN0aW9uYXJ5Ojpjb252ZXJ0VmFsdWUoRXhlY1N0YXRlKiBleGVjLCBK U1ZhbHVlIHZhbHVlLCBBcnJheVZhbHVlJiByZXN1bHQpCiB7CiAgICAgaWYgKHZhbHVlLmlzVW5k ZWZpbmVkT3JOdWxsKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuOwog CiAgICAgcmVzdWx0ID0gQXJyYXlWYWx1ZShleGVjLCB2YWx1ZSk7Ci0gICAgcmV0dXJuIHRydWU7 CiB9CiAKLWJvb2wgSlNEaWN0aW9uYXJ5Ojpjb252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqLCBK U0M6OkpTVmFsdWUgdmFsdWUsIFJlZlB0cjxVaW50OEFycmF5PiYgcmVzdWx0KQordm9pZCBKU0Rp Y3Rpb25hcnk6OmNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSB2YWx1 ZSwgUmVmUHRyPFVpbnQ4QXJyYXk+JiByZXN1bHQpCiB7CiAgICAgcmVzdWx0ID0gdG9VaW50OEFy cmF5KHZhbHVlKTsKLSAgICByZXR1cm4gdHJ1ZTsKIH0KIAogI2lmIEVOQUJMRShFTkNSWVBURURf TUVESUEpCi1ib29sIEpTRGljdGlvbmFyeTo6Y29udmVydFZhbHVlKEpTQzo6RXhlY1N0YXRlKiwg SlNDOjpKU1ZhbHVlIHZhbHVlLCBSZWZQdHI8TWVkaWFLZXlFcnJvcj4mIHJlc3VsdCkKK3ZvaWQg SlNEaWN0aW9uYXJ5Ojpjb252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUg dmFsdWUsIFJlZlB0cjxNZWRpYUtleUVycm9yPiYgcmVzdWx0KQogewogICAgIHJlc3VsdCA9IHRv TWVkaWFLZXlFcnJvcih2YWx1ZSk7Ci0gICAgcmV0dXJuIHRydWU7CiB9CiAjZW5kaWYKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNEaWN0aW9uYXJ5LmggYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RpY3Rpb25hcnkuaAppbmRleCBlOTZiYThjOTBhNzVm NmMzNjQ3YWUyODFjODE3YWRkM2MxODIzNjMyLi5lMTdmODY4ZmMwOWE0Njg2NzYxZjAzNDNiNzVl NDZjNWQ5YjA3YWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0Rp Y3Rpb25hcnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RpY3Rpb25hcnku aApAQCAtODEsNDEgKzgxLDQwIEBAIHByaXZhdGU6CiAgICAgZW51bSBHZXRQcm9wZXJ0eVJlc3Vs dCB7CiAgICAgICAgIEV4Y2VwdGlvblRocm93biwKICAgICAgICAgTm9Qcm9wZXJ0eUZvdW5kLAot ICAgICAgICBQcm9wZXJ0eUZvdW5kLAotICAgICAgICBDb252ZXJzaW9uRmFpbGVkCisgICAgICAg IFByb3BlcnR5Rm91bmQKICAgICB9OwogICAgIAogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBULCB0 eXBlbmFtZSBSZXN1bHQ+CiAgICAgR2V0UHJvcGVydHlSZXN1bHQgdHJ5R2V0UHJvcGVydHlBbmRS ZXN1bHQoY29uc3QgY2hhciogcHJvcGVydHlOYW1lLCBUKiBjb250ZXh0LCB2b2lkICgqc2V0dGVy KShUKiBjb250ZXh0LCBjb25zdCBSZXN1bHQmKSkgY29uc3Q7CiAgICAgR2V0UHJvcGVydHlSZXN1 bHQgdHJ5R2V0UHJvcGVydHkoY29uc3QgY2hhciogcHJvcGVydHlOYW1lLCBKU0M6OkpTVmFsdWUm KSBjb25zdDsKIAotICAgIHN0YXRpYyBib29sIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSos IEpTQzo6SlNWYWx1ZSwgYm9vbCYgcmVzdWx0KTsKLSAgICBzdGF0aWMgYm9vbCBjb252ZXJ0VmFs dWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIGludCYgcmVzdWx0KTsKLSAgICBzdGF0 aWMgYm9vbCBjb252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIHVuc2ln bmVkJiByZXN1bHQpOwotICAgIHN0YXRpYyBib29sIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0 ZSosIEpTQzo6SlNWYWx1ZSwgdW5zaWduZWQgc2hvcnQmIHJlc3VsdCk7Ci0gICAgc3RhdGljIGJv b2wgY29udmVydFZhbHVlKEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlLCB1bnNpZ25lZCBs b25nJiByZXN1bHQpOwotICAgIHN0YXRpYyBib29sIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0 ZSosIEpTQzo6SlNWYWx1ZSwgdW5zaWduZWQgbG9uZyBsb25nJiByZXN1bHQpOwotICAgIHN0YXRp YyBib29sIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSwgZG91Ymxl JiByZXN1bHQpOwotICAgIHN0YXRpYyBib29sIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSos IEpTQzo6SlNWYWx1ZSwgRGljdGlvbmFyeSYgcmVzdWx0KTsKLSAgICBzdGF0aWMgYm9vbCBjb252 ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIFN0cmluZyYgcmVzdWx0KTsK LSAgICBzdGF0aWMgYm9vbCBjb252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFs dWUsIFNjcmlwdFZhbHVlJiByZXN1bHQpOwotICAgIHN0YXRpYyBib29sIGNvbnZlcnRWYWx1ZShK U0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSwgVmVjdG9yPFN0cmluZz4mIHJlc3VsdCk7Ci0g ICAgc3RhdGljIGJvb2wgY29udmVydFZhbHVlKEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVl LCBSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiYgcmVzdWx0KTsKLSAgICBzdGF0aWMgYm9v bCBjb252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIFJlZlB0cjxET01X aW5kb3c+JiByZXN1bHQpOwotICAgIHN0YXRpYyBib29sIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNT dGF0ZSosIEpTQzo6SlNWYWx1ZSwgUmVmUHRyPEV2ZW50VGFyZ2V0PiYgcmVzdWx0KTsKLSAgICBz dGF0aWMgYm9vbCBjb252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIFJl ZlB0cjxOb2RlPiYgcmVzdWx0KTsKLSAgICBzdGF0aWMgYm9vbCBjb252ZXJ0VmFsdWUoSlNDOjpF eGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIFJlZlB0cjxTdG9yYWdlPiYgcmVzdWx0KTsKLSAgICBz dGF0aWMgYm9vbCBjb252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIE1l c3NhZ2VQb3J0QXJyYXkmIHJlc3VsdCk7CisgICAgc3RhdGljIHZvaWQgY29udmVydFZhbHVlKEpT Qzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlLCBib29sJiByZXN1bHQpOworICAgIHN0YXRpYyB2 b2lkIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSwgaW50JiByZXN1 bHQpOworICAgIHN0YXRpYyB2b2lkIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6 SlNWYWx1ZSwgdW5zaWduZWQmIHJlc3VsdCk7CisgICAgc3RhdGljIHZvaWQgY29udmVydFZhbHVl KEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlLCB1bnNpZ25lZCBzaG9ydCYgcmVzdWx0KTsK KyAgICBzdGF0aWMgdm9pZCBjb252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFs dWUsIHVuc2lnbmVkIGxvbmcmIHJlc3VsdCk7CisgICAgc3RhdGljIHZvaWQgY29udmVydFZhbHVl KEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlLCB1bnNpZ25lZCBsb25nIGxvbmcmIHJlc3Vs dCk7CisgICAgc3RhdGljIHZvaWQgY29udmVydFZhbHVlKEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpK U1ZhbHVlLCBkb3VibGUmIHJlc3VsdCk7CisgICAgc3RhdGljIHZvaWQgY29udmVydFZhbHVlKEpT Qzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlLCBEaWN0aW9uYXJ5JiByZXN1bHQpOworICAgIHN0 YXRpYyB2b2lkIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSwgU3Ry aW5nJiByZXN1bHQpOworICAgIHN0YXRpYyB2b2lkIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0 ZSosIEpTQzo6SlNWYWx1ZSwgU2NyaXB0VmFsdWUmIHJlc3VsdCk7CisgICAgc3RhdGljIHZvaWQg Y29udmVydFZhbHVlKEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlLCBWZWN0b3I8U3RyaW5n PiYgcmVzdWx0KTsKKyAgICBzdGF0aWMgdm9pZCBjb252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUq LCBKU0M6OkpTVmFsdWUsIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+JiByZXN1bHQpOwor ICAgIHN0YXRpYyB2b2lkIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1 ZSwgUmVmUHRyPERPTVdpbmRvdz4mIHJlc3VsdCk7CisgICAgc3RhdGljIHZvaWQgY29udmVydFZh bHVlKEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlLCBSZWZQdHI8RXZlbnRUYXJnZXQ+JiBy ZXN1bHQpOworICAgIHN0YXRpYyB2b2lkIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpT Qzo6SlNWYWx1ZSwgUmVmUHRyPE5vZGU+JiByZXN1bHQpOworICAgIHN0YXRpYyB2b2lkIGNvbnZl cnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSwgUmVmUHRyPFN0b3JhZ2U+JiBy ZXN1bHQpOworICAgIHN0YXRpYyB2b2lkIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpT Qzo6SlNWYWx1ZSwgTWVzc2FnZVBvcnRBcnJheSYgcmVzdWx0KTsKICNpZiBFTkFCTEUoVklERU9f VFJBQ0spCi0gICAgc3RhdGljIGJvb2wgY29udmVydFZhbHVlKEpTQzo6RXhlY1N0YXRlKiwgSlND OjpKU1ZhbHVlLCBSZWZQdHI8VHJhY2tCYXNlPiYgcmVzdWx0KTsKKyAgICBzdGF0aWMgdm9pZCBj b252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIFJlZlB0cjxUcmFja0Jh c2U+JiByZXN1bHQpOwogI2VuZGlmCiAjaWYgRU5BQkxFKE1VVEFUSU9OX09CU0VSVkVSUykgfHwg RU5BQkxFKFdFQl9JTlRFTlRTKQotICAgIHN0YXRpYyBib29sIGNvbnZlcnRWYWx1ZShKU0M6OkV4 ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSwgSGFzaFNldDxBdG9taWNTdHJpbmc+JiByZXN1bHQpOwor ICAgIHN0YXRpYyB2b2lkIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1 ZSwgSGFzaFNldDxBdG9taWNTdHJpbmc+JiByZXN1bHQpOwogI2VuZGlmCi0gICAgc3RhdGljIGJv b2wgY29udmVydFZhbHVlKEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlLCBBcnJheVZhbHVl JiByZXN1bHQpOwotICAgIHN0YXRpYyBib29sIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSos IEpTQzo6SlNWYWx1ZSwgUmVmUHRyPFVpbnQ4QXJyYXk+JiByZXN1bHQpOworICAgIHN0YXRpYyB2 b2lkIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSwgQXJyYXlWYWx1 ZSYgcmVzdWx0KTsKKyAgICBzdGF0aWMgdm9pZCBjb252ZXJ0VmFsdWUoSlNDOjpFeGVjU3RhdGUq LCBKU0M6OkpTVmFsdWUsIFJlZlB0cjxVaW50OEFycmF5PiYgcmVzdWx0KTsKICNpZiBFTkFCTEUo RU5DUllQVEVEX01FRElBKQotICAgIHN0YXRpYyBib29sIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNT dGF0ZSosIEpTQzo6SlNWYWx1ZSwgUmVmUHRyPE1lZGlhS2V5RXJyb3I+JiByZXN1bHQpOworICAg IHN0YXRpYyB2b2lkIGNvbnZlcnRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSwg UmVmUHRyPE1lZGlhS2V5RXJyb3I+JiByZXN1bHQpOwogI2VuZGlmCiAKICAgICBKU0M6OkV4ZWNT dGF0ZSogbV9leGVjOwpAQCAtMTUwLDIwICsxNDksMTYgQEAgSlNEaWN0aW9uYXJ5OjpHZXRQcm9w ZXJ0eVJlc3VsdCBKU0RpY3Rpb25hcnk6OnRyeUdldFByb3BlcnR5QW5kUmVzdWx0KGNvbnN0IGNo YXIKICAgICAgICAgcmV0dXJuIGdldFByb3BlcnR5UmVzdWx0OwogICAgIGNhc2UgUHJvcGVydHlG b3VuZDogewogICAgICAgICBSZXN1bHQgcmVzdWx0OwotICAgICAgICBpZiAoIWNvbnZlcnRWYWx1 ZShtX2V4ZWMsIHZhbHVlLCByZXN1bHQpKSB7Ci0gICAgICAgICAgICBpZiAobV9leGVjLT5oYWRF eGNlcHRpb24oKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gRXhjZXB0aW9uVGhyb3duOwotICAg ICAgICAgICAgcmV0dXJuIENvbnZlcnNpb25GYWlsZWQ7Ci0gICAgICAgIH0KKyAgICAgICAgY29u dmVydFZhbHVlKG1fZXhlYywgdmFsdWUsIHJlc3VsdCk7CisKKyAgICAgICAgaWYgKG1fZXhlYy0+ aGFkRXhjZXB0aW9uKCkpCisgICAgICAgICAgICByZXR1cm4gRXhjZXB0aW9uVGhyb3duOwogCiAg ICAgICAgIHNldHRlcihjb250ZXh0LCByZXN1bHQpOwogICAgICAgICBicmVhazsKICAgICB9CiAg ICAgY2FzZSBOb1Byb3BlcnR5Rm91bmQ6CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgQ29udmVy c2lvbkZhaWxlZDoKLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIGJyZWFr OwogICAgIH0KIAogICAgIHJldHVybiBnZXRQcm9wZXJ0eVJlc3VsdDsK