157806 2016-05-17 13:00:19 -0700 [ES6] Namespace object re-export should be handled as local export 2016-05-18 10:45:15 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller fpizlo ggaren mark.lam msaboff saam webkit-bug-importer ysuzuki oldest_to_newest 1193941 0 keith_miller 2016-05-17 13:00:19 -0700 Running test262/test/language/module-code/instn-star-equality.js in the new test262 runner segmentation faults. I'm not sure exactly why yet, for now I'm omitting the test from the test suite. It's possible that this is just a bug in the test runner and not in the code, although unlikely. 1193942 1 webkit-bug-importer 2016-05-17 13:01:05 -0700 <rdar://problem/26328773> 1194121 2 ysuzuki 2016-05-17 19:35:43 -0700 It seems the bug of module loader. It seems that resolution.localName.impl() becomes nullptr in JSScope::abstractResolve. 1194201 3 279231 ysuzuki 2016-05-18 01:42:58 -0700 Created attachment 279231 Patch 1194300 4 279231 mark.lam 2016-05-18 09:57:59 -0700 Comment on attachment 279231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279231&action=review LGTM with a comment. > Source/JavaScriptCore/parser/ModuleAnalyzer.cpp:97 > // Exported namespace binding. > // import * as namespace from "mod" > // export { namespace } > - moduleRecord()->addExportEntry(JSModuleRecord::ExportEntry::createNamespace(exportName, importEntry.moduleRequest)); > + // > + // Sec 15.2.1.16.1 step 11-a-ii-2-b https://tc39.github.io/ecma262/#sec-parsemodule > + // Namespace export is handled as local export since a namespace object binding itself is implemented as a local binding. > + moduleRecord()->addExportEntry(JSModuleRecord::ExportEntry::createLocal(exportName, Identifier::fromUid(m_vm, localName.get()))); > return; > } The lines above this: Optional<JSModuleRecord::ImportEntry> optionalImportEntry = moduleRecord()->tryGetImportEntry(localName.get()); ASSERT(optionalImportEntry); const JSModuleRecord::ImportEntry& importEntry = *optionalImportEntry; ... can be moved below this because they are only needed below. 1194314 5 279231 ysuzuki 2016-05-18 10:35:23 -0700 Comment on attachment 279231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279231&action=review Thanks! >> Source/JavaScriptCore/parser/ModuleAnalyzer.cpp:97 >> } > > The lines above this: > Optional<JSModuleRecord::ImportEntry> optionalImportEntry = moduleRecord()->tryGetImportEntry(localName.get()); > ASSERT(optionalImportEntry); > const JSModuleRecord::ImportEntry& importEntry = *optionalImportEntry; > > ... can be moved below this because they are only needed below. Nice catch. Moved :) 1194322 6 ysuzuki 2016-05-18 10:45:15 -0700 Committed r201085: <http://trac.webkit.org/changeset/201085> 279231 2016-05-18 01:42:58 -0700 2016-05-18 09:57:59 -0700 Patch bug-157806-20160518174356.patch text/plain 11441 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj NzRmY2U0NDlkOGYxNTU5MTI5NTg0MzkzOGE0MGJiZDI5MWFlYjMzLi5jMjY3NTE4ZWEzZDFlMTU0 ZmE5NjhhNGYzYjkxMGZjNzUzOGUxNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNiBAQAorMjAxNi0wNS0xOCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbRVM2XSBOYW1lc3BhY2Ugb2JqZWN0IHJlLWV4cG9ydCBzaG91bGQg YmUgaGFuZGxlZCBhcyBsb2NhbCBleHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1NzgwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlIGFsaWduIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiBFeHBvcnRF bnRyeSB0byB0aGUgc3BlYzsgcmVtb3ZlIFR5cGU6Ok5hbWVzcGFjZS4KKyAgICAgICAgVGhpcyBU eXBlOjpOYW1lc3BhY2UgaXMgdXNlZCBmb3IgcmUtZXhwb3J0ZWQgbmFtZXNwYWNlIG9iamVjdCBi aW5kaW5nLiBGb3IgZXhhbXBsZSwKKworICAgICAgICAgICAgaW1wb3J0ICogYXMgbmFtZXNwYWNl IGZyb20gIm5hbWVzcGFjZS5qcyIKKyAgICAgICAgICAgIGV4cG9ydCB7IG5hbWVzcGFjZSB9CisK KyAgICAgICAgSW4gdGhlIGFib3ZlIGNhc2UsIHdlIHVzZWQgRXhwb3J0RW50cnkoVHlwZTo6TmFt ZXNwYWNlKS4gSW4gdGhpcyBwYXRjaCwgd2UgZHJvcCB0aGlzCisgICAgICAgIGFuZCB1c2Ugbm9y bWFsIGxvY2FsIGV4cG9ydCAoVHlwZTo6TG9jYWwpIGluc3RlYWQgYmVjYXVzZSBuYW1lc3BhY2Ug b2JqZWN0IGFjdHVhbGx5IGhhcworICAgICAgICB0aGUgbG9jYWwgYmluZGluZyBpbiB0aGUgYWJv dmUgbW9kdWxlIGVudmlyb25tZW50LiBBbmQgdGhpcyBoYW5kbGluZyBzdHJpY3RseSBtZWV0cyB0 aGUKKyAgICAgICAgc3BlYyAoU2VjIDE1LjIuMS4xNi4xIHN0ZXAgMTEtYS1paS0yLWIpLgorCisg ICAgICAgIEFuZCB3ZSBhbHNvIGNsZWFuIHVwIHRoZSBFeHBvcnRFbnRyeSBpbXBsZW1lbnRhdGlv bjsgZHJvcHBpbmcgdW5uZWNlc3NhcnkgaW5mb3JtYXRpb24uCisgICAgICAgIFRoaXMgY2hhbmdl IGZpeGVzIHRoZSB0ZXN0MjYyL3Rlc3QvbGFuZ3VhZ2UvbW9kdWxlLWNvZGUvaW5zdG4tc3Rhci1l cXVhbGl0eS5qcyBjcmFzaC4KKworICAgICAgICAqIHBhcnNlci9Nb2R1bGVBbmFseXplci5jcHA6 CisgICAgICAgIChKU0M6Ok1vZHVsZUFuYWx5emVyOjpleHBvcnRWYXJpYWJsZSk6CisgICAgICAg ICogcnVudGltZS9KU01vZHVsZVJlY29yZC5jcHA6CisgICAgICAgIChKU0M6OmdldEV4cG9ydGVk TmFtZXMpOgorICAgICAgICAoSlNDOjpKU01vZHVsZVJlY29yZDo6ZHVtcCk6IERlbGV0ZWQuCisg ICAgICAgICogcnVudGltZS9KU01vZHVsZVJlY29yZC5oOgorICAgICAgICAqIHRlc3RzL21vZHVs ZXMvbmFtZXNwYWNlLXJlLWV4cG9ydC5qczogQWRkZWQuCisgICAgICAgICogdGVzdHMvbW9kdWxl cy9uYW1lc3BhY2UtcmUtZXhwb3J0L25hbWVzcGFjZS1yZS1leHBvcnQtZml4dHVyZS5qczogQWRk ZWQuCisgICAgICAgICogdGVzdHMvbW9kdWxlcy9uYW1lc3BhY2UtcmUtZXhwb3J0L25hbWVzcGFj ZS1yZS1leHBvcnQuanM6IEFkZGVkLgorICAgICAgICAqIHRlc3RzL21vZHVsZXMvcmVzb3VyY2Vz L2Fzc2VydC5qczoKKyAgICAgICAgKGV4cG9ydC5zaG91bGROb3RCZSk6CisKIDIwMTYtMDUtMTcg IEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBKU0Mgc2hvdWxkIGRl dGVjdCB0aGUgcmlnaHQgZGVmYXVsdCBsb2NhbGUgZXZlbiB3aGVuIGl0J3Mgbm90IGVtYmVkZGVk IGluIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTW9k dWxlQW5hbHl6ZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Nb2R1bGVBbmFs eXplci5jcHAKaW5kZXggYzFhM2NjMmIxZjA2ODFlMDU5OTJkNWNkNGU2MjZiZTg4MGQ0Yjk3NC4u NDA0NmMyYzIzMDI5ZTMwMjQxOTllNGE3MTBkZjljY2RlNWNkYjU4YiAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Nb2R1bGVBbmFseXplci5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3BhcnNlci9Nb2R1bGVBbmFseXplci5jcHAKQEAgLTc4LDcgKzc4LDcg QEAgdm9pZCBNb2R1bGVBbmFseXplcjo6ZXhwb3J0VmFyaWFibGUoY29uc3QgUmVmUHRyPFVuaXF1 ZWRTdHJpbmdJbXBsPiYgbG9jYWxOYW1lLAogCiAgICAgLy8gRXhwb3J0ZWQgbW9kdWxlIGxvY2Fs IHZhcmlhYmxlLgogICAgIGlmICghdmFyaWFibGUuaXNJbXBvcnRlZCgpKSB7Ci0gICAgICAgIG1v ZHVsZVJlY29yZCgpLT5hZGRFeHBvcnRFbnRyeShKU01vZHVsZVJlY29yZDo6RXhwb3J0RW50cnk6 OmNyZWF0ZUxvY2FsKGV4cG9ydE5hbWUsIElkZW50aWZpZXI6OmZyb21VaWQobV92bSwgbG9jYWxO YW1lLmdldCgpKSwgdmFyaWFibGUpKTsKKyAgICAgICAgbW9kdWxlUmVjb3JkKCktPmFkZEV4cG9y dEVudHJ5KEpTTW9kdWxlUmVjb3JkOjpFeHBvcnRFbnRyeTo6Y3JlYXRlTG9jYWwoZXhwb3J0TmFt ZSwgSWRlbnRpZmllcjo6ZnJvbVVpZChtX3ZtLCBsb2NhbE5hbWUuZ2V0KCkpKSk7CiAgICAgICAg IHJldHVybjsKICAgICB9CiAKQEAgLTg5LDcgKzg5LDEwIEBAIHZvaWQgTW9kdWxlQW5hbHl6ZXI6 OmV4cG9ydFZhcmlhYmxlKGNvbnN0IFJlZlB0cjxVbmlxdWVkU3RyaW5nSW1wbD4mIGxvY2FsTmFt ZSwKICAgICAgICAgLy8gRXhwb3J0ZWQgbmFtZXNwYWNlIGJpbmRpbmcuCiAgICAgICAgIC8vIGlt cG9ydCAqIGFzIG5hbWVzcGFjZSBmcm9tICJtb2QiCiAgICAgICAgIC8vIGV4cG9ydCB7IG5hbWVz cGFjZSB9Ci0gICAgICAgIG1vZHVsZVJlY29yZCgpLT5hZGRFeHBvcnRFbnRyeShKU01vZHVsZVJl Y29yZDo6RXhwb3J0RW50cnk6OmNyZWF0ZU5hbWVzcGFjZShleHBvcnROYW1lLCBpbXBvcnRFbnRy eS5tb2R1bGVSZXF1ZXN0KSk7CisgICAgICAgIC8vCisgICAgICAgIC8vIFNlYyAxNS4yLjEuMTYu MSBzdGVwIDExLWEtaWktMi1iIGh0dHBzOi8vdGMzOS5naXRodWIuaW8vZWNtYTI2Mi8jc2VjLXBh cnNlbW9kdWxlCisgICAgICAgIC8vIE5hbWVzcGFjZSBleHBvcnQgaXMgaGFuZGxlZCBhcyBsb2Nh bCBleHBvcnQgc2luY2UgYSBuYW1lc3BhY2Ugb2JqZWN0IGJpbmRpbmcgaXRzZWxmIGlzIGltcGxl bWVudGVkIGFzIGEgbG9jYWwgYmluZGluZy4KKyAgICAgICAgbW9kdWxlUmVjb3JkKCktPmFkZEV4 cG9ydEVudHJ5KEpTTW9kdWxlUmVjb3JkOjpFeHBvcnRFbnRyeTo6Y3JlYXRlTG9jYWwoZXhwb3J0 TmFtZSwgSWRlbnRpZmllcjo6ZnJvbVVpZChtX3ZtLCBsb2NhbE5hbWUuZ2V0KCkpKSk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTTW9kdWxlUmVjb3JkLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTTW9kdWxlUmVjb3JkLmNwcAppbmRleCA3YjdiMzIzZTk4YTkxYTE5ODJhYWMwNTYzNmMxYWE5 ZDk3ODFkMjQxLi4wZGE5NTIwNjkzZTdlZWEwMjM4OTY2MmZkNDY1YjVmMzVmYTU5MzkyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU01vZHVsZVJlY29yZC5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVSZWNvcmQuY3BwCkBA IC0xMDYsMTkgKzEwNiwxNCBAQCBhdXRvIEpTTW9kdWxlUmVjb3JkOjp0cnlHZXRFeHBvcnRFbnRy eShVbmlxdWVkU3RyaW5nSW1wbCogZXhwb3J0TmFtZSkgLT4gT3B0aW9uYQogICAgIHJldHVybiBP cHRpb25hbDxFeHBvcnRFbnRyeT4oaXRlcmF0b3ItPnZhbHVlKTsKIH0KIAotYXV0byBKU01vZHVs ZVJlY29yZDo6RXhwb3J0RW50cnk6OmNyZWF0ZUxvY2FsKGNvbnN0IElkZW50aWZpZXImIGV4cG9y dE5hbWUsIGNvbnN0IElkZW50aWZpZXImIGxvY2FsTmFtZSwgY29uc3QgVmFyaWFibGVFbnZpcm9u bWVudEVudHJ5JiB2YXJpYWJsZSkgLT4gRXhwb3J0RW50cnkKK2F1dG8gSlNNb2R1bGVSZWNvcmQ6 OkV4cG9ydEVudHJ5OjpjcmVhdGVMb2NhbChjb25zdCBJZGVudGlmaWVyJiBleHBvcnROYW1lLCBj b25zdCBJZGVudGlmaWVyJiBsb2NhbE5hbWUpIC0+IEV4cG9ydEVudHJ5CiB7Ci0gICAgcmV0dXJu IEV4cG9ydEVudHJ5IHsgVHlwZTo6TG9jYWwsIGV4cG9ydE5hbWUsIElkZW50aWZpZXIoKSwgSWRl bnRpZmllcigpLCBsb2NhbE5hbWUsIHZhcmlhYmxlIH07Ci19Ci0KLWF1dG8gSlNNb2R1bGVSZWNv cmQ6OkV4cG9ydEVudHJ5OjpjcmVhdGVOYW1lc3BhY2UoY29uc3QgSWRlbnRpZmllciYgZXhwb3J0 TmFtZSwgY29uc3QgSWRlbnRpZmllciYgbW9kdWxlTmFtZSkgLT4gRXhwb3J0RW50cnkKLXsKLSAg ICByZXR1cm4gRXhwb3J0RW50cnkgeyBUeXBlOjpOYW1lc3BhY2UsIGV4cG9ydE5hbWUsIG1vZHVs ZU5hbWUsIElkZW50aWZpZXIoKSwgSWRlbnRpZmllcigpLCBWYXJpYWJsZUVudmlyb25tZW50RW50 cnkoKSB9OworICAgIHJldHVybiBFeHBvcnRFbnRyeSB7IFR5cGU6OkxvY2FsLCBleHBvcnROYW1l LCBJZGVudGlmaWVyKCksIElkZW50aWZpZXIoKSwgbG9jYWxOYW1lIH07CiB9CiAKIGF1dG8gSlNN b2R1bGVSZWNvcmQ6OkV4cG9ydEVudHJ5OjpjcmVhdGVJbmRpcmVjdChjb25zdCBJZGVudGlmaWVy JiBleHBvcnROYW1lLCBjb25zdCBJZGVudGlmaWVyJiBpbXBvcnROYW1lLCBjb25zdCBJZGVudGlm aWVyJiBtb2R1bGVOYW1lKSAtPiBFeHBvcnRFbnRyeQogewotICAgIHJldHVybiBFeHBvcnRFbnRy eSB7IFR5cGU6OkluZGlyZWN0LCBleHBvcnROYW1lLCBtb2R1bGVOYW1lLCBpbXBvcnROYW1lLCBJ ZGVudGlmaWVyKCksIFZhcmlhYmxlRW52aXJvbm1lbnRFbnRyeSgpIH07CisgICAgcmV0dXJuIEV4 cG9ydEVudHJ5IHsgVHlwZTo6SW5kaXJlY3QsIGV4cG9ydE5hbWUsIG1vZHVsZU5hbWUsIGltcG9y dE5hbWUsIElkZW50aWZpZXIoKSB9OwogfQogCiBhdXRvIEpTTW9kdWxlUmVjb3JkOjpSZXNvbHV0 aW9uOjpub3RGb3VuZCgpIC0+IFJlc29sdXRpb24KQEAgLTU4MSw4ICs1NzYsOCBAQCBhdXRvIEpT TW9kdWxlUmVjb3JkOjpyZXNvbHZlRXhwb3J0SW1wbChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFJl c29sdmVRdWVyeSYgcm9vdAogCiAgICAgICAgICAgICBjb25zdCBFeHBvcnRFbnRyeSYgZXhwb3J0 RW50cnkgPSAqb3B0aW9uYWxFeHBvcnRFbnRyeTsKICAgICAgICAgICAgIHN3aXRjaCAoZXhwb3J0 RW50cnkudHlwZSkgewotICAgICAgICAgICAgY2FzZSBFeHBvcnRFbnRyeTo6VHlwZTo6TG9jYWw6 Ci0gICAgICAgICAgICBjYXNlIEV4cG9ydEVudHJ5OjpUeXBlOjpOYW1lc3BhY2U6IHsKKyAgICAg ICAgICAgIGNhc2UgRXhwb3J0RW50cnk6OlR5cGU6OkxvY2FsOiB7CisgICAgICAgICAgICAgICAg QVNTRVJUKCFleHBvcnRFbnRyeS5sb2NhbE5hbWUuaXNOdWxsKCkpOwogICAgICAgICAgICAgICAg IFJlc29sdXRpb24gcmVzb2x1dGlvbiB7IFJlc29sdXRpb246OlR5cGU6OlJlc29sdmVkLCBtb2R1 bGVSZWNvcmQsIGV4cG9ydEVudHJ5LmxvY2FsTmFtZSB9OwogICAgICAgICAgICAgICAgIC8vICAy LiBBIG1vZHVsZSB0aGF0IGhhcyByZXNvbHZlZCBhIGxvY2FsIGJpbmRpbmcgaXMgYWx3YXlzIGNh Y2hlYWJsZS4KICAgICAgICAgICAgICAgICBjYWNoZVJlc29sdXRpb25Gb3JRdWVyeShxdWVyeSwg cmVzb2x1dGlvbik7CkBAIC02NzMsMTYgKzY2OCw4IEBAIHN0YXRpYyB2b2lkIGdldEV4cG9ydGVk TmFtZXMoRXhlY1N0YXRlKiBleGVjLCBKU01vZHVsZVJlY29yZCogcm9vdCwgSWRlbnRpZmllclNl CiAKICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBwYWlyIDogbW9kdWxlUmVjb3JkLT5leHBvcnRF bnRyaWVzKCkpIHsKICAgICAgICAgICAgIGNvbnN0IEpTTW9kdWxlUmVjb3JkOjpFeHBvcnRFbnRy eSYgZXhwb3J0RW50cnkgPSBwYWlyLnZhbHVlOwotICAgICAgICAgICAgc3dpdGNoIChleHBvcnRF bnRyeS50eXBlKSB7Ci0gICAgICAgICAgICBjYXNlIEpTTW9kdWxlUmVjb3JkOjpFeHBvcnRFbnRy eTo6VHlwZTo6TG9jYWw6Ci0gICAgICAgICAgICBjYXNlIEpTTW9kdWxlUmVjb3JkOjpFeHBvcnRF bnRyeTo6VHlwZTo6SW5kaXJlY3Q6Ci0gICAgICAgICAgICAgICAgaWYgKG1vZHVsZVJlY29yZCA9 PSByb290IHx8IGV4ZWMtPnByb3BlcnR5TmFtZXMoKS5kZWZhdWx0S2V5d29yZCAhPSBleHBvcnRF bnRyeS5leHBvcnROYW1lKQotICAgICAgICAgICAgICAgICAgICBleHBvcnRlZE5hbWVzLmFkZChl eHBvcnRFbnRyeS5leHBvcnROYW1lLmltcGwoKSk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0K LSAgICAgICAgICAgIGNhc2UgSlNNb2R1bGVSZWNvcmQ6OkV4cG9ydEVudHJ5OjpUeXBlOjpOYW1l c3BhY2U6Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9CisgICAgICAgICAg ICBpZiAobW9kdWxlUmVjb3JkID09IHJvb3QgfHwgZXhlYy0+cHJvcGVydHlOYW1lcygpLmRlZmF1 bHRLZXl3b3JkICE9IGV4cG9ydEVudHJ5LmV4cG9ydE5hbWUpCisgICAgICAgICAgICAgICAgZXhw b3J0ZWROYW1lcy5hZGQoZXhwb3J0RW50cnkuZXhwb3J0TmFtZS5pbXBsKCkpOwogICAgICAgICB9 CiAKICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBzdGFyTW9kdWxlTmFtZSA6IG1vZHVsZVJlY29y ZC0+c3RhckV4cG9ydEVudHJpZXMoKSkgewpAQCAtODkxLDEwICs4NzgsNiBAQCB2b2lkIEpTTW9k dWxlUmVjb3JkOjpkdW1wKCkKICAgICAgICAgICAgIGRhdGFMb2coIiAgICAgIFtMb2NhbF0gIiwg ImV4cG9ydCgiLCBwcmludGFibGVOYW1lKGV4cG9ydEVudHJ5LmV4cG9ydE5hbWUpLCAiKSwgbG9j YWwoIiwgcHJpbnRhYmxlTmFtZShleHBvcnRFbnRyeS5sb2NhbE5hbWUpLCAiKVxuIik7CiAgICAg ICAgICAgICBicmVhazsKIAotICAgICAgICBjYXNlIEV4cG9ydEVudHJ5OjpUeXBlOjpOYW1lc3Bh Y2U6Ci0gICAgICAgICAgICBkYXRhTG9nKCIgICAgICBbTmFtZXNwYWNlXSAiLCAiZXhwb3J0KCIs IHByaW50YWJsZU5hbWUoZXhwb3J0RW50cnkuZXhwb3J0TmFtZSksICIpLCBtb2R1bGUoIiwgcHJp bnRhYmxlTmFtZShleHBvcnRFbnRyeS5tb2R1bGVOYW1lKSwgIilcbiIpOwotICAgICAgICAgICAg YnJlYWs7Ci0KICAgICAgICAgY2FzZSBFeHBvcnRFbnRyeTo6VHlwZTo6SW5kaXJlY3Q6CiAgICAg ICAgICAgICBkYXRhTG9nKCIgICAgICBbSW5kaXJlY3RdICIsICJleHBvcnQoIiwgcHJpbnRhYmxl TmFtZShleHBvcnRFbnRyeS5leHBvcnROYW1lKSwgIiksIGltcG9ydCgiLCBwcmludGFibGVOYW1l KGV4cG9ydEVudHJ5LmltcG9ydE5hbWUpLCAiKSwgbW9kdWxlKCIsIHByaW50YWJsZU5hbWUoZXhw b3J0RW50cnkubW9kdWxlTmFtZSksICIpXG4iKTsKICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVSZWNvcmQuaCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTW9kdWxlUmVjb3JkLmgKaW5kZXggYjgyYTll MWQ1N2FhYTRlNjhhN2YyODA1ODc1NWUwNzdiNWIxMDI2Yi4uOTMxMzQwOTIyMzc1YmFlZmJjODIy N2E2NTA2YzQ2ZDNmMWMxZDA1ZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNNb2R1bGVSZWNvcmQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU01vZHVsZVJlY29yZC5oCkBAIC00OCwxNSArNDgsMTQgQEAgY2xhc3MgSlNNb2R1bGVSZWNv cmQgOiBwdWJsaWMgSlNEZXN0cnVjdGlibGVPYmplY3QgewogcHVibGljOgogICAgIHR5cGVkZWYg SlNEZXN0cnVjdGlibGVPYmplY3QgQmFzZTsKIAorICAgIC8vIGh0dHBzOi8vdGMzOS5naXRodWIu aW8vZWNtYTI2Mi8jc2VjLXNvdXJjZS10ZXh0LW1vZHVsZS1yZWNvcmRzCiAgICAgc3RydWN0IEV4 cG9ydEVudHJ5IHsKICAgICAgICAgZW51bSBjbGFzcyBUeXBlIHsKICAgICAgICAgICAgIExvY2Fs LAotICAgICAgICAgICAgTmFtZXNwYWNlLAogICAgICAgICAgICAgSW5kaXJlY3QKICAgICAgICAg fTsKIAotICAgICAgICBzdGF0aWMgRXhwb3J0RW50cnkgY3JlYXRlTG9jYWwoY29uc3QgSWRlbnRp ZmllciYgZXhwb3J0TmFtZSwgY29uc3QgSWRlbnRpZmllciYgbG9jYWxOYW1lLCBjb25zdCBWYXJp YWJsZUVudmlyb25tZW50RW50cnkmKTsKLSAgICAgICAgc3RhdGljIEV4cG9ydEVudHJ5IGNyZWF0 ZU5hbWVzcGFjZShjb25zdCBJZGVudGlmaWVyJiBleHBvcnROYW1lLCBjb25zdCBJZGVudGlmaWVy JiBtb2R1bGVOYW1lKTsKKyAgICAgICAgc3RhdGljIEV4cG9ydEVudHJ5IGNyZWF0ZUxvY2FsKGNv bnN0IElkZW50aWZpZXImIGV4cG9ydE5hbWUsIGNvbnN0IElkZW50aWZpZXImIGxvY2FsTmFtZSk7 CiAgICAgICAgIHN0YXRpYyBFeHBvcnRFbnRyeSBjcmVhdGVJbmRpcmVjdChjb25zdCBJZGVudGlm aWVyJiBleHBvcnROYW1lLCBjb25zdCBJZGVudGlmaWVyJiBpbXBvcnROYW1lLCBjb25zdCBJZGVu dGlmaWVyJiBtb2R1bGVOYW1lKTsKIAogICAgICAgICBUeXBlIHR5cGU7CkBAIC02NCw3ICs2Myw2 IEBAIGNsYXNzIEpTTW9kdWxlUmVjb3JkIDogcHVibGljIEpTRGVzdHJ1Y3RpYmxlT2JqZWN0IHsK ICAgICAgICAgSWRlbnRpZmllciBtb2R1bGVOYW1lOwogICAgICAgICBJZGVudGlmaWVyIGltcG9y dE5hbWU7CiAgICAgICAgIElkZW50aWZpZXIgbG9jYWxOYW1lOwotICAgICAgICBWYXJpYWJsZUVu dmlyb25tZW50RW50cnkgdmFyaWFibGU7CiAgICAgfTsKIAogICAgIHN0cnVjdCBJbXBvcnRFbnRy eSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvbW9kdWxlcy9uYW1l c3BhY2UtcmUtZXhwb3J0LmpzIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL21vZHVsZXMv bmFtZXNwYWNlLXJlLWV4cG9ydC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45Yzc0ZTYxMmQ0N2U3NWJkOTI3NDg2 ZGFlNTExYzkwODlmYzMxZWQ1Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3Rlc3RzL21vZHVsZXMvbmFtZXNwYWNlLXJlLWV4cG9ydC5qcwpAQCAtMCwwICsxIEBACitp bXBvcnQgIm5hbWVzcGFjZS1yZS1leHBvcnQvbmFtZXNwYWNlLXJlLWV4cG9ydC5qcyI7CmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvbW9kdWxlcy9uYW1lc3BhY2UtcmUt ZXhwb3J0L25hbWVzcGFjZS1yZS1leHBvcnQtZml4dHVyZS5qcyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS90ZXN0cy9tb2R1bGVzL25hbWVzcGFjZS1yZS1leHBvcnQvbmFtZXNwYWNlLXJlLWV4cG9y dC1maXh0dXJlLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjljNzFiY2M0ZDk2OTFkNmYzZDYwMGYxZThiMTE4YWZl ZjQwMDgwMmQKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMv bW9kdWxlcy9uYW1lc3BhY2UtcmUtZXhwb3J0L25hbWVzcGFjZS1yZS1leHBvcnQtZml4dHVyZS5q cwpAQCAtMCwwICsxLDIgQEAKK2ltcG9ydCAqIGFzIG5hbWVzcGFjZSBmcm9tICcuL25hbWVzcGFj ZS1yZS1leHBvcnQuanMnOworZXhwb3J0IHsgbmFtZXNwYWNlIH07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvbW9kdWxlcy9uYW1lc3BhY2UtcmUtZXhwb3J0L25hbWVz cGFjZS1yZS1leHBvcnQuanMgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvbW9kdWxlcy9u YW1lc3BhY2UtcmUtZXhwb3J0L25hbWVzcGFjZS1yZS1leHBvcnQuanMKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNGUy NDk2M2U4YWU5MTkyNmI2MmEzZWU2Yjc4YTQzNWRjNzdhMTAxNAotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9tb2R1bGVzL25hbWVzcGFjZS1yZS1leHBvcnQv bmFtZXNwYWNlLXJlLWV4cG9ydC5qcwpAQCAtMCwwICsxLDExIEBACitpbXBvcnQgeyBzaG91bGRC ZSwgc2hvdWxkTm90QmUgfSBmcm9tICIuLi9yZXNvdXJjZXMvYXNzZXJ0LmpzIjsKK2ltcG9ydCAq IGFzIHNlbGYxIGZyb20gJy4vbmFtZXNwYWNlLXJlLWV4cG9ydC5qcyc7CitpbXBvcnQgKiBhcyBv dGhlcjEgZnJvbSAnLi9uYW1lc3BhY2UtcmUtZXhwb3J0LWZpeHR1cmUuanMnOworaW1wb3J0IHsg bmFtZXNwYWNlIH0gZnJvbSAnLi9uYW1lc3BhY2UtcmUtZXhwb3J0LWZpeHR1cmUuanMnOworCisv LyBSZS1leHBvcnRlZCBuYW1lc3BhY2Ugb2JqZWN0cworc2hvdWxkQmUoc2VsZjEsIG5hbWVzcGFj ZSk7CitzaG91bGROb3RCZShzZWxmMSwgb3RoZXIxKTsKKworLy8gUmUtZXhwb3J0ZWQgbmFtZXNw YWNlIGJpbmRpbmcgc2hvdWxkIHJlc2lkZSBpbiB0aGUgbmFtZXNwYWNlLXJlLWV4cG9ydC1maXh0 dXJlJ3MgbmFtZXNwYWNlIG9iamVjdC4KK3Nob3VsZEJlKCduYW1lc3BhY2UnIGluIG90aGVyMSwg dHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvbW9kdWxlcy9y ZXNvdXJjZXMvYXNzZXJ0LmpzIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL21vZHVsZXMv cmVzb3VyY2VzL2Fzc2VydC5qcwppbmRleCBhMDA2Zjg0ZWJkZmEwMWVhYzE2NWQyZmEyZWQxNTFj YTdhNjRiYWQ0Li5mYmYzYmQ1MTFmYjU5YjJhNTczYzYyZmUyMmZmOWVjNWUxNTNjNjkzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvbW9kdWxlcy9yZXNvdXJjZXMvYXNz ZXJ0LmpzCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9tb2R1bGVzL3Jlc291cmNl cy9hc3NlcnQuanMKQEAgLTMsNiArMywxMSBAQCBleHBvcnQgZnVuY3Rpb24gc2hvdWxkQmUoYWN0 dWFsLCBleHBlY3RlZCkgewogICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYGJhZCB2YWx1ZTogJHtT dHJpbmcoYWN0dWFsKX1gKTsKIH0KIAorZXhwb3J0IGZ1bmN0aW9uIHNob3VsZE5vdEJlKGFjdHVh bCwgZXhwZWN0ZWQpIHsKKyAgICBpZiAoYWN0dWFsID09PSBleHBlY3RlZCkKKyAgICAgICAgdGhy b3cgbmV3IEVycm9yKGBiYWQgdmFsdWU6ICR7U3RyaW5nKGFjdHVhbCl9YCk7Cit9CisKIGV4cG9y dCBmdW5jdGlvbiBzaG91bGRUaHJvdyhmdW5jLCBlcnJvck1lc3NhZ2UpIHsKICAgICB2YXIgZXJy b3JUaHJvd24gPSBmYWxzZTsKICAgICB2YXIgZXJyb3IgPSBudWxsOwo=