158871 2016-06-17 05:42:39 -0700 [JSC] Use bytecode intrinsic to expose Module's loading status to builtin JS 2016-06-20 18:49:05 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ysuzuki ysuzuki commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1203293 0 ysuzuki 2016-06-17 05:42:39 -0700 [JSC] Use bytecode intrinsic to expose Module's loading status to builtin JS 1203294 1 281558 ysuzuki 2016-06-17 05:43:28 -0700 Created attachment 281558 Patch 1203606 2 281558 ysuzuki 2016-06-19 00:57:37 -0700 Comment on attachment 281558 Patch Thanks! 1203607 3 281558 ysuzuki 2016-06-19 03:38:43 -0700 Comment on attachment 281558 Patch Let's land it manually. 1203608 4 ysuzuki 2016-06-19 03:41:07 -0700 Ah, OK. Now the svn server is offline because of its update. I'll land it after the svn server is back. 1203687 5 281558 ysuzuki 2016-06-19 21:30:32 -0700 Comment on attachment 281558 Patch Go through CQ! 1203688 6 281558 commit-queue 2016-06-19 21:31:05 -0700 Comment on attachment 281558 Patch Rejecting attachment 281558 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 281558, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit /Volumes/Data/EWS/WebKit/LayoutTests/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://webkit-queues.webkit.org/results/1534441 1203975 7 ysuzuki 2016-06-20 18:49:05 -0700 Committed r202261: <http://trac.webkit.org/changeset/202261> 281558 2016-06-17 05:43:28 -0700 2016-06-19 21:31:05 -0700 Patch bug-158871-20160617214325.patch text/plain 11715 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyMTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 NTA4NjdjOGM2OWNjYzQyNGMzZTk4YmMzOGUzZjNkNDYwYzA2MWJkLi4yZjM1MTAxYjYyYjdlZWRj NTViMTQ1N2VlM2JjMDM2MzIzOGE2OTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxNi0wNi0xNyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBVc2UgYnl0ZWNvZGUgaW50cmluc2ljIHRvIGV4cG9zZSBN b2R1bGUncyBsb2FkaW5nIHN0YXR1cyB0byBidWlsdGluIEpTCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTg4NzEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3cgSlNDIGhhcyBieXRlY29kZSBpbnRyaW5z aWMgc3lzdGVtLiBVc2UgaXQgaW5zdGVhZCBvZiBleHBvc2luZyBzdGF0dXMgdmFsdWVzIHRocm91 Z2ggdGhlIGxvYWRlcidzIHByb3BlcnRpZXMuCisKKyAgICAgICAgKiBidWlsdGlucy9Nb2R1bGVM b2FkZXJPYmplY3QuanM6CisgICAgICAgIChuZXdSZWdpc3RyeUVudHJ5KToKKyAgICAgICAgKGZ1 bGZpbGxGZXRjaCk6CisgICAgICAgIChmdWxmaWxsVHJhbnNsYXRlKToKKyAgICAgICAgKGNvbW1p dEluc3RhbnRpYXRlZCk6CisgICAgICAgIChyZXF1ZXN0RmV0Y2gpOgorICAgICAgICAocmVxdWVz dFRyYW5zbGF0ZSk6CisgICAgICAgIChyZXF1ZXN0SW5zdGFudGlhdGUpOgorICAgICAgICAocmVx dWVzdFJlc29sdmVEZXBlbmRlbmNpZXMuKToKKyAgICAgICAgKHJlcXVlc3RSZXNvbHZlRGVwZW5k ZW5jaWVzKToKKyAgICAgICAgKHJlcXVlc3RMaW5rKToKKyAgICAgICAgKGxpbmspOgorICAgICAg ICAocHJvdmlkZSk6CisgICAgICAgICogYnl0ZWNvZGUvQnl0ZWNvZGVJbnRyaW5zaWNSZWdpc3Ry eS5jcHA6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlSW50cmluc2ljUmVnaXN0cnk6OkJ5dGVjb2Rl SW50cmluc2ljUmVnaXN0cnkpOgorICAgICAgICAqIGJ5dGVjb2RlL0J5dGVjb2RlSW50cmluc2lj UmVnaXN0cnkuaDoKKyAgICAgICAgKiBydW50aW1lL01vZHVsZUxvYWRlck9iamVjdC5jcHA6Cisg ICAgICAgIChKU0M6Ok1vZHVsZUxvYWRlck9iamVjdDo6ZmluaXNoQ3JlYXRpb24pOiBEZWxldGVk LgorCiAyMDE2LTA2LTE0ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAg ICAgQmFzZWxpbmUgSklUIHNob3VsZCBiZSBjb25jdXJyZW50CmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnVpbHRpbnMvTW9kdWxlTG9hZGVyT2JqZWN0LmpzIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2J1aWx0aW5zL01vZHVsZUxvYWRlck9iamVjdC5qcwppbmRleCA1NjhhMzA3 Yjc5ZDI0MjNlY2RlNzZlMDUxZmE0YWUyZjZhYzE2MmYzLi42YTNiYzgyNDMwZWYxOGFiYWU2MzRk MGYxMmU2MjBmYmNlMDliMzMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnVp bHRpbnMvTW9kdWxlTG9hZGVyT2JqZWN0LmpzCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i dWlsdGlucy9Nb2R1bGVMb2FkZXJPYmplY3QuanMKQEAgLTk3LDcgKzk3LDcgQEAgZnVuY3Rpb24g bmV3UmVnaXN0cnlFbnRyeShrZXkpCiAKICAgICByZXR1cm4gewogICAgICAgICBrZXk6IGtleSwK LSAgICAgICAgc3RhdGU6IHRoaXMuRmV0Y2gsCisgICAgICAgIHN0YXRlOiBATW9kdWxlRmV0Y2gs CiAgICAgICAgIG1ldGFkYXRhOiBAdW5kZWZpbmVkLAogICAgICAgICBmZXRjaDogQHVuZGVmaW5l ZCwKICAgICAgICAgdHJhbnNsYXRlOiBAdW5kZWZpbmVkLApAQCAtMTQzLDcgKzE0Myw3IEBAIGZ1 bmN0aW9uIGZ1bGZpbGxGZXRjaChlbnRyeSwgcGF5bG9hZCkKICAgICBpZiAoIWVudHJ5LmZldGNo KQogICAgICAgICBlbnRyeS5mZXRjaCA9IEBuZXdQcm9taXNlQ2FwYWJpbGl0eShASW50ZXJuYWxQ cm9taXNlKS5AcHJvbWlzZTsKICAgICB0aGlzLmZvcmNlRnVsZmlsbFByb21pc2UoZW50cnkuZmV0 Y2gsIHBheWxvYWQpOwotICAgIHRoaXMuc2V0U3RhdGVUb01heChlbnRyeSwgdGhpcy5UcmFuc2xh dGUpOworICAgIHRoaXMuc2V0U3RhdGVUb01heChlbnRyeSwgQE1vZHVsZVRyYW5zbGF0ZSk7CiB9 CiAKIGZ1bmN0aW9uIGZ1bGZpbGxUcmFuc2xhdGUoZW50cnksIHNvdXJjZSkKQEAgLTE1NSw3ICsx NTUsNyBAQCBmdW5jdGlvbiBmdWxmaWxsVHJhbnNsYXRlKGVudHJ5LCBzb3VyY2UpCiAgICAgaWYg KCFlbnRyeS50cmFuc2xhdGUpCiAgICAgICAgIGVudHJ5LnRyYW5zbGF0ZSA9IEBuZXdQcm9taXNl Q2FwYWJpbGl0eShASW50ZXJuYWxQcm9taXNlKS5AcHJvbWlzZTsKICAgICB0aGlzLmZvcmNlRnVs ZmlsbFByb21pc2UoZW50cnkudHJhbnNsYXRlLCBzb3VyY2UpOwotICAgIHRoaXMuc2V0U3RhdGVU b01heChlbnRyeSwgdGhpcy5JbnN0YW50aWF0ZSk7CisgICAgdGhpcy5zZXRTdGF0ZVRvTWF4KGVu dHJ5LCBATW9kdWxlSW5zdGFudGlhdGUpOwogfQogCiBmdW5jdGlvbiBmdWxmaWxsSW5zdGFudGlh dGUoZW50cnksIG9wdGlvbmFsSW5zdGFuY2UsIHNvdXJjZSkKQEAgLTIwNyw3ICsyMDcsNyBAQCBm dW5jdGlvbiBjb21taXRJbnN0YW50aWF0ZWQoZW50cnksIG9wdGlvbmFsSW5zdGFuY2UsIHNvdXJj ZSkKICAgICBlbnRyeS5kZXBlbmRlbmNpZXMgPSBkZXBlbmRlbmNpZXM7CiAgICAgZW50cnkuZGVw ZW5kZW5jaWVzTWFwID0gZGVwZW5kZW5jaWVzTWFwOwogICAgIGVudHJ5Lm1vZHVsZSA9IG1vZHVs ZVJlY29yZDsKLSAgICB0aGlzLnNldFN0YXRlVG9NYXgoZW50cnksIHRoaXMuUmVzb2x2ZURlcGVu ZGVuY2llcyk7CisgICAgdGhpcy5zZXRTdGF0ZVRvTWF4KGVudHJ5LCBATW9kdWxlUmVzb2x2ZURl cGVuZGVuY2llcyk7CiB9CiAKIGZ1bmN0aW9uIGluc3RhbnRpYXRpb24ocmVzdWx0LCBzb3VyY2Us IGVudHJ5KQpAQCAtMjMwLDcgKzIzMCw3IEBAIGZ1bmN0aW9uIHJlcXVlc3RGZXRjaChrZXkpCiAg ICAgInVzZSBzdHJpY3QiOwogCiAgICAgdmFyIGVudHJ5ID0gdGhpcy5lbnN1cmVSZWdpc3RlcmVk KGtleSk7Ci0gICAgaWYgKGVudHJ5LnN0YXRlID4gdGhpcy5MaW5rKSB7CisgICAgaWYgKGVudHJ5 LnN0YXRlID4gQE1vZHVsZUxpbmspIHsKICAgICAgICAgdmFyIGRlZmVycmVkID0gQG5ld1Byb21p c2VDYXBhYmlsaXR5KEBJbnRlcm5hbFByb21pc2UpOwogICAgICAgICBkZWZlcnJlZC5AcmVqZWN0 LkBjYWxsKEB1bmRlZmluZWQsIG5ldyBAVHlwZUVycm9yKCJSZXF1ZXN0ZWQgbW9kdWxlIGlzIGFs cmVhZHkgcmVhZHkgdG8gYmUgZXhlY3V0ZWQuIikpOwogICAgICAgICByZXR1cm4gZGVmZXJyZWQu QHByb21pc2U7CkBAIC0yNDgsNyArMjQ4LDcgQEAgZnVuY3Rpb24gcmVxdWVzdEZldGNoKGtleSkK ICAgICAvLyAgICAgRm9yIGV4YW1wbGUsIEphdmFTY3JpcHRDb3JlIHNoZWxsIGNhbiBwcm92aWRl IHRoZSBob29rIGZldGNoaW5nIHRoZSByZXNvdXJjZQogICAgIC8vICAgICBmcm9tIHRoZSBsb2Nh bCBmaWxlIHN5c3RlbS4KICAgICB2YXIgZmV0Y2hQcm9taXNlID0gdGhpcy5mZXRjaChrZXkpLnRo ZW4oZnVuY3Rpb24gKHBheWxvYWQpIHsKLSAgICAgICAgbG9hZGVyLnNldFN0YXRlVG9NYXgoZW50 cnksIGxvYWRlci5UcmFuc2xhdGUpOworICAgICAgICBsb2FkZXIuc2V0U3RhdGVUb01heChlbnRy eSwgQE1vZHVsZVRyYW5zbGF0ZSk7CiAgICAgICAgIHJldHVybiBwYXlsb2FkOwogICAgIH0pOwog ICAgIGVudHJ5LmZldGNoID0gZmV0Y2hQcm9taXNlOwpAQCAtMjYyLDcgKzI2Miw3IEBAIGZ1bmN0 aW9uIHJlcXVlc3RUcmFuc2xhdGUoa2V5KQogICAgICJ1c2Ugc3RyaWN0IjsKIAogICAgIHZhciBl bnRyeSA9IHRoaXMuZW5zdXJlUmVnaXN0ZXJlZChrZXkpOwotICAgIGlmIChlbnRyeS5zdGF0ZSA+ IHRoaXMuTGluaykgeworICAgIGlmIChlbnRyeS5zdGF0ZSA+IEBNb2R1bGVMaW5rKSB7CiAgICAg ICAgIHZhciBkZWZlcnJlZCA9IEBuZXdQcm9taXNlQ2FwYWJpbGl0eShASW50ZXJuYWxQcm9taXNl KTsKICAgICAgICAgZGVmZXJyZWQuQHJlamVjdC5AY2FsbChAdW5kZWZpbmVkLCBuZXcgQFR5cGVF cnJvcigiUmVxdWVzdGVkIG1vZHVsZSBpcyBhbHJlYWR5IHJlYWR5IHRvIGJlIGV4ZWN1dGVkLiIp KTsKICAgICAgICAgcmV0dXJuIGRlZmVycmVkLkBwcm9taXNlOwpAQCAtMjc5LDcgKzI3OSw3IEBA IGZ1bmN0aW9uIHJlcXVlc3RUcmFuc2xhdGUoa2V5KQogICAgICAgICAvLyAgICAgVGFrZSB0aGUg a2V5IGFuZCB0aGUgZmV0Y2hlZCBzb3VyY2UgY29kZSBhbmQgdHJhbnNsYXRlIGl0IHRvIHRoZSBF UzYgc291cmNlIGNvZGUuCiAgICAgICAgIC8vICAgICBUeXBpY2FsbHkgaXQgaXMgdXNlZCBieSB0 aGUgdHJhbnNwaWxlcnMuCiAgICAgICAgIHJldHVybiBsb2FkZXIudHJhbnNsYXRlKGtleSwgcGF5 bG9hZCkudGhlbihmdW5jdGlvbiAoc291cmNlKSB7Ci0gICAgICAgICAgICBsb2FkZXIuc2V0U3Rh dGVUb01heChlbnRyeSwgbG9hZGVyLkluc3RhbnRpYXRlKTsKKyAgICAgICAgICAgIGxvYWRlci5z ZXRTdGF0ZVRvTWF4KGVudHJ5LCBATW9kdWxlSW5zdGFudGlhdGUpOwogICAgICAgICAgICAgcmV0 dXJuIHNvdXJjZTsKICAgICAgICAgfSk7CiAgICAgfSk7CkBAIC0yOTQsNyArMjk0LDcgQEAgZnVu Y3Rpb24gcmVxdWVzdEluc3RhbnRpYXRlKGtleSkKICAgICAidXNlIHN0cmljdCI7CiAKICAgICB2 YXIgZW50cnkgPSB0aGlzLmVuc3VyZVJlZ2lzdGVyZWQoa2V5KTsKLSAgICBpZiAoZW50cnkuc3Rh dGUgPiB0aGlzLkxpbmspIHsKKyAgICBpZiAoZW50cnkuc3RhdGUgPiBATW9kdWxlTGluaykgewog ICAgICAgICB2YXIgZGVmZXJyZWQgPSBAbmV3UHJvbWlzZUNhcGFiaWxpdHkoQEludGVybmFsUHJv bWlzZSk7CiAgICAgICAgIGRlZmVycmVkLkByZWplY3QuQGNhbGwoQHVuZGVmaW5lZCwgbmV3IEBU eXBlRXJyb3IoIlJlcXVlc3RlZCBtb2R1bGUgaXMgYWxyZWFkeSByZWFkeSB0byBiZSBleGVjdXRl ZC4iKSk7CiAgICAgICAgIHJldHVybiBkZWZlcnJlZC5AcHJvbWlzZTsKQEAgLTMzNiw3ICszMzYs NyBAQCBmdW5jdGlvbiByZXF1ZXN0UmVzb2x2ZURlcGVuZGVuY2llcyhrZXkpCiAgICAgInVzZSBz dHJpY3QiOwogCiAgICAgdmFyIGVudHJ5ID0gdGhpcy5lbnN1cmVSZWdpc3RlcmVkKGtleSk7Ci0g ICAgaWYgKGVudHJ5LnN0YXRlID4gdGhpcy5MaW5rKSB7CisgICAgaWYgKGVudHJ5LnN0YXRlID4g QE1vZHVsZUxpbmspIHsKICAgICAgICAgdmFyIGRlZmVycmVkID0gQG5ld1Byb21pc2VDYXBhYmls aXR5KEBJbnRlcm5hbFByb21pc2UpOwogICAgICAgICBkZWZlcnJlZC5AcmVqZWN0LkBjYWxsKEB1 bmRlZmluZWQsIG5ldyBAVHlwZUVycm9yKCJSZXF1ZXN0ZWQgbW9kdWxlIGlzIGFscmVhZHkgcmVh ZHkgdG8gYmUgZXhlY3V0ZWQuIikpOwogICAgICAgICByZXR1cm4gZGVmZXJyZWQuQHByb21pc2U7 CkBAIC0zODQsNyArMzg0LDcgQEAgZnVuY3Rpb24gcmVxdWVzdFJlc29sdmVEZXBlbmRlbmNpZXMo a2V5KQogICAgICAgICB9CiAKICAgICAgICAgcmV0dXJuIEBJbnRlcm5hbFByb21pc2UuaW50ZXJu YWxBbGwoZGVwTG9hZHMpLnRoZW4oZnVuY3Rpb24gKG1vZHVsZXMpIHsKLSAgICAgICAgICAgIGxv YWRlci5zZXRTdGF0ZVRvTWF4KGVudHJ5LCBsb2FkZXIuTGluayk7CisgICAgICAgICAgICBsb2Fk ZXIuc2V0U3RhdGVUb01heChlbnRyeSwgQE1vZHVsZUxpbmspOwogICAgICAgICAgICAgcmV0dXJu IGVudHJ5OwogICAgICAgICB9KTsKICAgICB9KTsKQEAgLTQwOSw3ICs0MDksNyBAQCBmdW5jdGlv biByZXF1ZXN0TGluayhrZXkpCiAgICAgInVzZSBzdHJpY3QiOwogCiAgICAgdmFyIGVudHJ5ID0g dGhpcy5lbnN1cmVSZWdpc3RlcmVkKGtleSk7Ci0gICAgaWYgKGVudHJ5LnN0YXRlID4gdGhpcy5M aW5rKSB7CisgICAgaWYgKGVudHJ5LnN0YXRlID4gQE1vZHVsZUxpbmspIHsKICAgICAgICAgdmFy IGRlZmVycmVkID0gQG5ld1Byb21pc2VDYXBhYmlsaXR5KEBJbnRlcm5hbFByb21pc2UpOwogICAg ICAgICBkZWZlcnJlZC5AcmVzb2x2ZS5AY2FsbChAdW5kZWZpbmVkLCBlbnRyeS5tb2R1bGUpOwog ICAgICAgICByZXR1cm4gZGVmZXJyZWQuQHByb21pc2U7CkBAIC00NDYsOSArNDQ2LDkgQEAgZnVu Y3Rpb24gbGluayhlbnRyeSkKICAgICAvLyBTbyBMaW5rJ3Mgc3RlcCAzIGlzIHNraXBwZWQuCiAg ICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODE3MQogCi0g ICAgaWYgKGVudHJ5LnN0YXRlID09PSB0aGlzLlJlYWR5KQorICAgIGlmIChlbnRyeS5zdGF0ZSA9 PT0gQE1vZHVsZVJlYWR5KQogICAgICAgICByZXR1cm47Ci0gICAgdGhpcy5zZXRTdGF0ZVRvTWF4 KGVudHJ5LCB0aGlzLlJlYWR5KTsKKyAgICB0aGlzLnNldFN0YXRlVG9NYXgoZW50cnksIEBNb2R1 bGVSZWFkeSk7CiAKICAgICAvLyBTaW5jZSB3ZSBhbHJlYWR5IGhhdmUgdGhlICJkZXBlbmRlbmNp ZXMiIGZpZWxkLAogICAgIC8vIHdlIGNhbiBjYWxsIG1vZHVsZURlY2xhcmF0aW9uSW5zdGFudGlh dGlvbiB3aXRoIHRoZSBjb3JyZWN0IG9yZGVyCkBAIC00OTQsMjMgKzQ5NCwyMyBAQCBmdW5jdGlv biBwcm92aWRlKGtleSwgc3RhZ2UsIHZhbHVlKQogCiAgICAgdmFyIGVudHJ5ID0gdGhpcy5lbnN1 cmVSZWdpc3RlcmVkKGtleSk7CiAKLSAgICBpZiAoc3RhZ2UgPT09IHRoaXMuRmV0Y2gpIHsKLSAg ICAgICAgaWYgKGVudHJ5LnN0YXR1cyA+IHRoaXMuRmV0Y2gpCisgICAgaWYgKHN0YWdlID09PSBA TW9kdWxlRmV0Y2gpIHsKKyAgICAgICAgaWYgKGVudHJ5LnN0YXR1cyA+IEBNb2R1bGVGZXRjaCkK ICAgICAgICAgICAgIHRocm93IG5ldyBAVHlwZUVycm9yKCJSZXF1ZXN0ZWQgbW9kdWxlIGlzIGFs cmVhZHkgZmV0Y2hlZC4iKTsKICAgICAgICAgdGhpcy5mdWxmaWxsRmV0Y2goZW50cnksIHZhbHVl KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChzdGFnZSA9PT0gdGhpcy5UcmFu c2xhdGUpIHsKLSAgICAgICAgaWYgKGVudHJ5LnN0YXR1cyA+IHRoaXMuVHJhbnNsYXRlKQorICAg IGlmIChzdGFnZSA9PT0gQE1vZHVsZVRyYW5zbGF0ZSkgeworICAgICAgICBpZiAoZW50cnkuc3Rh dHVzID4gQE1vZHVsZVRyYW5zbGF0ZSkKICAgICAgICAgICAgIHRocm93IG5ldyBAVHlwZUVycm9y KCJSZXF1ZXN0ZWQgbW9kdWxlIGlzIGFscmVhZHkgdHJhbnNsYXRlZC4iKTsKICAgICAgICAgdGhp cy5mdWxmaWxsRmV0Y2goZW50cnksIEB1bmRlZmluZWQpOwogICAgICAgICB0aGlzLmZ1bGZpbGxU cmFuc2xhdGUoZW50cnksIHZhbHVlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlm IChzdGFnZSA9PT0gdGhpcy5JbnN0YW50aWF0ZSkgewotICAgICAgICBpZiAoZW50cnkuc3RhdHVz ID4gdGhpcy5JbnN0YW50aWF0ZSkKKyAgICBpZiAoc3RhZ2UgPT09IEBNb2R1bGVJbnN0YW50aWF0 ZSkgeworICAgICAgICBpZiAoZW50cnkuc3RhdHVzID4gQE1vZHVsZUluc3RhbnRpYXRlKQogICAg ICAgICAgICAgdGhyb3cgbmV3IEBUeXBlRXJyb3IoIlJlcXVlc3RlZCBtb2R1bGUgaXMgYWxyZWFk eSBpbnN0YW50aWF0ZWQuIik7CiAgICAgICAgIHRoaXMuZnVsZmlsbEZldGNoKGVudHJ5LCBAdW5k ZWZpbmVkKTsKICAgICAgICAgdGhpcy5mdWxmaWxsVHJhbnNsYXRlKGVudHJ5LCB2YWx1ZSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVJbnRyaW5z aWNSZWdpc3RyeS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVJ bnRyaW5zaWNSZWdpc3RyeS5jcHAKaW5kZXggNDliZmY0MGNhN2E2NzJkZDVkOGVlYTg2YmRlZTgw Zjk5YWNiNDk4Zi4uZTY0MWEwMGMyODNkYWFiNjUyYzA5YTU1N2M0Zjg1NjcxMjI3YzQ1MCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlSW50cmluc2lj UmVnaXN0cnkuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9CeXRlY29k ZUludHJpbnNpY1JlZ2lzdHJ5LmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkpTQ0pT VmFsdWVJbmxpbmVzLmgiCiAjaW5jbHVkZSAiSlNHZW5lcmF0b3JGdW5jdGlvbi5oIgogI2luY2x1 ZGUgIkpTUHJvbWlzZS5oIgorI2luY2x1ZGUgIk1vZHVsZUxvYWRlck9iamVjdC5oIgogI2luY2x1 ZGUgIk5vZGVzLmgiCiAjaW5jbHVkZSAiU3Ryb25nSW5saW5lcy5oIgogCkBAIC01Miw2ICs1Mywx MiBAQCBCeXRlY29kZUludHJpbnNpY1JlZ2lzdHJ5OjpCeXRlY29kZUludHJpbnNpY1JlZ2lzdHJ5 KFZNJiB2bSkKICAgICBtX2FycmF5SXRlcmF0aW9uS2luZEtleVZhbHVlLnNldChtX3ZtLCBqc051 bWJlcihBcnJheUl0ZXJhdGVLZXlWYWx1ZSkpOwogICAgIG1fTUFYX1NUUklOR19MRU5HVEguc2V0 KG1fdm0sIGpzTnVtYmVyKEpTU3RyaW5nOjpNYXhMZW5ndGgpKTsKICAgICBtX01BWF9TQUZFX0lO VEVHRVIuc2V0KG1fdm0sIGpzRG91YmxlTnVtYmVyKDkwMDcxOTkyNTQ3NDA5OTEuMCkpOyAvLyAy IF4gNTMgLSAxCisgICAgbV9Nb2R1bGVGZXRjaC5zZXQobV92bSwganNOdW1iZXIoc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KE1vZHVsZUxvYWRlck9iamVjdDo6U3RhdHVzOjpGZXRjaCkpKTsKKyAgICBt X01vZHVsZVRyYW5zbGF0ZS5zZXQobV92bSwganNOdW1iZXIoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+ KE1vZHVsZUxvYWRlck9iamVjdDo6U3RhdHVzOjpUcmFuc2xhdGUpKSk7CisgICAgbV9Nb2R1bGVJ bnN0YW50aWF0ZS5zZXQobV92bSwganNOdW1iZXIoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KE1vZHVs ZUxvYWRlck9iamVjdDo6U3RhdHVzOjpJbnN0YW50aWF0ZSkpKTsKKyAgICBtX01vZHVsZVJlc29s dmVEZXBlbmRlbmNpZXMuc2V0KG1fdm0sIGpzTnVtYmVyKHN0YXRpY19jYXN0PHVuc2lnbmVkPihN b2R1bGVMb2FkZXJPYmplY3Q6OlN0YXR1czo6UmVzb2x2ZURlcGVuZGVuY2llcykpKTsKKyAgICBt X01vZHVsZUxpbmsuc2V0KG1fdm0sIGpzTnVtYmVyKHN0YXRpY19jYXN0PHVuc2lnbmVkPihNb2R1 bGVMb2FkZXJPYmplY3Q6OlN0YXR1czo6TGluaykpKTsKKyAgICBtX01vZHVsZVJlYWR5LnNldCht X3ZtLCBqc051bWJlcihzdGF0aWNfY2FzdDx1bnNpZ25lZD4oTW9kdWxlTG9hZGVyT2JqZWN0OjpT dGF0dXM6OlJlYWR5KSkpOwogICAgIG1fcHJvbWlzZVN0YXRlUGVuZGluZy5zZXQobV92bSwganNO dW1iZXIoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KEpTUHJvbWlzZTo6U3RhdHVzOjpQZW5kaW5nKSkp OwogICAgIG1fcHJvbWlzZVN0YXRlRnVsZmlsbGVkLnNldChtX3ZtLCBqc051bWJlcihzdGF0aWNf Y2FzdDx1bnNpZ25lZD4oSlNQcm9taXNlOjpTdGF0dXM6OkZ1bGZpbGxlZCkpKTsKICAgICBtX3By b21pc2VTdGF0ZVJlamVjdGVkLnNldChtX3ZtLCBqc051bWJlcihzdGF0aWNfY2FzdDx1bnNpZ25l ZD4oSlNQcm9taXNlOjpTdGF0dXM6OlJlamVjdGVkKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlSW50cmluc2ljUmVnaXN0cnkuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9CeXRlY29kZUludHJpbnNpY1JlZ2lzdHJ5LmgKaW5k ZXggMTczM2YyYWZiNGEyZjEwNDA5ZGIzMTcwNmQ0OTdlOGUxY2QyYzQyNC4uNmM5NWE2Yjg2ZGEy NjdmNjU5M2RlNGI3OTA4ZDA5NzA4YTVjY2MwMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlSW50cmluc2ljUmVnaXN0cnkuaAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVJbnRyaW5zaWNSZWdpc3RyeS5oCkBAIC01 Nyw2ICs1NywxMiBAQCBjbGFzcyBJZGVudGlmaWVyOwogICAgIG1hY3JvKGFycmF5SXRlcmF0aW9u S2luZEtleVZhbHVlKSBcCiAgICAgbWFjcm8oTUFYX1NUUklOR19MRU5HVEgpIFwKICAgICBtYWNy byhNQVhfU0FGRV9JTlRFR0VSKSBcCisgICAgbWFjcm8oTW9kdWxlRmV0Y2gpIFwKKyAgICBtYWNy byhNb2R1bGVUcmFuc2xhdGUpIFwKKyAgICBtYWNybyhNb2R1bGVJbnN0YW50aWF0ZSkgXAorICAg IG1hY3JvKE1vZHVsZVJlc29sdmVEZXBlbmRlbmNpZXMpIFwKKyAgICBtYWNybyhNb2R1bGVMaW5r KSBcCisgICAgbWFjcm8oTW9kdWxlUmVhZHkpIFwKICAgICBtYWNybyhwcm9taXNlU3RhdGVQZW5k aW5nKSBcCiAgICAgbWFjcm8ocHJvbWlzZVN0YXRlRnVsZmlsbGVkKSBcCiAgICAgbWFjcm8ocHJv bWlzZVN0YXRlUmVqZWN0ZWQpIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL01vZHVsZUxvYWRlck9iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9Nb2R1bGVMb2FkZXJPYmplY3QuY3BwCmluZGV4IDhiNjVlZmM3YWU5YTNhMTMyNzFlNmI1 MjE0N2NjZDQ5OWU1ODFkMmQuLjU3NDc1NjAwMjZjOGFlOGY3ZDJhNWY3MDgzNWYwODE2YTY5OTE4 N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01vZHVsZUxvYWRl ck9iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTW9kdWxlTG9h ZGVyT2JqZWN0LmNwcApAQCAtMTA3LDE1ICsxMDcsNiBAQCB2b2lkIE1vZHVsZUxvYWRlck9iamVj dDo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQog ewogICAgIEJhc2U6OmZpbmlzaENyZWF0aW9uKHZtKTsKICAgICBBU1NFUlQoaW5oZXJpdHMoaW5m bygpKSk7Ci0KLSAgICAvLyBDb25zdGFudCB2YWx1ZXMgZm9yIHRoZSBzdGF0ZS4KLSAgICBwdXRE aXJlY3RXaXRob3V0VHJhbnNpdGlvbih2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZygmdm0sICJG ZXRjaCIpLCBqc051bWJlcihTdGF0dXM6OkZldGNoKSk7Ci0gICAgcHV0RGlyZWN0V2l0aG91dFRy YW5zaXRpb24odm0sIElkZW50aWZpZXI6OmZyb21TdHJpbmcoJnZtLCAiVHJhbnNsYXRlIiksIGpz TnVtYmVyKFN0YXR1czo6VHJhbnNsYXRlKSk7Ci0gICAgcHV0RGlyZWN0V2l0aG91dFRyYW5zaXRp b24odm0sIElkZW50aWZpZXI6OmZyb21TdHJpbmcoJnZtLCAiSW5zdGFudGlhdGUiKSwganNOdW1i ZXIoU3RhdHVzOjpJbnN0YW50aWF0ZSkpOwotICAgIHB1dERpcmVjdFdpdGhvdXRUcmFuc2l0aW9u KHZtLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKCZ2bSwgIlJlc29sdmVEZXBlbmRlbmNpZXMiKSwg anNOdW1iZXIoU3RhdHVzOjpSZXNvbHZlRGVwZW5kZW5jaWVzKSk7Ci0gICAgcHV0RGlyZWN0V2l0 aG91dFRyYW5zaXRpb24odm0sIElkZW50aWZpZXI6OmZyb21TdHJpbmcoJnZtLCAiTGluayIpLCBq c051bWJlcihTdGF0dXM6OkxpbmspKTsKLSAgICBwdXREaXJlY3RXaXRob3V0VHJhbnNpdGlvbih2 bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZygmdm0sICJSZWFkeSIpLCBqc051bWJlcihTdGF0dXM6 OlJlYWR5KSk7Ci0KICAgICBwdXREaXJlY3RXaXRob3V0VHJhbnNpdGlvbih2bSwgSWRlbnRpZmll cjo6ZnJvbVN0cmluZygmdm0sICJyZWdpc3RyeSIpLCBKU01hcDo6Y3JlYXRlKHZtLCBnbG9iYWxP YmplY3QtPm1hcFN0cnVjdHVyZSgpKSk7CiB9CiAK