167098 2017-01-16 10:55:12 -0800 dynamic import is ambiguous with import declaration at module code 2017-01-21 14:12:11 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ysuzuki ysuzuki commit-queue darin keith_miller mark.lam msaboff saam oldest_to_newest 1267181 0 ysuzuki 2017-01-16 10:55:12 -0800 https://github.com/tc39/proposal-dynamic-import/issues/34 1267347 1 299029 ysuzuki 2017-01-17 06:05:31 -0800 Created attachment 299029 Patch 1268790 2 ysuzuki 2017-01-21 14:12:11 -0800 Committed r211017: <http://trac.webkit.org/changeset/211017> 299029 2017-01-17 06:05:31 -0800 2017-01-21 13:49:57 -0800 Patch bug-167098-20170117230343.patch text/plain 7073 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi OTA4YWIyOGQ3ZGM1YmMyMmI1ZWUyOTBmZGRiMWM5ZDBlMmQzMWExLi42MDRkNDRlZGQxY2JmNDQ2 ZDA5ODhiM2RmY2RhY2IzNGQxNjY4YTI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxNy0wMS0xNyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBkeW5hbWljIGltcG9ydCBpcyBhbWJpZ3VvdXMgd2l0aCBpbXBvcnQg ZGVjbGFyYXRpb24gYXQgbW9kdWxlIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2NzA5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgdHdvIHN5bnRheCBpc3N1ZXMgcmVs YXRlZCB0byBkeW5hbWljIGltcG9ydC4KKworICAgICAgICAxLiBGaXggbWVtYmVyIGV4cHJlc3Np b24gcGFyc2luZyB3aXRoIGR5bmFtaWMgaW1wb3J0IHJlc3VsdHMKKworICAgICAgICBXZSBzaG91 bGQgbm90IHJldHVybiBpbXBvcnQgZXhwcmVzc2lvbiBpbW1lZGlhdGVseSBhZnRlciBwYXJzaW5n CisgICAgICAgIGl0IGluIHBhcnNlTWVtYmVyRXhwcmVzc2lvbi4gVGhpcyBwcm9oaWJpdHMgdXMg dG8gcGFyc2UgdGhlIGZvbGxvd2luZworICAgICAgICBjb2RlLAorCisgICAgICAgICAgICBpbXBv cnQoIi4uLiIpLnRoZW4oZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgfSk7CisKKyAgICAgICAg Mi4gZHluYW1pYyBpbXBvcnQgd2l0aCBpbXBvcnQgZGVjbGFyYXRpb24gdW5kZXIgdGhlIG1vZHVs ZSBjb250ZXh0CisKKyAgICAgICAgQmVmb3JlIHRoaXMgcGF0Y2gsIHdlIGFsd2F5cyBhdHRlbXB0 IHRvIHBhcnNlIElNUE9SVCBhcyBpbXBvcnQgZGVjbGFyYXRpb24KKyAgICAgICAgdW5kZXIgdGhl IG1vZHVsZSBjb250ZXh0LiBJdCBtZWFucyB0aGF0IGltcG9ydCBjYWxsIGluIHRoZSB0b3AgbGV2 ZWwKKyAgICAgICAgZXhwcmVzc2lvbiBzdGF0ZW1lbnQgZmFpbHMgdG8gYmUgcGFyc2VkIHNpbmNl IHRoZSBwYXJzZXIgYXR0ZW1wdHMgdG8gcGFyc2UKKyAgICAgICAgaXQgYXMgaW1wb3J0IGRlY2xh cmF0aW9uLgorCisgICAgICAgICAgICBpbXBvcnQoIi4uLiIpICAvLyBtb2R1bGUgdG9wIGxldmVs IHN0YXRlbWVudC4KKworICAgICAgICBJbiB0aGlzIHBhdGNoLCB3ZSBjaGVjayB0aGUgY29uZGl0 aW9uIGBbbG9va2FoZWFkICE9IChdYCBiZWZvcmUgc3RhcnRpbmcKKyAgICAgICAgcGFyc2luZyBp bXBvcnQgZGVjbGFyYXRpb24uIFRoaXMgYWxsb3dzIHVzIHRvIHB1dCBpbXBvcnQgY2FsbCBpbiB0 aGUgbW9kdWxlCisgICAgICAgIHRvcCBsZXZlbCBzdGF0ZW1lbnQuCisKKyAgICAgICAgKiBwYXJz ZXIvUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlTW9k dWxlU291cmNlRWxlbWVudHMpOgorICAgICAgICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6cGFy c2VNZW1iZXJFeHByZXNzaW9uKToKKwogMjAxNy0wMS0xNiAgSm9zZXBoIFBlY29yYXJvICA8cGVj b3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB0aGUgUkVRVUVTVF9BTklNQVRJT05f RlJBTUUgZmxhZwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJz ZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCmluZGV4IGI4 OWRlY2IwYjQ1OWU3NWJjN2U3MGViOWM3OTcyZDcxZmUzYzhkNGEuLjJlMmVkZTYwYjkxYWQ5MTc3 MmUwYWFmODU5ZGE4Y2Y3NjQyOTM2ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9wYXJzZXIvUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1Bh cnNlci5jcHAKQEAgLTM3NSwzMCArMzc1LDQ4IEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRl cj4gVHJlZVNvdXJjZUVsZW1lbnRzIFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZU1vZHVsZVNvCiAK ICAgICB3aGlsZSAodHJ1ZSkgewogICAgICAgICBUcmVlU3RhdGVtZW50IHN0YXRlbWVudCA9IDA7 Ci0gICAgICAgIGlmIChtYXRjaChJTVBPUlQpKSB7Ci0gICAgICAgICAgICBzdGF0ZW1lbnQgPSBw YXJzZUltcG9ydERlY2xhcmF0aW9uKGNvbnRleHQpOwotICAgICAgICAgICAgaWYgKHN0YXRlbWVu dCkKLSAgICAgICAgICAgICAgICByZWNvcmRQYXVzZUxvY2F0aW9uKGNvbnRleHQuYnJlYWtwb2lu dExvY2F0aW9uKHN0YXRlbWVudCkpOwotICAgICAgICB9IGVsc2UgaWYgKG1hdGNoKEVYUE9SVCkp IHsKKyAgICAgICAgc3dpdGNoIChtX3Rva2VuLm1fdHlwZSkgeworICAgICAgICBjYXNlIEVYUE9S VDoKICAgICAgICAgICAgIHN0YXRlbWVudCA9IHBhcnNlRXhwb3J0RGVjbGFyYXRpb24oY29udGV4 dCk7CiAgICAgICAgICAgICBpZiAoc3RhdGVtZW50KQogICAgICAgICAgICAgICAgIHJlY29yZFBh dXNlTG9jYXRpb24oY29udGV4dC5icmVha3BvaW50TG9jYXRpb24oc3RhdGVtZW50KSk7Ci0gICAg ICAgIH0gZWxzZSB7CisgICAgICAgICAgICBicmVhazsKKworICAgICAgICBjYXNlIElNUE9SVDog eworICAgICAgICAgICAgU2F2ZVBvaW50IHNhdmVQb2ludCA9IGNyZWF0ZVNhdmVQb2ludCgpOwor ICAgICAgICAgICAgbmV4dCgpOworICAgICAgICAgICAgYm9vbCBpc0ltcG9ydERlY2xhcmF0aW9u ID0gIW1hdGNoKE9QRU5QQVJFTik7CisgICAgICAgICAgICByZXN0b3JlU2F2ZVBvaW50KHNhdmVQ b2ludCk7CisgICAgICAgICAgICBpZiAoaXNJbXBvcnREZWNsYXJhdGlvbikgeworICAgICAgICAg ICAgICAgIHN0YXRlbWVudCA9IHBhcnNlSW1wb3J0RGVjbGFyYXRpb24oY29udGV4dCk7CisgICAg ICAgICAgICAgICAgaWYgKHN0YXRlbWVudCkKKyAgICAgICAgICAgICAgICAgICAgcmVjb3JkUGF1 c2VMb2NhdGlvbihjb250ZXh0LmJyZWFrcG9pbnRMb2NhdGlvbihzdGF0ZW1lbnQpKTsKKyAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLy8gVGhpcyBp cyBgaW1wb3J0KCIuLi4iKWAgY2FsbCBjYXNlLgorICAgICAgICAgICAgRkFMTFRIUk9VR0g7Cisg ICAgICAgIH0KKworICAgICAgICBkZWZhdWx0OiB7CiAgICAgICAgICAgICBjb25zdCBJZGVudGlm aWVyKiBkaXJlY3RpdmUgPSAwOwogICAgICAgICAgICAgdW5zaWduZWQgZGlyZWN0aXZlTGl0ZXJh bExlbmd0aCA9IDA7CiAgICAgICAgICAgICBpZiAocGFyc2VNb2RlID09IFNvdXJjZVBhcnNlTW9k ZTo6TW9kdWxlQW5hbHl6ZU1vZGUpIHsKICAgICAgICAgICAgICAgICBpZiAoIXBhcnNlU3RhdGVt ZW50TGlzdEl0ZW0oc3ludGF4Q2hlY2tlciwgZGlyZWN0aXZlLCAmZGlyZWN0aXZlTGl0ZXJhbExl bmd0aCkpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICBn b3RvIGVuZDsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIHN0YXRlbWVudCA9IHBhcnNlU3RhdGVtZW50TGlzdEl0ZW0oY29udGV4dCwgZGlyZWN0 aXZlLCAmZGlyZWN0aXZlTGl0ZXJhbExlbmd0aCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgfQogICAgICAgICB9CiAKICAgICAgICAgaWYgKCFzdGF0ZW1lbnQpCi0gICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgIGdvdG8gZW5kOwogICAgICAgICBjb250ZXh0LmFwcGVuZFN0YXRl bWVudChzb3VyY2VFbGVtZW50cywgc3RhdGVtZW50KTsKICAgICB9CiAKK2VuZDoKICAgICBwcm9w YWdhdGVFcnJvcigpOwogCiAgICAgZm9yIChjb25zdCBhdXRvJiBwYWlyIDogbV9tb2R1bGVTY29w ZURhdGEtPmV4cG9ydGVkQmluZGluZ3MoKSkgewpAQCAtNDM5MSw3ICs0NDA5LDcgQEAgdGVtcGxh dGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlRXhwcmVzc2lvbiBQYXJzZXI8TGV4ZXJUeXBlPjo6 cGFyc2VNZW1iZXJFeHByZXMKICAgICAgICAgVHJlZUV4cHJlc3Npb24gZXhwciA9IHBhcnNlQXNz aWdubWVudEV4cHJlc3Npb24oY29udGV4dCk7CiAgICAgICAgIGZhaWxJZkZhbHNlKGV4cHIsICJD YW5ub3QgcGFyc2UgZXhwcmVzc2lvbiIpOwogICAgICAgICBjb25zdW1lT3JGYWlsKENMT1NFUEFS RU4sICJpbXBvcnQgY2FsbCBleHBlY3RzIGV4YWN0bHkgb25lIGFyZ3VtZW50Iik7Ci0gICAgICAg IHJldHVybiBjb250ZXh0LmNyZWF0ZUltcG9ydEV4cHIobG9jYXRpb24sIGV4cHIsIGV4cHJlc3Np b25TdGFydCwgZXhwcmVzc2lvbkVuZCwgbGFzdFRva2VuRW5kUG9zaXRpb24oKSk7CisgICAgICAg IGJhc2UgPSBjb250ZXh0LmNyZWF0ZUltcG9ydEV4cHIobG9jYXRpb24sIGV4cHIsIGV4cHJlc3Np b25TdGFydCwgZXhwcmVzc2lvbkVuZCwgbGFzdFRva2VuRW5kUG9zaXRpb24oKSk7CiAgICAgfSBl bHNlIGlmICghYmFzZUlzTmV3VGFyZ2V0KSB7CiAgICAgICAgIGNvbnN0IGJvb2wgaXNBc3luYyA9 IG1hdGNoKEFTWU5DKTsKIApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3Rz L0NoYW5nZUxvZwppbmRleCBjMmExNjEyZTA5ZDc3ZDQzNjcxZGZhYzMxZDhlYTg3NDUzMjRhOWRl Li5jOTRhOTBkMzFlZDE0MDJjOTVjYWRjNTU1NGVlMGI5N2QxMjU4MjJjIDEwMDY0NAotLS0gYS9K U1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDE3LTAxLTE3ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgorCisg ICAgICAgIGR5bmFtaWMgaW1wb3J0IGlzIGFtYmlndW91cyB3aXRoIGltcG9ydCBkZWNsYXJhdGlv biBhdCBtb2R1bGUgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY3MDk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBtb2R1bGVzL2ltcG9ydC1jYWxsLmpzOiBBZGRlZC4KKyAgICAgICAgKGZyb20u c3RyaW5nX2FwcGVhcmVkX2hlcmUuaW1wb3J0LnN0cmluZ19hcHBlYXJlZF9oZXJlLnRoZW4pOgor ICAgICAgICAqIG1vZHVsZXMvaW1wb3J0LWNhbGwvbWFpbi5qczogQWRkZWQuCisgICAgICAgICog c3RyZXNzL2ltcG9ydC1zeW50YXguanM6CisgICAgICAgIChhc3luYyk6CisKIDIwMTctMDEtMTQg IFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAgICAgQW5ub3Rh dGUgbGFyZ2Ugc3RyaW5nIHRlc3RzIHdpdGggbGFyZ2VIZWFwCmRpZmYgLS1naXQgYS9KU1Rlc3Rz L21vZHVsZXMvaW1wb3J0LWNhbGwuanMgYi9KU1Rlc3RzL21vZHVsZXMvaW1wb3J0LWNhbGwuanMK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uZWI1MjNlNzhjYmM3ODBhOTdkZGY5M2Q3OTZmYjQ3M2UyNjc3MmU1ZAotLS0g L2Rldi9udWxsCisrKyBiL0pTVGVzdHMvbW9kdWxlcy9pbXBvcnQtY2FsbC5qcwpAQCAtMCwwICsx LDUgQEAKK2ltcG9ydCB7IHNob3VsZEJlIH0gZnJvbSAiLi9yZXNvdXJjZXMvYXNzZXJ0LmpzIgor CitpbXBvcnQoIi4vaW1wb3J0LWNhbGwvbWFpbi5qcyIpLnRoZW4oKHJlc3VsdCkgPT4geworICAg IHNob3VsZEJlKHJlc3VsdC5Db2NvYSwgNDIpOworfSk7CmRpZmYgLS1naXQgYS9KU1Rlc3RzL21v ZHVsZXMvaW1wb3J0LWNhbGwvbWFpbi5qcyBiL0pTVGVzdHMvbW9kdWxlcy9pbXBvcnQtY2FsbC9t YWluLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjZiNjcxMjJkNWI2NWYzYjdmNTQ1ZDk5ZmIwNGVmYWU1ZjU1NWJj NzcKLS0tIC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL21vZHVsZXMvaW1wb3J0LWNhbGwvbWFpbi5q cwpAQCAtMCwwICsxIEBACitleHBvcnQgbGV0IENvY29hID0gNDI7CmRpZmYgLS1naXQgYS9KU1Rl c3RzL3N0cmVzcy9pbXBvcnQtc3ludGF4LmpzIGIvSlNUZXN0cy9zdHJlc3MvaW1wb3J0LXN5bnRh eC5qcwppbmRleCA4YmY3OGRhYzEwOTRhNTBlYjUzNGJmMDNkNmNlYmFjMDBkZjJiNmQwLi45MzRm Y2YyNjJiMzM3MGQzZGViMjM5MTM5MmI0MzVlOGViNDRiN2YzIDEwMDY0NAotLS0gYS9KU1Rlc3Rz L3N0cmVzcy9pbXBvcnQtc3ludGF4LmpzCisrKyBiL0pTVGVzdHMvc3RyZXNzL2ltcG9ydC1zeW50 YXguanMKQEAgLTUzLDYgKzUzLDExIEBAIGFzeW5jIGZ1bmN0aW9uIHRlc3RTeW50YXgoc2NyaXB0 LCBtZXNzYWdlKSB7CiAoYXN5bmMgZnVuY3Rpb24gKCkgewogICAgIGF3YWl0IHRlc3RTeW50YXgo YGltcG9ydCgiLi9pbXBvcnQtdGVzdHMvY29jb2EuanMiKWApOwogICAgIGF3YWl0IHRlc3RTeW50 YXgoYGltcG9ydCgiLi9pbXBvcnQtdGVzdHMvLi4vaW1wb3J0LXRlc3RzL2NvY29hLmpzIilgKTsK KyAgICBhd2FpdCB0ZXN0U3ludGF4KGBpbXBvcnQoIi4vaW1wb3J0LXRlc3RzLy4uL2ltcG9ydC10 ZXN0cy9jb2NvYS5qcyIpLnRoZW4oKCkgPT4geyB9KWApOworICAgIGF3YWl0IHRlc3RTeW50YXgo YChpbXBvcnQoIi4vaW1wb3J0LXRlc3RzLy4uL2ltcG9ydC10ZXN0cy9jb2NvYS5qcyIpLnRoZW4o KCkgPT4geyB9KSlgKTsKKyAgICBhd2FpdCB0ZXN0U3ludGF4KGAoaW1wb3J0KCIuL2ltcG9ydC10 ZXN0cy8uLi9pbXBvcnQtdGVzdHMvY29jb2EuanMiKSlgKTsKKyAgICBhd2FpdCB0ZXN0U3ludGF4 KGBpbXBvcnQoIi4vaW1wb3J0LXRlc3RzLy4uL2ltcG9ydC10ZXN0cy9jb2NvYS5qcyIpLmNhdGNo KCgpID0+IHsgfSlgKTsKKyAgICBhd2FpdCB0ZXN0U3ludGF4KGAoaW1wb3J0KCIuL2ltcG9ydC10 ZXN0cy8uLi9pbXBvcnQtdGVzdHMvY29jb2EuanMiKS5jYXRjaCgoKSA9PiB7IH0pKWApOwogfSgp KS5jYXRjaCgoZXJyb3IpID0+IHsKICAgICBwcmludChTdHJpbmcoZXJyb3IpKTsKICAgICBhYm9y dCgpOwo=