158041 2016-05-24 15:03:20 -0700 We Should be able to use the sampling profiler with DRT/WTR. 2016-05-24 16:02:06 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 keith_miller keith_miller commit-queue mark.lam msaboff saam oldest_to_newest 1196044 0 keith_miller 2016-05-24 15:03:20 -0700 We Should be able to use the sampling profiler with DRT/WTR. 1196046 1 279711 keith_miller 2016-05-24 15:18:12 -0700 Created attachment 279711 Patch 1196047 2 279711 saam 2016-05-24 15:24:48 -0700 Comment on attachment 279711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279711&action=review r=me with comments > Source/JavaScriptCore/runtime/SamplingProfiler.cpp:767 > + static HashSet<SamplingProfiler*>* profilesToReport; You can just do HashSet<RefPtr<SamplingProfiler>> instead of manually ref()ing. > Source/JavaScriptCore/runtime/SamplingProfiler.h:180 > + bool m_needsReportAtExit; This should default to sing false. 1196050 3 279711 saam 2016-05-24 15:27:49 -0700 Comment on attachment 279711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279711&action=review >> Source/JavaScriptCore/runtime/SamplingProfiler.h:180 >> + bool m_needsReportAtExit; > > This should default to sing false. being* 1196052 4 279713 keith_miller 2016-05-24 15:33:02 -0700 Created attachment 279713 Patch for landing 1196060 5 279713 commit-queue 2016-05-24 16:02:02 -0700 Comment on attachment 279713 Patch for landing Clearing flags on attachment: 279713 Committed r201361: <http://trac.webkit.org/changeset/201361> 1196061 6 commit-queue 2016-05-24 16:02:06 -0700 All reviewed patches have been landed. Closing bug. 279711 2016-05-24 15:18:12 -0700 2016-05-24 15:32:59 -0700 Patch bug-158041-20160524151919.patch text/plain 9241 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 MjUzMDAxOGY4Njg5ZDI0OTkyOGRkNThjOWE0N2Q2NmU1NDM4YTdkLi5jNjBkN2NhZjU1MjUzMDg3 ZWU3NTM3M2ZmZmMyZjRjMTc4NzMyYTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxNi0wNS0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBXZSBzaG91bGQgYmUgYWJsZSB0byB1c2UgdGhlIHNhbXBsaW5nIHBy b2ZpbGVyIHdpdGggRFJUL1dUUi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1ODA0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgcGF0Y2ggbWFrZXMgdGhlIHNhbXBsaW5nIHByb2ZpbGVyIHVzZSBh IG5ldyBvcHRpb24sIHNhbXBsaW5nUHJvZmlsZXJQYXRoLCB3aGljaAorICAgICAgICBzcGVjaWZp ZXMgdGhlIHBhdGggdG8gYSBkaXJlY3RvcnkgdG8gb3V0cHV0IHNhbXBsaW5nIHByb2ZpbGVyIGRh dGEgd2hlbiB0aGUgcHJvZ3JhbQorICAgICAgICB0ZXJtaW5hdGVzIG9yIHRoZSBWTSBpcyBkZXN0 cm95ZWQuIEFkZGl0aW9uYWxseSwgaXQgZml4ZXMgc29tZSBvdGhlciBpc3N1ZXMgd2l0aCB0aGUK KyAgICAgICAgYnl0ZWNvZGUgcHJvZmlsZXIgdGhhdCB3b3VsZCBjYXVzZSBjcmFzaGVzIG9uIGRl YnVnIGJ1aWxkcy4KKworICAgICAgICAqIHByb2ZpbGVyL1Byb2ZpbGVyRGF0YWJhc2UuY3BwOgor ICAgICAgICAoSlNDOjpQcm9maWxlcjo6RGF0YWJhc2U6OmVuc3VyZUJ5dGVjb2Rlc0Zvcik6Cisg ICAgICAgIChKU0M6OlByb2ZpbGVyOjpEYXRhYmFzZTo6cGVyZm9ybUF0RXhpdFNhdmUpOgorICAg ICAgICAqIHJ1bnRpbWUvT3B0aW9ucy5oOgorICAgICAgICAqIHJ1bnRpbWUvU2FtcGxpbmdQcm9m aWxlci5jcHA6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnJlZ2lzdGVyRm9yUmVw b3J0QXRFeGl0KToKKyAgICAgICAgKEpTQzo6U2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0RGF0YVRv T3B0aW9uRmlsZSk6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnJlcG9ydFRvcEZ1 bmN0aW9ucyk6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnJlcG9ydFRvcEJ5dGVj b2Rlcyk6CisgICAgICAgICogcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmg6CisgICAgICAgICog cnVudGltZS9WTS5jcHA6CisgICAgICAgIChKU0M6OlZNOjpWTSk6CisgICAgICAgIChKU0M6OlZN Ojp+Vk0pOgorCiAyMDE2LTA1LTE3ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIEFkZCB0ZXN0MjYyIGhhcm5lc3Mgc3VwcG9ydCBjb2RlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvUHJvZmlsZXJEYXRhYmFzZS5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvUHJvZmlsZXJEYXRhYmFzZS5jcHAKaW5k ZXggOTNkZGIxMTIzNmU5ODc2Y2Q2N2UwMWJiZGQ4NzIxZmY5ODhiNzNlMS4uOWMwZDZlMDhmYTE4 MTEyZjRkYjIxOGI0MWQ0ZWFmNGU2ZDAzNWFkMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3Byb2ZpbGVyL1Byb2ZpbGVyRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9wcm9maWxlci9Qcm9maWxlckRhdGFiYXNlLmNwcApAQCAtNjQsNyArNjQsNyBAQCBC eXRlY29kZXMqIERhdGFiYXNlOjplbnN1cmVCeXRlY29kZXNGb3IoQ29kZUJsb2NrKiBjb2RlQmxv Y2spCiAKIEJ5dGVjb2RlcyogRGF0YWJhc2U6OmVuc3VyZUJ5dGVjb2Rlc0Zvcihjb25zdCBMb2Nr SG9sZGVyJiwgQ29kZUJsb2NrKiBjb2RlQmxvY2spCiB7Ci0gICAgY29kZUJsb2NrID0gY29kZUJs b2NrLT5iYXNlbGluZVZlcnNpb24oKTsKKyAgICBjb2RlQmxvY2sgPSBjb2RlQmxvY2stPmJhc2Vs aW5lQWx0ZXJuYXRpdmUoKTsKICAgICAKICAgICBIYXNoTWFwPENvZGVCbG9jayosIEJ5dGVjb2Rl cyo+OjppdGVyYXRvciBpdGVyID0gbV9ieXRlY29kZXNNYXAuZmluZChjb2RlQmxvY2spOwogICAg IGlmIChpdGVyICE9IG1fYnl0ZWNvZGVzTWFwLmVuZCgpKQpAQCAtMTgyLDYgKzE4Miw3IEBAIHZv aWQgRGF0YWJhc2U6OnJlbW92ZURhdGFiYXNlRnJvbUF0RXhpdCgpCiAKIHZvaWQgRGF0YWJhc2U6 OnBlcmZvcm1BdEV4aXRTYXZlKCkgY29uc3QKIHsKKyAgICBKU0xvY2tIb2xkZXIgbG9jayhtX3Zt KTsKICAgICBzYXZlKG1fYXRFeGl0U2F2ZUZpbGVuYW1lLmRhdGEoKSk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuaAppbmRleCBjNzU0ZTgxODIwN2Q3NmMyMTkxOWUw MmVhODNiNWQyOGQ2N2ZhZDQyLi4zYzA2ZWNkZGRlOWZmOGFlNWY4MzBhZjU5ZWUxYWQ1ZjY5NWEw ODA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmgK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCkBAIC0zMjgsNiAr MzI4LDcgQEAgdHlwZWRlZiBjb25zdCBjaGFyKiBvcHRpb25TdHJpbmc7CiAgICAgdihib29sLCB1 c2VTYW1wbGluZ1Byb2ZpbGVyLCBmYWxzZSwgTm9ybWFsLCBudWxscHRyKSBcCiAgICAgdih1bnNp Z25lZCwgc2FtcGxlSW50ZXJ2YWwsIDEwMDAsIE5vcm1hbCwgIlRpbWUgYmV0d2VlbiBzdGFjayB0 cmFjZXMgaW4gbWljcm9zZWNvbmRzLiIpIFwKICAgICB2KGJvb2wsIGNvbGxlY3RTYW1wbGluZ1By b2ZpbGVyRGF0YUZvckpTQ1NoZWxsLCBmYWxzZSwgTm9ybWFsLCAiVGhpcyBjb3JyZXNwb25kcyB0 byB0aGUgSlNDIHNoZWxsJ3MgLS1zYW1wbGUgb3B0aW9uLiIpIFwKKyAgICB2KG9wdGlvblN0cmlu Zywgc2FtcGxpbmdQcm9maWxlclBhdGgsIG51bGxwdHIsIE5vcm1hbCwgIlRoZSBwYXRoIHRvIHRo ZSBkaXJlY3RvcnkgdG8gd3JpdGUgc2FtcGlsaW5nIHByb2ZpbGVyIG91dHB1dCB0by4gVGhpcyBw cm9iYWJseSB3aWxsIG5vdCB3b3JrIHdpdGggV0syIHVubGVzcyB0aGUgcGF0aCBpcyBpbiB0aGUg d2hpdGVsaXN0LiIpIFwKICAgICBcCiAgICAgdihib29sLCBhbHdheXNHZW5lcmF0ZVBDVG9Db2Rl T3JpZ2luTWFwLCBmYWxzZSwgTm9ybWFsLCAiVGhpcyB3aWxsIG1ha2Ugc3VyZSB3ZSBhbHdheXMg Z2VuZXJhdGUgYSBQQ1RvQ29kZU9yaWdpbk1hcCBmb3IgSklUZWQgY29kZS4iKSBcCiAgICAgXApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxl ci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmNw cAppbmRleCA1OWRlYTM2YmFiNGU2NWIxYWU4Y2I0MjVhODIwY2Q3NDZlYTRkYmRlLi4zM2RiZWIy YjVkYWY3MDcyOTk2ZDJhYzYzZGZhYWVhZjU4YWJiNjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmNwcApAQCAtNDcsNiArNDcsNyBA QAogI2luY2x1ZGUgIlN0cnVjdHVyZUlubGluZXMuaCIKICNpbmNsdWRlICJWTS5oIgogI2luY2x1 ZGUgIlZNRW50cnlTY29wZS5oIgorI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAKIG5hbWVzcGFj ZSBKU0MgewogCkBAIC03NjAsOCArNzYxLDQ3IEBAIFN0cmluZyBTYW1wbGluZ1Byb2ZpbGVyOjpz dGFja1RyYWNlc0FzSlNPTigpCiAgICAgcmV0dXJuIGpzb24udG9TdHJpbmcoKTsKIH0KIAordm9p ZCBTYW1wbGluZ1Byb2ZpbGVyOjpyZWdpc3RlckZvclJlcG9ydEF0RXhpdCgpCit7CisgICAgc3Rh dGljIFN0YXRpY0xvY2sgcmVnaXN0cmF0aW9uTG9jazsKKyAgICBzdGF0aWMgSGFzaFNldDxTYW1w bGluZ1Byb2ZpbGVyKj4qIHByb2ZpbGVzVG9SZXBvcnQ7CisKKyAgICBMb2NrSG9sZGVyIGhvbGRl cihyZWdpc3RyYXRpb25Mb2NrKTsKKworICAgIGlmICghcHJvZmlsZXNUb1JlcG9ydCkgeworICAg ICAgICBwcm9maWxlc1RvUmVwb3J0ID0gbmV3IEhhc2hTZXQ8U2FtcGxpbmdQcm9maWxlcio+KCk7 CisgICAgICAgIGF0ZXhpdChbXSgpIHsKKyAgICAgICAgICAgIGZvciAoU2FtcGxpbmdQcm9maWxl ciogcHJvZmlsZSA6ICpwcm9maWxlc1RvUmVwb3J0KQorICAgICAgICAgICAgICAgIHByb2ZpbGUt PnJlcG9ydERhdGFUb09wdGlvbkZpbGUoKTsKKyAgICAgICAgfSk7CisgICAgfQorCisgICAgcmVm KCk7CisgICAgcHJvZmlsZXNUb1JlcG9ydC0+YWRkKHRoaXMpOworICAgIG1fbmVlZHNSZXBvcnRB dEV4aXQgPSB0cnVlOworfQorCit2b2lkIFNhbXBsaW5nUHJvZmlsZXI6OnJlcG9ydERhdGFUb09w dGlvbkZpbGUoKQoreworICAgIGlmIChtX25lZWRzUmVwb3J0QXRFeGl0KSB7CisgICAgICAgIG1f bmVlZHNSZXBvcnRBdEV4aXQgPSBmYWxzZTsKKyAgICAgICAgY29uc3QgY2hhciogcGF0aCA9IE9w dGlvbnM6OnNhbXBsaW5nUHJvZmlsZXJQYXRoKCk7CisgICAgICAgIFN0cmluZ1ByaW50U3RyZWFt IHBhdGhPdXQ7CisgICAgICAgIHBhdGhPdXQucHJpbnQocGF0aCwgIi8iKTsKKyAgICAgICAgcGF0 aE91dC5wcmludCgiSlNDU2FtcGlsaW5nUHJvZmlsZS0iLCByZWludGVycHJldF9jYXN0PHVpbnRw dHJfdD4odGhpcyksICIudHh0Iik7CisgICAgICAgIGF1dG8gb3V0ID0gRmlsZVByaW50U3RyZWFt OjpvcGVuKHBhdGhPdXQudG9DU3RyaW5nKCkuZGF0YSgpLCAidyIpOworICAgICAgICByZXBvcnRU b3BGdW5jdGlvbnMoKm91dCk7CisgICAgICAgIHJlcG9ydFRvcEJ5dGVjb2Rlcygqb3V0KTsKKyAg ICB9Cit9CisKIHZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0VG9wRnVuY3Rpb25zKCkKIHsK KyAgICByZXBvcnRUb3BGdW5jdGlvbnMoV1RGOjpkYXRhRmlsZSgpKTsKK30KKwordm9pZCBTYW1w bGluZ1Byb2ZpbGVyOjpyZXBvcnRUb3BGdW5jdGlvbnMoUHJpbnRTdHJlYW0mIG91dCkKK3sKICAg ICBMb2NrSG9sZGVyIGxvY2tlcihtX2xvY2spOwogCiAgICAgewpAQCAtNzk0LDE5ICs4MzQsMjQg QEAgdm9pZCBTYW1wbGluZ1Byb2ZpbGVyOjpyZXBvcnRUb3BGdW5jdGlvbnMoKQogICAgICAgICBy ZXR1cm4gc3RkOjptYWtlX3BhaXIobWF4RnJhbWVEZXNjcmlwdGlvbiwgbWF4RnJhbWVDb3VudCk7 CiAgICAgfTsKIAotICAgIGRhdGFMb2coIlxuXG5TYW1wbGluZyByYXRlOiAiLCBtX3RpbWluZ0lu dGVydmFsLmNvdW50KCksICIgbWljcm9zZWNvbmRzXG4iKTsKLSAgICBkYXRhTG9nKCJIb3R0ZXN0 IGZ1bmN0aW9ucyBhcyA8bnVtU2FtcGxlcyAgJ2Z1bmN0aW9uTmFtZTpzb3VyY2VJRCc+XG4iKTsK KyAgICBvdXQucHJpbnQoIlxuXG5TYW1wbGluZyByYXRlOiAiLCBtX3RpbWluZ0ludGVydmFsLmNv dW50KCksICIgbWljcm9zZWNvbmRzXG4iKTsKKyAgICBvdXQucHJpbnQoIkhvdHRlc3QgZnVuY3Rp b25zIGFzIDxudW1TYW1wbGVzICAnZnVuY3Rpb25OYW1lOnNvdXJjZUlEJz5cbiIpOwogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgNDA7IGkrKykgewogICAgICAgICBhdXRvIHBhaXIgPSB0YWtl TWF4KCk7CiAgICAgICAgIGlmIChwYWlyLmZpcnN0LmlzRW1wdHkoKSkKICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICBkYXRhTG9nRigiJTZ6dSAiLCBwYWlyLnNlY29uZCk7Ci0gICAgICAgIGRh dGFMb2coIiAgICciLCBwYWlyLmZpcnN0LCAiJ1xuIik7CisgICAgICAgIG91dC5wcmludGYoIiU2 enUgIiwgcGFpci5zZWNvbmQpOworICAgICAgICBvdXQucHJpbnQoIiAgICciLCBwYWlyLmZpcnN0 LCAiJ1xuIik7CiAgICAgfQogfQogCiB2b2lkIFNhbXBsaW5nUHJvZmlsZXI6OnJlcG9ydFRvcEJ5 dGVjb2RlcygpCiB7CisgICAgcmVwb3J0VG9wQnl0ZWNvZGVzKFdURjo6ZGF0YUZpbGUoKSk7Cit9 CisKK3ZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0VG9wQnl0ZWNvZGVzKFByaW50U3RyZWFt JiBvdXQpCit7CiAgICAgTG9ja0hvbGRlciBsb2NrZXIobV9sb2NrKTsKIAogICAgIHsKQEAgLTg1 MiwxNCArODk3LDE0IEBAIHZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0VG9wQnl0ZWNvZGVz KCkKICAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV9wYWlyKG1heEZyYW1lRGVzY3JpcHRpb24sIG1h eEZyYW1lQ291bnQpOwogICAgIH07CiAKLSAgICBkYXRhTG9nKCJcblxuU2FtcGxpbmcgcmF0ZTog IiwgbV90aW1pbmdJbnRlcnZhbC5jb3VudCgpLCAiIG1pY3Jvc2Vjb25kc1xuIik7Ci0gICAgZGF0 YUxvZygiSG90dGVzdCBieXRlY29kZXMgYXMgPG51bVNhbXBsZXMgICAnZnVuY3Rpb25OYW1lI2hh c2g6SklUVHlwZTpieXRlY29kZUluZGV4Jz5cbiIpOworICAgIG91dC5wcmludCgiXG5cblNhbXBs aW5nIHJhdGU6ICIsIG1fdGltaW5nSW50ZXJ2YWwuY291bnQoKSwgIiBtaWNyb3NlY29uZHNcbiIp OworICAgIG91dC5wcmludCgiSG90dGVzdCBieXRlY29kZXMgYXMgPG51bVNhbXBsZXMgICAnZnVu Y3Rpb25OYW1lI2hhc2g6SklUVHlwZTpieXRlY29kZUluZGV4Jz5cbiIpOwogICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgODA7IGkrKykgewogICAgICAgICBhdXRvIHBhaXIgPSB0YWtlTWF4KCk7 CiAgICAgICAgIGlmIChwYWlyLmZpcnN0LmlzRW1wdHkoKSkKICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICBkYXRhTG9nRigiJTZ6dSAiLCBwYWlyLnNlY29uZCk7Ci0gICAgICAgIGRhdGFMb2co IiAgICciLCBwYWlyLmZpcnN0LCAiJ1xuIik7CisgICAgICAgIG91dC5wcmludGYoIiU2enUgIiwg cGFpci5zZWNvbmQpOworICAgICAgICBvdXQucHJpbnQoIiAgICciLCBwYWlyLmZpcnN0LCAiJ1xu Iik7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9TYW1wbGluZ1Byb2ZpbGVyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TYW1w bGluZ1Byb2ZpbGVyLmgKaW5kZXggODBjYmFmYWNhNDZmOGE2M2FiZjY0YzIyZGJjYjhjOTQ2YmMz NzM3MS4uNzYyNjUzNGQ1OTJlOWMxZGZjOGVhYzI3ZGIzN2IwMDQwNTZiM2I1OSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1NhbXBsaW5nUHJvZmlsZXIuaApAQCAtMTUy LDkgKzE1MiwxMyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRTdG9wV2F0Y2goY29uc3QgTG9ja0hv bGRlciYsIFJlZjxTdG9wd2F0Y2g+JiYgc3RvcHdhdGNoKSB7IG1fc3RvcHdhdGNoID0gV1RGTW92 ZShzdG9wd2F0Y2gpOyB9CiAgICAgdm9pZCBwYXVzZShjb25zdCBMb2NrSG9sZGVyJik7CiAKLSAg ICAvLyBVc2VkIGZvciBkZWJ1Z2dpbmcgaW4gdGhlIEpTQyBzaGVsbC4KKyAgICAvLyBVc2VkIGZv ciBkZWJ1Z2dpbmcgaW4gdGhlIEpTQyBzaGVsbC9EUlQuCisgICAgdm9pZCByZWdpc3RlckZvclJl cG9ydEF0RXhpdCgpOworICAgIHZvaWQgcmVwb3J0RGF0YVRvT3B0aW9uRmlsZSgpOwogICAgIEpT X0VYUE9SVF9QUklWQVRFIHZvaWQgcmVwb3J0VG9wRnVuY3Rpb25zKCk7CisgICAgSlNfRVhQT1JU X1BSSVZBVEUgdm9pZCByZXBvcnRUb3BGdW5jdGlvbnMoUHJpbnRTdHJlYW0mKTsKICAgICBKU19F WFBPUlRfUFJJVkFURSB2b2lkIHJlcG9ydFRvcEJ5dGVjb2RlcygpOworICAgIEpTX0VYUE9SVF9Q UklWQVRFIHZvaWQgcmVwb3J0VG9wQnl0ZWNvZGVzKFByaW50U3RyZWFtJik7CiAKIHByaXZhdGU6 CiAgICAgdm9pZCBjbGVhckRhdGEoY29uc3QgTG9ja0hvbGRlciYpOwpAQCAtMTczLDYgKzE3Nyw3 IEBAIHByaXZhdGU6CiAgICAgTWFjaGluZVRocmVhZHM6OlRocmVhZCogbV9qc2NFeGVjdXRpb25U aHJlYWQ7CiAgICAgYm9vbCBtX2lzUGF1c2VkOwogICAgIGJvb2wgbV9pc1NodXREb3duOworICAg IGJvb2wgbV9uZWVkc1JlcG9ydEF0RXhpdDsKICAgICBIYXNoU2V0PEpTQ2VsbCo+IG1fbGl2ZUNl bGxQb2ludGVyczsKICAgICBWZWN0b3I8VW5wcm9jZXNzZWRTdGFja0ZyYW1lPiBtX2N1cnJlbnRG cmFtZXM7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0u Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uY3BwCmluZGV4IGRjMzFjNDNm OGZiMGE2NWFiZjIyZDk1Mjg5NDg4ZjcxNjkxMDkwY2UuLmIzMzlmMWExZmFjMjRhNDdjMmI2MDE3 MmM0MjBjOWJiY2YyYjZiMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1ZNLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5jcHAKQEAg LTMyMCw2ICszMjAsOCBAQCBWTTo6Vk0oVk1UeXBlIHZtVHlwZSwgSGVhcFR5cGUgaGVhcFR5cGUp CiAgICAgICAgIFJlZjxTdG9wd2F0Y2g+IHN0b3B3YXRjaCA9IFN0b3B3YXRjaDo6Y3JlYXRlKCk7 CiAgICAgICAgIHN0b3B3YXRjaC0+c3RhcnQoKTsKICAgICAgICAgbV9zYW1wbGluZ1Byb2ZpbGVy ID0gYWRvcHRSZWYobmV3IFNhbXBsaW5nUHJvZmlsZXIoKnRoaXMsIFdURk1vdmUoc3RvcHdhdGNo KSkpOworICAgICAgICBpZiAoT3B0aW9uczo6c2FtcGxpbmdQcm9maWxlclBhdGgoKSkKKyAgICAg ICAgICAgIG1fc2FtcGxpbmdQcm9maWxlci0+cmVnaXN0ZXJGb3JSZXBvcnRBdEV4aXQoKTsKICAg ICAgICAgbV9zYW1wbGluZ1Byb2ZpbGVyLT5zdGFydCgpOwogICAgIH0KICNlbmRpZiAvLyBFTkFC TEUoU0FNUExJTkdfUFJPRklMRVIpCkBAIC0zNDAsOCArMzQyLDEwIEBAIFZNOjp+Vk0oKQogICAg IGhlYXAuaW5jcmVtZW50RGVmZXJyYWxEZXB0aCgpOwogCiAjaWYgRU5BQkxFKFNBTVBMSU5HX1BS T0ZJTEVSKQotICAgIGlmIChtX3NhbXBsaW5nUHJvZmlsZXIpCisgICAgaWYgKG1fc2FtcGxpbmdQ cm9maWxlcikgeworICAgICAgICBtX3NhbXBsaW5nUHJvZmlsZXItPnJlcG9ydERhdGFUb09wdGlv bkZpbGUoKTsKICAgICAgICAgbV9zYW1wbGluZ1Byb2ZpbGVyLT5zaHV0ZG93bigpOworICAgIH0K ICNlbmRpZiAvLyBFTkFCTEUoU0FNUExJTkdfUFJPRklMRVIpCiAgICAgCiAjaWYgRU5BQkxFKERG R19KSVQpCg== 279713 2016-05-24 15:33:02 -0700 2016-05-24 16:02:02 -0700 Patch for landing bug-158041-20160524153409.patch text/plain 9272 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 MjUzMDAxOGY4Njg5ZDI0OTkyOGRkNThjOWE0N2Q2NmU1NDM4YTdkLi4zNjM3ZWEzM2RhMDFjNzUy NzZlZjA0ZGYyOWM4ZTI1M2Y1OWM3NjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxNi0wNS0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBXZSBzaG91bGQgYmUgYWJsZSB0byB1c2UgdGhlIHNhbXBsaW5nIHBy b2ZpbGVyIHdpdGggRFJUL1dUUi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1ODA0MQorCisgICAgICAgIFJldmlld2VkIGJ5IFNhYW0gQmFyYXRpLgor CisgICAgICAgIFRoaXMgcGF0Y2ggbWFrZXMgdGhlIHNhbXBsaW5nIHByb2ZpbGVyIHVzZSBhIG5l dyBvcHRpb24sIHNhbXBsaW5nUHJvZmlsZXJQYXRoLCB3aGljaAorICAgICAgICBzcGVjaWZpZXMg dGhlIHBhdGggdG8gYSBkaXJlY3RvcnkgdG8gb3V0cHV0IHNhbXBsaW5nIHByb2ZpbGVyIGRhdGEg d2hlbiB0aGUgcHJvZ3JhbQorICAgICAgICB0ZXJtaW5hdGVzIG9yIHRoZSBWTSBpcyBkZXN0cm95 ZWQuIEFkZGl0aW9uYWxseSwgaXQgZml4ZXMgc29tZSBvdGhlciBpc3N1ZXMgd2l0aCB0aGUKKyAg ICAgICAgYnl0ZWNvZGUgcHJvZmlsZXIgdGhhdCB3b3VsZCBjYXVzZSBjcmFzaGVzIG9uIGRlYnVn IGJ1aWxkcy4KKworICAgICAgICAqIHByb2ZpbGVyL1Byb2ZpbGVyRGF0YWJhc2UuY3BwOgorICAg ICAgICAoSlNDOjpQcm9maWxlcjo6RGF0YWJhc2U6OmVuc3VyZUJ5dGVjb2Rlc0Zvcik6CisgICAg ICAgIChKU0M6OlByb2ZpbGVyOjpEYXRhYmFzZTo6cGVyZm9ybUF0RXhpdFNhdmUpOgorICAgICAg ICAqIHJ1bnRpbWUvT3B0aW9ucy5oOgorICAgICAgICAqIHJ1bnRpbWUvU2FtcGxpbmdQcm9maWxl ci5jcHA6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnJlZ2lzdGVyRm9yUmVwb3J0 QXRFeGl0KToKKyAgICAgICAgKEpTQzo6U2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0RGF0YVRvT3B0 aW9uRmlsZSk6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnJlcG9ydFRvcEZ1bmN0 aW9ucyk6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnJlcG9ydFRvcEJ5dGVjb2Rl cyk6CisgICAgICAgICogcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmg6CisgICAgICAgICogcnVu dGltZS9WTS5jcHA6CisgICAgICAgIChKU0M6OlZNOjpWTSk6CisgICAgICAgIChKU0M6OlZNOjp+ Vk0pOgorCiAyMDE2LTA1LTE3ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29t PgogCiAgICAgICAgIEFkZCB0ZXN0MjYyIGhhcm5lc3Mgc3VwcG9ydCBjb2RlCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvUHJvZmlsZXJEYXRhYmFzZS5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvUHJvZmlsZXJEYXRhYmFzZS5jcHAKaW5kZXgg OTNkZGIxMTIzNmU5ODc2Y2Q2N2UwMWJiZGQ4NzIxZmY5ODhiNzNlMS4uOWMwZDZlMDhmYTE4MTEy ZjRkYjIxOGI0MWQ0ZWFmNGU2ZDAzNWFkMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3Byb2ZpbGVyL1Byb2ZpbGVyRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9wcm9maWxlci9Qcm9maWxlckRhdGFiYXNlLmNwcApAQCAtNjQsNyArNjQsNyBAQCBCeXRl Y29kZXMqIERhdGFiYXNlOjplbnN1cmVCeXRlY29kZXNGb3IoQ29kZUJsb2NrKiBjb2RlQmxvY2sp CiAKIEJ5dGVjb2RlcyogRGF0YWJhc2U6OmVuc3VyZUJ5dGVjb2Rlc0Zvcihjb25zdCBMb2NrSG9s ZGVyJiwgQ29kZUJsb2NrKiBjb2RlQmxvY2spCiB7Ci0gICAgY29kZUJsb2NrID0gY29kZUJsb2Nr LT5iYXNlbGluZVZlcnNpb24oKTsKKyAgICBjb2RlQmxvY2sgPSBjb2RlQmxvY2stPmJhc2VsaW5l QWx0ZXJuYXRpdmUoKTsKICAgICAKICAgICBIYXNoTWFwPENvZGVCbG9jayosIEJ5dGVjb2Rlcyo+ OjppdGVyYXRvciBpdGVyID0gbV9ieXRlY29kZXNNYXAuZmluZChjb2RlQmxvY2spOwogICAgIGlm IChpdGVyICE9IG1fYnl0ZWNvZGVzTWFwLmVuZCgpKQpAQCAtMTgyLDYgKzE4Miw3IEBAIHZvaWQg RGF0YWJhc2U6OnJlbW92ZURhdGFiYXNlRnJvbUF0RXhpdCgpCiAKIHZvaWQgRGF0YWJhc2U6OnBl cmZvcm1BdEV4aXRTYXZlKCkgY29uc3QKIHsKKyAgICBKU0xvY2tIb2xkZXIgbG9jayhtX3ZtKTsK ICAgICBzYXZlKG1fYXRFeGl0U2F2ZUZpbGVuYW1lLmRhdGEoKSk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuaCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL09wdGlvbnMuaAppbmRleCBjNzU0ZTgxODIwN2Q3NmMyMTkxOWUwMmVh ODNiNWQyOGQ2N2ZhZDQyLi4zYzA2ZWNkZGRlOWZmOGFlNWY4MzBhZjU5ZWUxYWQ1ZjY5NWEwODA3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmgKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCkBAIC0zMjgsNiArMzI4 LDcgQEAgdHlwZWRlZiBjb25zdCBjaGFyKiBvcHRpb25TdHJpbmc7CiAgICAgdihib29sLCB1c2VT YW1wbGluZ1Byb2ZpbGVyLCBmYWxzZSwgTm9ybWFsLCBudWxscHRyKSBcCiAgICAgdih1bnNpZ25l ZCwgc2FtcGxlSW50ZXJ2YWwsIDEwMDAsIE5vcm1hbCwgIlRpbWUgYmV0d2VlbiBzdGFjayB0cmFj ZXMgaW4gbWljcm9zZWNvbmRzLiIpIFwKICAgICB2KGJvb2wsIGNvbGxlY3RTYW1wbGluZ1Byb2Zp bGVyRGF0YUZvckpTQ1NoZWxsLCBmYWxzZSwgTm9ybWFsLCAiVGhpcyBjb3JyZXNwb25kcyB0byB0 aGUgSlNDIHNoZWxsJ3MgLS1zYW1wbGUgb3B0aW9uLiIpIFwKKyAgICB2KG9wdGlvblN0cmluZywg c2FtcGxpbmdQcm9maWxlclBhdGgsIG51bGxwdHIsIE5vcm1hbCwgIlRoZSBwYXRoIHRvIHRoZSBk aXJlY3RvcnkgdG8gd3JpdGUgc2FtcGlsaW5nIHByb2ZpbGVyIG91dHB1dCB0by4gVGhpcyBwcm9i YWJseSB3aWxsIG5vdCB3b3JrIHdpdGggV0syIHVubGVzcyB0aGUgcGF0aCBpcyBpbiB0aGUgd2hp dGVsaXN0LiIpIFwKICAgICBcCiAgICAgdihib29sLCBhbHdheXNHZW5lcmF0ZVBDVG9Db2RlT3Jp Z2luTWFwLCBmYWxzZSwgTm9ybWFsLCAiVGhpcyB3aWxsIG1ha2Ugc3VyZSB3ZSBhbHdheXMgZ2Vu ZXJhdGUgYSBQQ1RvQ29kZU9yaWdpbk1hcCBmb3IgSklUZWQgY29kZS4iKSBcCiAgICAgXApkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmNwcApp bmRleCA1OWRlYTM2YmFiNGU2NWIxYWU4Y2I0MjVhODIwY2Q3NDZlYTRkYmRlLi44YmY1MzM4YTNj M2ZmNzQ3ZjYxMjg4ZDExYzQ2OWQxMzY4NTg2OWI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmNwcApAQCAtNDcsNiArNDcsOCBAQAog I2luY2x1ZGUgIlN0cnVjdHVyZUlubGluZXMuaCIKICNpbmNsdWRlICJWTS5oIgogI2luY2x1ZGUg IlZNRW50cnlTY29wZS5oIgorI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CisjaW5jbHVkZSA8d3Rm L1JlZlB0ci5oPgogCiBuYW1lc3BhY2UgSlNDIHsKIApAQCAtNzYwLDggKzc2Miw0NiBAQCBTdHJp bmcgU2FtcGxpbmdQcm9maWxlcjo6c3RhY2tUcmFjZXNBc0pTT04oKQogICAgIHJldHVybiBqc29u LnRvU3RyaW5nKCk7CiB9CiAKK3ZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cmVnaXN0ZXJGb3JSZXBv cnRBdEV4aXQoKQoreworICAgIHN0YXRpYyBTdGF0aWNMb2NrIHJlZ2lzdHJhdGlvbkxvY2s7Cisg ICAgc3RhdGljIEhhc2hTZXQ8UmVmUHRyPFNhbXBsaW5nUHJvZmlsZXI+PiogcHJvZmlsZXNUb1Jl cG9ydDsKKworICAgIExvY2tIb2xkZXIgaG9sZGVyKHJlZ2lzdHJhdGlvbkxvY2spOworCisgICAg aWYgKCFwcm9maWxlc1RvUmVwb3J0KSB7CisgICAgICAgIHByb2ZpbGVzVG9SZXBvcnQgPSBuZXcg SGFzaFNldDxSZWZQdHI8U2FtcGxpbmdQcm9maWxlcj4+KCk7CisgICAgICAgIGF0ZXhpdChbXSgp IHsKKyAgICAgICAgICAgIGZvciAoYXV0byBwcm9maWxlIDogKnByb2ZpbGVzVG9SZXBvcnQpCisg ICAgICAgICAgICAgICAgcHJvZmlsZS0+cmVwb3J0RGF0YVRvT3B0aW9uRmlsZSgpOworICAgICAg ICB9KTsKKyAgICB9CisKKyAgICBwcm9maWxlc1RvUmVwb3J0LT5hZGQoYWRvcHRSZWYodGhpcykp OworICAgIG1fbmVlZHNSZXBvcnRBdEV4aXQgPSB0cnVlOworfQorCit2b2lkIFNhbXBsaW5nUHJv ZmlsZXI6OnJlcG9ydERhdGFUb09wdGlvbkZpbGUoKQoreworICAgIGlmIChtX25lZWRzUmVwb3J0 QXRFeGl0KSB7CisgICAgICAgIG1fbmVlZHNSZXBvcnRBdEV4aXQgPSBmYWxzZTsKKyAgICAgICAg Y29uc3QgY2hhciogcGF0aCA9IE9wdGlvbnM6OnNhbXBsaW5nUHJvZmlsZXJQYXRoKCk7CisgICAg ICAgIFN0cmluZ1ByaW50U3RyZWFtIHBhdGhPdXQ7CisgICAgICAgIHBhdGhPdXQucHJpbnQocGF0 aCwgIi8iKTsKKyAgICAgICAgcGF0aE91dC5wcmludCgiSlNDU2FtcGlsaW5nUHJvZmlsZS0iLCBy ZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4odGhpcyksICIudHh0Iik7CisgICAgICAgIGF1dG8g b3V0ID0gRmlsZVByaW50U3RyZWFtOjpvcGVuKHBhdGhPdXQudG9DU3RyaW5nKCkuZGF0YSgpLCAi dyIpOworICAgICAgICByZXBvcnRUb3BGdW5jdGlvbnMoKm91dCk7CisgICAgICAgIHJlcG9ydFRv cEJ5dGVjb2Rlcygqb3V0KTsKKyAgICB9Cit9CisKIHZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cmVw b3J0VG9wRnVuY3Rpb25zKCkKIHsKKyAgICByZXBvcnRUb3BGdW5jdGlvbnMoV1RGOjpkYXRhRmls ZSgpKTsKK30KKwordm9pZCBTYW1wbGluZ1Byb2ZpbGVyOjpyZXBvcnRUb3BGdW5jdGlvbnMoUHJp bnRTdHJlYW0mIG91dCkKK3sKICAgICBMb2NrSG9sZGVyIGxvY2tlcihtX2xvY2spOwogCiAgICAg ewpAQCAtNzk0LDE5ICs4MzQsMjQgQEAgdm9pZCBTYW1wbGluZ1Byb2ZpbGVyOjpyZXBvcnRUb3BG dW5jdGlvbnMoKQogICAgICAgICByZXR1cm4gc3RkOjptYWtlX3BhaXIobWF4RnJhbWVEZXNjcmlw dGlvbiwgbWF4RnJhbWVDb3VudCk7CiAgICAgfTsKIAotICAgIGRhdGFMb2coIlxuXG5TYW1wbGlu ZyByYXRlOiAiLCBtX3RpbWluZ0ludGVydmFsLmNvdW50KCksICIgbWljcm9zZWNvbmRzXG4iKTsK LSAgICBkYXRhTG9nKCJIb3R0ZXN0IGZ1bmN0aW9ucyBhcyA8bnVtU2FtcGxlcyAgJ2Z1bmN0aW9u TmFtZTpzb3VyY2VJRCc+XG4iKTsKKyAgICBvdXQucHJpbnQoIlxuXG5TYW1wbGluZyByYXRlOiAi LCBtX3RpbWluZ0ludGVydmFsLmNvdW50KCksICIgbWljcm9zZWNvbmRzXG4iKTsKKyAgICBvdXQu cHJpbnQoIkhvdHRlc3QgZnVuY3Rpb25zIGFzIDxudW1TYW1wbGVzICAnZnVuY3Rpb25OYW1lOnNv dXJjZUlEJz5cbiIpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgNDA7IGkrKykgewogICAg ICAgICBhdXRvIHBhaXIgPSB0YWtlTWF4KCk7CiAgICAgICAgIGlmIChwYWlyLmZpcnN0LmlzRW1w dHkoKSkKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBkYXRhTG9nRigiJTZ6dSAiLCBwYWly LnNlY29uZCk7Ci0gICAgICAgIGRhdGFMb2coIiAgICciLCBwYWlyLmZpcnN0LCAiJ1xuIik7Cisg ICAgICAgIG91dC5wcmludGYoIiU2enUgIiwgcGFpci5zZWNvbmQpOworICAgICAgICBvdXQucHJp bnQoIiAgICciLCBwYWlyLmZpcnN0LCAiJ1xuIik7CiAgICAgfQogfQogCiB2b2lkIFNhbXBsaW5n UHJvZmlsZXI6OnJlcG9ydFRvcEJ5dGVjb2RlcygpCiB7CisgICAgcmVwb3J0VG9wQnl0ZWNvZGVz KFdURjo6ZGF0YUZpbGUoKSk7Cit9CisKK3ZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0VG9w Qnl0ZWNvZGVzKFByaW50U3RyZWFtJiBvdXQpCit7CiAgICAgTG9ja0hvbGRlciBsb2NrZXIobV9s b2NrKTsKIAogICAgIHsKQEAgLTg1MiwxNCArODk3LDE0IEBAIHZvaWQgU2FtcGxpbmdQcm9maWxl cjo6cmVwb3J0VG9wQnl0ZWNvZGVzKCkKICAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV9wYWlyKG1h eEZyYW1lRGVzY3JpcHRpb24sIG1heEZyYW1lQ291bnQpOwogICAgIH07CiAKLSAgICBkYXRhTG9n KCJcblxuU2FtcGxpbmcgcmF0ZTogIiwgbV90aW1pbmdJbnRlcnZhbC5jb3VudCgpLCAiIG1pY3Jv c2Vjb25kc1xuIik7Ci0gICAgZGF0YUxvZygiSG90dGVzdCBieXRlY29kZXMgYXMgPG51bVNhbXBs ZXMgICAnZnVuY3Rpb25OYW1lI2hhc2g6SklUVHlwZTpieXRlY29kZUluZGV4Jz5cbiIpOworICAg IG91dC5wcmludCgiXG5cblNhbXBsaW5nIHJhdGU6ICIsIG1fdGltaW5nSW50ZXJ2YWwuY291bnQo KSwgIiBtaWNyb3NlY29uZHNcbiIpOworICAgIG91dC5wcmludCgiSG90dGVzdCBieXRlY29kZXMg YXMgPG51bVNhbXBsZXMgICAnZnVuY3Rpb25OYW1lI2hhc2g6SklUVHlwZTpieXRlY29kZUluZGV4 Jz5cbiIpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgODA7IGkrKykgewogICAgICAgICBh dXRvIHBhaXIgPSB0YWtlTWF4KCk7CiAgICAgICAgIGlmIChwYWlyLmZpcnN0LmlzRW1wdHkoKSkK ICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBkYXRhTG9nRigiJTZ6dSAiLCBwYWlyLnNlY29u ZCk7Ci0gICAgICAgIGRhdGFMb2coIiAgICciLCBwYWlyLmZpcnN0LCAiJ1xuIik7CisgICAgICAg IG91dC5wcmludGYoIiU2enUgIiwgcGFpci5zZWNvbmQpOworICAgICAgICBvdXQucHJpbnQoIiAg ICciLCBwYWlyLmZpcnN0LCAiJ1xuIik7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmggYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmgKaW5kZXggODBjYmFmYWNhNDZmOGE2 M2FiZjY0YzIyZGJjYjhjOTQ2YmMzNzM3MS4uOGRmNDA4YzcyNmZlYmYzMGRjMDdjNGI2ODUzYjIx OGE1YzAyNzNiZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2Ft cGxpbmdQcm9maWxlci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1NhbXBs aW5nUHJvZmlsZXIuaApAQCAtMTUyLDkgKzE1MiwxMyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRT dG9wV2F0Y2goY29uc3QgTG9ja0hvbGRlciYsIFJlZjxTdG9wd2F0Y2g+JiYgc3RvcHdhdGNoKSB7 IG1fc3RvcHdhdGNoID0gV1RGTW92ZShzdG9wd2F0Y2gpOyB9CiAgICAgdm9pZCBwYXVzZShjb25z dCBMb2NrSG9sZGVyJik7CiAKLSAgICAvLyBVc2VkIGZvciBkZWJ1Z2dpbmcgaW4gdGhlIEpTQyBz aGVsbC4KKyAgICAvLyBVc2VkIGZvciBkZWJ1Z2dpbmcgaW4gdGhlIEpTQyBzaGVsbC9EUlQuCisg ICAgdm9pZCByZWdpc3RlckZvclJlcG9ydEF0RXhpdCgpOworICAgIHZvaWQgcmVwb3J0RGF0YVRv T3B0aW9uRmlsZSgpOwogICAgIEpTX0VYUE9SVF9QUklWQVRFIHZvaWQgcmVwb3J0VG9wRnVuY3Rp b25zKCk7CisgICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCByZXBvcnRUb3BGdW5jdGlvbnMoUHJp bnRTdHJlYW0mKTsKICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkIHJlcG9ydFRvcEJ5dGVjb2Rl cygpOworICAgIEpTX0VYUE9SVF9QUklWQVRFIHZvaWQgcmVwb3J0VG9wQnl0ZWNvZGVzKFByaW50 U3RyZWFtJik7CiAKIHByaXZhdGU6CiAgICAgdm9pZCBjbGVhckRhdGEoY29uc3QgTG9ja0hvbGRl ciYpOwpAQCAtMTczLDYgKzE3Nyw3IEBAIHByaXZhdGU6CiAgICAgTWFjaGluZVRocmVhZHM6OlRo cmVhZCogbV9qc2NFeGVjdXRpb25UaHJlYWQ7CiAgICAgYm9vbCBtX2lzUGF1c2VkOwogICAgIGJv b2wgbV9pc1NodXREb3duOworICAgIGJvb2wgbV9uZWVkc1JlcG9ydEF0RXhpdCB7IGZhbHNlIH07 CiAgICAgSGFzaFNldDxKU0NlbGwqPiBtX2xpdmVDZWxsUG9pbnRlcnM7CiAgICAgVmVjdG9yPFVu cHJvY2Vzc2VkU3RhY2tGcmFtZT4gbV9jdXJyZW50RnJhbWVzOwogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL1ZNLmNwcAppbmRleCBkYzMxYzQzZjhmYjBhNjVhYmYyMmQ5NTI4OTQ4OGY3MTY5 MTA5MGNlLi5iMzM5ZjFhMWZhYzI0YTQ3YzJiNjAxNzJjNDIwYzliYmNmMmI2YjBmIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uY3BwCkBAIC0zMjAsNiArMzIwLDggQEAgVk06OlZNKFZN VHlwZSB2bVR5cGUsIEhlYXBUeXBlIGhlYXBUeXBlKQogICAgICAgICBSZWY8U3RvcHdhdGNoPiBz dG9wd2F0Y2ggPSBTdG9wd2F0Y2g6OmNyZWF0ZSgpOwogICAgICAgICBzdG9wd2F0Y2gtPnN0YXJ0 KCk7CiAgICAgICAgIG1fc2FtcGxpbmdQcm9maWxlciA9IGFkb3B0UmVmKG5ldyBTYW1wbGluZ1By b2ZpbGVyKCp0aGlzLCBXVEZNb3ZlKHN0b3B3YXRjaCkpKTsKKyAgICAgICAgaWYgKE9wdGlvbnM6 OnNhbXBsaW5nUHJvZmlsZXJQYXRoKCkpCisgICAgICAgICAgICBtX3NhbXBsaW5nUHJvZmlsZXIt PnJlZ2lzdGVyRm9yUmVwb3J0QXRFeGl0KCk7CiAgICAgICAgIG1fc2FtcGxpbmdQcm9maWxlci0+ c3RhcnQoKTsKICAgICB9CiAjZW5kaWYgLy8gRU5BQkxFKFNBTVBMSU5HX1BST0ZJTEVSKQpAQCAt MzQwLDggKzM0MiwxMCBAQCBWTTo6flZNKCkKICAgICBoZWFwLmluY3JlbWVudERlZmVycmFsRGVw dGgoKTsKIAogI2lmIEVOQUJMRShTQU1QTElOR19QUk9GSUxFUikKLSAgICBpZiAobV9zYW1wbGlu Z1Byb2ZpbGVyKQorICAgIGlmIChtX3NhbXBsaW5nUHJvZmlsZXIpIHsKKyAgICAgICAgbV9zYW1w bGluZ1Byb2ZpbGVyLT5yZXBvcnREYXRhVG9PcHRpb25GaWxlKCk7CiAgICAgICAgIG1fc2FtcGxp bmdQcm9maWxlci0+c2h1dGRvd24oKTsKKyAgICB9CiAjZW5kaWYgLy8gRU5BQkxFKFNBTVBMSU5H X1BST0ZJTEVSKQogICAgIAogI2lmIEVOQUJMRShERkdfSklUKQo=