171382 2017-04-27 11:00:47 -0700 Restore some caching functionality that got accidentally removed when doing Wasm PIC patches 2017-04-27 13:58:08 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff ticaiolima ysuzuki oldest_to_newest 1302176 0 saam 2017-04-27 11:00:47 -0700 I moved some stuff to Wasm::CodeBlock, and forgot to take it out of JSWebAssemblyCodeBlock, when doing PIC work. 1302212 1 308423 saam 2017-04-27 12:06:17 -0700 Created attachment 308423 patch 1302215 2 308423 keith_miller 2017-04-27 12:08:54 -0700 Comment on attachment 308423 patch r=me. 1302216 3 308424 saam 2017-04-27 12:10:43 -0700 Created attachment 308424 patch for landing 1302270 4 308424 commit-queue 2017-04-27 13:58:07 -0700 Comment on attachment 308424 patch for landing Clearing flags on attachment: 308424 Committed r215891: <http://trac.webkit.org/changeset/215891> 1302271 5 commit-queue 2017-04-27 13:58:08 -0700 All reviewed patches have been landed. Closing bug. 308423 2017-04-27 12:06:17 -0700 2017-04-27 12:10:43 -0700 patch b-backup.diff text/plain 4655 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjE1ODgzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE3LTA0LTI3ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFJlc3RvcmUgc29tZSBjYWNoaW5nIGZ1bmN0aW9uYWxpdHkgdGhhdCBnb3QgYWNjaWRlbnRhbGx5 IHJlbW92ZWQgd2hlbiBkb2luZyBXYXNtIFBJQyBwYXRjaGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzEzODIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIEkgY3JlYXRlZCBXYXNtOjpDb2RlQmxv Y2ssIEkgYWNjaWRlbnRhbGx5IHJlbW92ZWQgY2FjaGluZworICAgICAgICB0aGUgY3JlYXRpb24g b2YgSlNXZWJBc3NlbWJseUNvZGVCbG9jaydzLiBUaGlzIHBhdGNoIHJlc3RvcmVzIGl0LgorICAg ICAgICBJdCdzIHdvcnRoIGtlZXBpbmcgSlNXZWJBc3NlbWJseU1vZHVsZSdzIEpTV2ViQXNzZW1i bHlDb2RlQmxvY2sKKyAgICAgICAgY2FjaGUgYmVjYXVzZSBjcmVhdGluZyBhIEpTV2ViQXNzZW1i bHlDb2RlQmxvY2sgZG9lcyBub24gdHJpdmlhbAorICAgICAgICB3b3JrIGJ5IGNyZWF0aW5nIHRo ZSB2YXJpb3VzIElDIGNhbGwgc3R1YnMuCisKKyAgICAgICAgKiB3YXNtL2pzL0pTV2ViQXNzZW1i bHlDb2RlQmxvY2suaDoKKyAgICAgICAgKEpTQzo6SlNXZWJBc3NlbWJseUNvZGVCbG9jazo6Y29k ZUJsb2NrKToKKyAgICAgICAgKiB3YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5jcHA6Cisg ICAgICAgIChKU0M6OkpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6ZmluYWxpemVDcmVhdGlvbik6Cisg ICAgICAgIChKU0M6OkpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6Y3JlYXRlKToKKyAgICAgICAgKiB3 YXNtL2pzL0pTV2ViQXNzZW1ibHlNb2R1bGUuaDoKKwogMjAxNy0wNC0yNyAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gUmVtb3RlIGlu c3BlY3RvciBzaG91bGQgc3VwcG9ydCBpbnNwZWN0aW5nIHRhcmdldHMgd2l0aCBwcmV2aW91cyB2 ZXJzaW9uIG9mIGJhY2tlbmQgY29tbWFuZHMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93 YXNtL2pzL0pTV2ViQXNzZW1ibHlDb2RlQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5Q29kZUJsb2NrLmgJKHJldmlzaW9uIDIx NTg4MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlDb2Rl QmxvY2suaAkod29ya2luZyBjb3B5KQpAQCAtODMsNyArODMsOCBAQCBwdWJsaWM6CiAgICAgICAg IHJldHVybiBvZmZzZXRPZkltcG9ydFN0dWJzKCkgKyBzaXplb2Yodm9pZCopICogaW1wb3J0SW5k ZXg7CiAgICAgfQogCi0gICAgUmVmPFdhc206OkNvZGVCbG9jaz4gbV9jb2RlQmxvY2s7CisgICAg V2FzbTo6Q29kZUJsb2NrJiBjb2RlQmxvY2soKSB7IHJldHVybiBtX2NvZGVCbG9jay5nZXQoKTsg fQorCiBwcml2YXRlOgogICAgIEpTV2ViQXNzZW1ibHlDb2RlQmxvY2soVk0mLCBSZWY8V2FzbTo6 Q29kZUJsb2NrPiYmLCBjb25zdCBXYXNtOjpNb2R1bGVJbmZvcm1hdGlvbiYpOwogICAgIERFQ0xB UkVfRVhQT1JUX0lORk87CkBAIC0xMTAsNiArMTExLDcgQEAgcHJpdmF0ZToKICAgICAgICAgdm9p ZCBmaW5hbGl6ZVVuY29uZGl0aW9uYWxseSgpIG92ZXJyaWRlOwogICAgIH07CiAKKyAgICBSZWY8 V2FzbTo6Q29kZUJsb2NrPiBtX2NvZGVCbG9jazsKICAgICBXcml0ZUJhcnJpZXI8SlNXZWJBc3Nl bWJseU1vZHVsZT4gbV9tb2R1bGU7CiAgICAgVmVjdG9yPE1hY3JvQXNzZW1ibGVyQ29kZVJlZj4g bV93YXNtVG9KU0V4aXRTdHViczsKICAgICBVbmNvbmRpdGlvbmFsRmluYWxpemVyIG1fdW5jb25k aXRpb25hbEZpbmFsaXplcjsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pT V2ViQXNzZW1ibHlJbnN0YW5jZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3dhc20vanMvSlNXZWJBc3NlbWJseUluc3RhbmNlLmNwcAkocmV2aXNpb24gMjE1ODgxKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNXZWJBc3NlbWJseUluc3RhbmNlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTAyLDkgKzEwMiwyMCBAQCB2b2lkIEpTV2ViQXNzZW1ibHlJ bnN0YW5jZTo6ZmluYWxpemVDcmVhCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBSRUxF QVNFX0FTU0VSVCh3YXNtQ29kZUJsb2NrLT5pc1NhZmVUb1J1bihtZW1vcnkoKS0+bWVtb3J5KCku bW9kZSgpKSk7Ci0gICAgbV9jb2RlQmxvY2suc2V0KHZtLCB0aGlzLAotICAgICAgICBKU1dlYkFz c2VtYmx5Q29kZUJsb2NrOjpjcmVhdGUodm0sIHdhc21Db2RlQmxvY2suY29weVJlZigpLCBtX21v ZHVsZS0+bW9kdWxlKCkubW9kdWxlSW5mb3JtYXRpb24oKSkpOworICAgIFJFTEVBU0VfQVNTRVJU KHdhc21Db2RlQmxvY2stPmlzU2FmZVRvUnVuKG1lbW9yeU1vZGUoKSkpOworICAgIEpTV2ViQXNz ZW1ibHlDb2RlQmxvY2sqIGNvZGVCbG9jayA9IG1vZHVsZSgpLT5jb2RlQmxvY2sobWVtb3J5TW9k ZSgpKTsKKyAgICBpZiAoY29kZUJsb2NrKSB7CisgICAgICAgIC8vIEEgQ29kZUJsb2NrIG1pZ2h0 IGhhdmUgYWxyZWFkeSBiZWVuIGNvbXBpbGVkLiBJZiBzbywgaXQgbWVhbnMKKyAgICAgICAgLy8g dGhhdCB0aGUgQ29kZUJsb2NrIHdlIGFyZSB0cnlpbmcgdG8gY29tcGlsZSBtdXN0IGJlIHRoZSBz YW1lCisgICAgICAgIC8vIGJlY2F1c2Ugd2Ugd2lsbCBuZXZlciBjb21waWxlIGEgQ29kZUJsb2Nr IGFnYWluIG9uY2UgaXQncworICAgICAgICAvLyBydW5uYWJsZS4KKyAgICAgICAgQVNTRVJUKCZj b2RlQmxvY2stPmNvZGVCbG9jaygpID09IHdhc21Db2RlQmxvY2sucHRyKCkpOworICAgICAgICBt X2NvZGVCbG9jay5zZXQodm0sIHRoaXMsIGNvZGVCbG9jayk7CisgICAgfSBlbHNlIHsKKyAgICAg ICAgY29kZUJsb2NrID0gSlNXZWJBc3NlbWJseUNvZGVCbG9jazo6Y3JlYXRlKHZtLCB3YXNtQ29k ZUJsb2NrLmNvcHlSZWYoKSwgbV9tb2R1bGUtPm1vZHVsZSgpLm1vZHVsZUluZm9ybWF0aW9uKCkp OworICAgICAgICBtX2NvZGVCbG9jay5zZXQodm0sIHRoaXMsIGNvZGVCbG9jayk7CisgICAgICAg IG1vZHVsZSgpLT5zZXRDb2RlQmxvY2sodm0sIG1lbW9yeU1vZGUoKSwgY29kZUJsb2NrKTsKKyAg ICB9CiAKICAgICBhdXRvKiBtb2R1bGVSZWNvcmQgPSBqc0Nhc3Q8V2ViQXNzZW1ibHlNb2R1bGVS ZWNvcmQqPihtX21vZHVsZU5hbWVzcGFjZU9iamVjdC0+bW9kdWxlUmVjb3JkKCkpOwogICAgIG1v ZHVsZVJlY29yZC0+bGluayhleGVjLCBtb2R1bGUoKSwgdGhpcyk7CkBAIC0zNDUsNyArMzU2LDYg QEAgSlNXZWJBc3NlbWJseUluc3RhbmNlKiBKU1dlYkFzc2VtYmx5SW5zdAogICAgIH0KIAogICAg IEFTU0VSVCghaW5zdGFuY2UtPmNvZGVCbG9jaygpKTsKLSAgICBpbnN0YW5jZS0+bV9jb2RlQmxv Y2suc2V0TWF5QmVOdWxsKHZtLCBpbnN0YW5jZSwganNNb2R1bGUtPmNvZGVCbG9jayhpbnN0YW5j ZS0+bWVtb3J5TW9kZSgpKSk7CiAKICAgICByZXR1cm4gaW5zdGFuY2U7CiB9CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5TW9kdWxlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNXZWJBc3NlbWJseU1vZHVsZS5o CShyZXZpc2lvbiAyMTU4ODEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dl YkFzc2VtYmx5TW9kdWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTY4LDEyICs2OCwxMSBAQCBwdWJs aWM6CiAgICAgY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiBzb3VyY2UoKSBjb25zdDsKIAogICAgIFdh c206Ok1vZHVsZSYgbW9kdWxlKCkgeyByZXR1cm4gbV9tb2R1bGUuZ2V0KCk7IH0KKyAgICB2b2lk IHNldENvZGVCbG9jayhWTSYsIFdhc206Ok1lbW9yeU1vZGUsIEpTV2ViQXNzZW1ibHlDb2RlQmxv Y2sqKTsKIAogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgSlNXZWJBc3NlbWJseUNvZGVCbG9j azsKIAotICAgIHZvaWQgc2V0Q29kZUJsb2NrKFZNJiwgV2FzbTo6TWVtb3J5TW9kZSwgSlNXZWJB c3NlbWJseUNvZGVCbG9jayopOwotCiAgICAgSlNXZWJBc3NlbWJseU1vZHVsZShWTSYsIFN0cnVj dHVyZSosIFJlZjxXYXNtOjpNb2R1bGU+JiYpOwogICAgIHZvaWQgZmluaXNoQ3JlYXRpb24oVk0m KTsKICAgICBzdGF0aWMgdm9pZCBkZXN0cm95KEpTQ2VsbCopOwo= 308424 2017-04-27 12:10:43 -0700 2017-04-27 13:58:07 -0700 patch for landing b-backup.diff text/plain 4652 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjE1ODgzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE3LTA0LTI3ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFJlc3RvcmUgc29tZSBjYWNoaW5nIGZ1bmN0aW9uYWxpdHkgdGhhdCBnb3QgYWNjaWRlbnRhbGx5 IHJlbW92ZWQgd2hlbiBkb2luZyBXYXNtIFBJQyBwYXRjaGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzEzODIKKworICAgICAgICBSZXZpZXdlZCBi eSBLZWl0aCBNaWxsZXIuCisKKyAgICAgICAgV2hlbiBJIGNyZWF0ZWQgV2FzbTo6Q29kZUJsb2Nr LCBJIGFjY2lkZW50YWxseSByZW1vdmVkIGNhY2hpbmcKKyAgICAgICAgdGhlIGNyZWF0aW9uIG9m IEpTV2ViQXNzZW1ibHlDb2RlQmxvY2tzLiBUaGlzIHBhdGNoIHJlc3RvcmVzIGl0LgorICAgICAg ICBJdCdzIHdvcnRoIGtlZXBpbmcgSlNXZWJBc3NlbWJseU1vZHVsZSdzIEpTV2ViQXNzZW1ibHlD b2RlQmxvY2sKKyAgICAgICAgY2FjaGUgYmVjYXVzZSBjcmVhdGluZyBhIEpTV2ViQXNzZW1ibHlD b2RlQmxvY2sgZG9lcyBub24gdHJpdmlhbAorICAgICAgICB3b3JrIGJ5IGNyZWF0aW5nIHRoZSB2 YXJpb3VzIElDIGNhbGwgc3R1YnMuCisKKyAgICAgICAgKiB3YXNtL2pzL0pTV2ViQXNzZW1ibHlD b2RlQmxvY2suaDoKKyAgICAgICAgKEpTQzo6SlNXZWJBc3NlbWJseUNvZGVCbG9jazo6Y29kZUJs b2NrKToKKyAgICAgICAgKiB3YXNtL2pzL0pTV2ViQXNzZW1ibHlJbnN0YW5jZS5jcHA6CisgICAg ICAgIChKU0M6OkpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6ZmluYWxpemVDcmVhdGlvbik6CisgICAg ICAgIChKU0M6OkpTV2ViQXNzZW1ibHlJbnN0YW5jZTo6Y3JlYXRlKToKKyAgICAgICAgKiB3YXNt L2pzL0pTV2ViQXNzZW1ibHlNb2R1bGUuaDoKKwogMjAxNy0wNC0yNyAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gUmVtb3RlIGluc3Bl Y3RvciBzaG91bGQgc3VwcG9ydCBpbnNwZWN0aW5nIHRhcmdldHMgd2l0aCBwcmV2aW91cyB2ZXJz aW9uIG9mIGJhY2tlbmQgY29tbWFuZHMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNt L2pzL0pTV2ViQXNzZW1ibHlDb2RlQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5Q29kZUJsb2NrLmgJKHJldmlzaW9uIDIxNTg4 MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2ViQXNzZW1ibHlDb2RlQmxv Y2suaAkod29ya2luZyBjb3B5KQpAQCAtODMsNyArODMsOCBAQCBwdWJsaWM6CiAgICAgICAgIHJl dHVybiBvZmZzZXRPZkltcG9ydFN0dWJzKCkgKyBzaXplb2Yodm9pZCopICogaW1wb3J0SW5kZXg7 CiAgICAgfQogCi0gICAgUmVmPFdhc206OkNvZGVCbG9jaz4gbV9jb2RlQmxvY2s7CisgICAgV2Fz bTo6Q29kZUJsb2NrJiBjb2RlQmxvY2soKSB7IHJldHVybiBtX2NvZGVCbG9jay5nZXQoKTsgfQor CiBwcml2YXRlOgogICAgIEpTV2ViQXNzZW1ibHlDb2RlQmxvY2soVk0mLCBSZWY8V2FzbTo6Q29k ZUJsb2NrPiYmLCBjb25zdCBXYXNtOjpNb2R1bGVJbmZvcm1hdGlvbiYpOwogICAgIERFQ0xBUkVf RVhQT1JUX0lORk87CkBAIC0xMTAsNiArMTExLDcgQEAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBm aW5hbGl6ZVVuY29uZGl0aW9uYWxseSgpIG92ZXJyaWRlOwogICAgIH07CiAKKyAgICBSZWY8V2Fz bTo6Q29kZUJsb2NrPiBtX2NvZGVCbG9jazsKICAgICBXcml0ZUJhcnJpZXI8SlNXZWJBc3NlbWJs eU1vZHVsZT4gbV9tb2R1bGU7CiAgICAgVmVjdG9yPE1hY3JvQXNzZW1ibGVyQ29kZVJlZj4gbV93 YXNtVG9KU0V4aXRTdHViczsKICAgICBVbmNvbmRpdGlvbmFsRmluYWxpemVyIG1fdW5jb25kaXRp b25hbEZpbmFsaXplcjsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTV2Vi QXNzZW1ibHlJbnN0YW5jZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L3dhc20vanMvSlNXZWJBc3NlbWJseUluc3RhbmNlLmNwcAkocmV2aXNpb24gMjE1ODgxKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNXZWJBc3NlbWJseUluc3RhbmNlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTAyLDkgKzEwMiwyMCBAQCB2b2lkIEpTV2ViQXNzZW1ibHlJbnN0 YW5jZTo6ZmluYWxpemVDcmVhCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBSRUxFQVNF X0FTU0VSVCh3YXNtQ29kZUJsb2NrLT5pc1NhZmVUb1J1bihtZW1vcnkoKS0+bWVtb3J5KCkubW9k ZSgpKSk7Ci0gICAgbV9jb2RlQmxvY2suc2V0KHZtLCB0aGlzLAotICAgICAgICBKU1dlYkFzc2Vt Ymx5Q29kZUJsb2NrOjpjcmVhdGUodm0sIHdhc21Db2RlQmxvY2suY29weVJlZigpLCBtX21vZHVs ZS0+bW9kdWxlKCkubW9kdWxlSW5mb3JtYXRpb24oKSkpOworICAgIFJFTEVBU0VfQVNTRVJUKHdh c21Db2RlQmxvY2stPmlzU2FmZVRvUnVuKG1lbW9yeU1vZGUoKSkpOworICAgIEpTV2ViQXNzZW1i bHlDb2RlQmxvY2sqIGNvZGVCbG9jayA9IG1vZHVsZSgpLT5jb2RlQmxvY2sobWVtb3J5TW9kZSgp KTsKKyAgICBpZiAoY29kZUJsb2NrKSB7CisgICAgICAgIC8vIEEgQ29kZUJsb2NrIG1pZ2h0IGhh dmUgYWxyZWFkeSBiZWVuIGNvbXBpbGVkLiBJZiBzbywgaXQgbWVhbnMKKyAgICAgICAgLy8gdGhh dCB0aGUgQ29kZUJsb2NrIHdlIGFyZSB0cnlpbmcgdG8gY29tcGlsZSBtdXN0IGJlIHRoZSBzYW1l CisgICAgICAgIC8vIGJlY2F1c2Ugd2Ugd2lsbCBuZXZlciBjb21waWxlIGEgQ29kZUJsb2NrIGFn YWluIG9uY2UgaXQncworICAgICAgICAvLyBydW5uYWJsZS4KKyAgICAgICAgQVNTRVJUKCZjb2Rl QmxvY2stPmNvZGVCbG9jaygpID09IHdhc21Db2RlQmxvY2sucHRyKCkpOworICAgICAgICBtX2Nv ZGVCbG9jay5zZXQodm0sIHRoaXMsIGNvZGVCbG9jayk7CisgICAgfSBlbHNlIHsKKyAgICAgICAg Y29kZUJsb2NrID0gSlNXZWJBc3NlbWJseUNvZGVCbG9jazo6Y3JlYXRlKHZtLCB3YXNtQ29kZUJs b2NrLmNvcHlSZWYoKSwgbV9tb2R1bGUtPm1vZHVsZSgpLm1vZHVsZUluZm9ybWF0aW9uKCkpOwor ICAgICAgICBtX2NvZGVCbG9jay5zZXQodm0sIHRoaXMsIGNvZGVCbG9jayk7CisgICAgICAgIG1v ZHVsZSgpLT5zZXRDb2RlQmxvY2sodm0sIG1lbW9yeU1vZGUoKSwgY29kZUJsb2NrKTsKKyAgICB9 CiAKICAgICBhdXRvKiBtb2R1bGVSZWNvcmQgPSBqc0Nhc3Q8V2ViQXNzZW1ibHlNb2R1bGVSZWNv cmQqPihtX21vZHVsZU5hbWVzcGFjZU9iamVjdC0+bW9kdWxlUmVjb3JkKCkpOwogICAgIG1vZHVs ZVJlY29yZC0+bGluayhleGVjLCBtb2R1bGUoKSwgdGhpcyk7CkBAIC0zNDUsNyArMzU2LDYgQEAg SlNXZWJBc3NlbWJseUluc3RhbmNlKiBKU1dlYkFzc2VtYmx5SW5zdAogICAgIH0KIAogICAgIEFT U0VSVCghaW5zdGFuY2UtPmNvZGVCbG9jaygpKTsKLSAgICBpbnN0YW5jZS0+bV9jb2RlQmxvY2su c2V0TWF5QmVOdWxsKHZtLCBpbnN0YW5jZSwganNNb2R1bGUtPmNvZGVCbG9jayhpbnN0YW5jZS0+ bWVtb3J5TW9kZSgpKSk7CiAKICAgICByZXR1cm4gaW5zdGFuY2U7CiB9CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFzc2VtYmx5TW9kdWxlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNXZWJBc3NlbWJseU1vZHVsZS5oCShy ZXZpc2lvbiAyMTU4ODEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1dlYkFz c2VtYmx5TW9kdWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTY4LDEyICs2OCwxMSBAQCBwdWJsaWM6 CiAgICAgY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiBzb3VyY2UoKSBjb25zdDsKIAogICAgIFdhc206 Ok1vZHVsZSYgbW9kdWxlKCkgeyByZXR1cm4gbV9tb2R1bGUuZ2V0KCk7IH0KKyAgICB2b2lkIHNl dENvZGVCbG9jayhWTSYsIFdhc206Ok1lbW9yeU1vZGUsIEpTV2ViQXNzZW1ibHlDb2RlQmxvY2sq KTsKIAogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgSlNXZWJBc3NlbWJseUNvZGVCbG9jazsK IAotICAgIHZvaWQgc2V0Q29kZUJsb2NrKFZNJiwgV2FzbTo6TWVtb3J5TW9kZSwgSlNXZWJBc3Nl bWJseUNvZGVCbG9jayopOwotCiAgICAgSlNXZWJBc3NlbWJseU1vZHVsZShWTSYsIFN0cnVjdHVy ZSosIFJlZjxXYXNtOjpNb2R1bGU+JiYpOwogICAgIHZvaWQgZmluaXNoQ3JlYXRpb24oVk0mKTsK ICAgICBzdGF0aWMgdm9pZCBkZXN0cm95KEpTQ2VsbCopOwo=