178935 2017-10-27 06:02:25 -0700 [JSC] Tweak ES6 generator function to allow inlining 2017-11-15 12:36:13 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki buildbot fpizlo jfbastien joepeck keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1365338 0 ysuzuki 2017-10-27 06:02:25 -0700 [JSC] Tweak ES6 generator function to allow inlining 1365340 1 325155 ysuzuki 2017-10-27 06:08:15 -0700 Created attachment 325155 Patch 1365343 2 325157 ysuzuki 2017-10-27 06:16:38 -0700 Created attachment 325157 Patch 1365431 3 325157 keith_miller 2017-10-27 10:45:52 -0700 Comment on attachment 325157 Patch Ugh, this is stupid that we need to do this... We really need to fix our inlining rules... 1365444 4 325157 joepeck 2017-10-27 11:10:28 -0700 Comment on attachment 325157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=325157&action=review > Source/JavaScriptCore/ChangeLog:15 > + generator.es6 269.6030+-13.2435 ^ 148.8840+-6.7614 ^ definitely 1.8108x faster Wow! > Source/JavaScriptCore/builtins/GeneratorPrototype.js:70 > + if (typeof state !== 'number') Style: I think we try to always use double quoted strings in builtins for simple strings like "number" here. > Source/JavaScriptCore/builtins/GeneratorPrototype.js:84 > + if (typeof state !== 'number') Style: I think we try to always use double quoted strings in builtins for simple strings like "number" here. 1365447 5 saam 2017-10-27 11:32:30 -0700 (In reply to Keith Miller from comment #3) > Comment on attachment 325157 [details] > Patch > > Ugh, this is stupid that we need to do this... We really need to fix our > inlining rules... Yeah, seriously ... 1365619 6 325157 ysuzuki 2017-10-27 18:46:11 -0700 Comment on attachment 325157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=325157&action=review Yeah. In the meantime, I'll optimize it in this way. It's worth doing since these functions are builtin functions, and it is tightly coupled with JSC implementaiton. >> Source/JavaScriptCore/builtins/GeneratorPrototype.js:70 >> + if (typeof state !== 'number') > > Style: I think we try to always use double quoted strings in builtins for simple strings like "number" here. Fixed. >> Source/JavaScriptCore/builtins/GeneratorPrototype.js:84 >> + if (typeof state !== 'number') > > Style: I think we try to always use double quoted strings in builtins for simple strings like "number" here. Fixed. 1365621 7 ysuzuki 2017-10-27 18:49:06 -0700 Committed r224141: <https://trac.webkit.org/changeset/224141> 1372199 8 webkit-bug-importer 2017-11-15 12:36:13 -0800 <rdar://problem/35567856> 325155 2017-10-27 06:08:15 -0700 2017-10-27 06:16:37 -0700 Patch bug-178935-20171027220814.patch text/plain 5325 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 ZTU1MGVmZjUxMzlhODFhOTRlZjVhMWEwYTYyOTE2YjcxODk1OGJmLi5iYTZjYWVhMjQ4NWFmZTYx MGNmNTQwZDliMzdjMDczNTI5NGY0YjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxNy0xMC0yNyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBUd2VhayBFUzYgZ2VuZXJhdG9yIGZ1bmN0aW9uIHRvIGFs bG93IGlubGluaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzg5MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXZSBvcHRpbWl6ZSBidWlsdGlucycgZ2VuZXJhdG9yIGhlbHBlciBmdW5jdGlvbnMgdG8g YWxsb3cgdGhlbSBpbmxpbmVkIGluIHRoZSBjYWxsZXIgc2lkZS4KKyAgICAgICAgVGhpcyBwYXRj aCBhZGp1c3QgdGhlIGxheWVyIGJldHdlZW4gQGdlbmVyYXRvclJlc3VtZSwgbmV4dCgpLCB0aHJv dygpLCBhbmQgcmV0dXJuKCkgdG8gYWxsb3cKKyAgICAgICAgdGhlbSBpbmxpbmVkIGluIERGRy4K KworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFzZWxpbmUgICAgICAg ICAgICAgICAgICBwYXRjaGVkCisKKyAgICAgICAgc3ByZWFkLWdlbmVyYXRvci5lczYgICAgICAz MDEuMjYzNystMTEuMTAxMSAgICBeICAgIDI2MC41OTA1Ky0xNC4yMjU4ICAgICAgIF4gZGVmaW5p dGVseSAxLjE1NjF4IGZhc3RlcgorICAgICAgICBnZW5lcmF0b3IuZXM2ICAgICAgICAgICAgIDI2 OS42MDMwKy0xMy4yNDM1ICAgIF4gICAgMTQ4Ljg4NDArLTYuNzYxNCAgICAgICAgXiBkZWZpbml0 ZWx5IDEuODEwOHggZmFzdGVyCisKKyAgICAgICAgKiBidWlsdGlucy9HZW5lcmF0b3JQcm90b3R5 cGUuanM6CisgICAgICAgIChnbG9iYWxQcml2YXRlLmdlbmVyYXRvclJlc3VtZSk6CisgICAgICAg IChuZXh0KToKKyAgICAgICAgKHJldHVybik6CisgICAgICAgICh0aHJvdyk6CisKIDIwMTctMTAt MjYgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVT U0lPTihyMjIyNjAxKTogV2UgZmFpbCB0byBwcm9wZXJseSBiYWNrdHJhY2sgaW50byBhIHN1YiBw YXR0ZXJuIG9mIGEgcGFyZW50aGVzaXMgd2l0aCBub24temVybyBtaW5pbXVtCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnVpbHRpbnMvR2VuZXJhdG9yUHJvdG90eXBlLmpzIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2J1aWx0aW5zL0dlbmVyYXRvclByb3RvdHlwZS5qcwppbmRl eCA0MTI4YTM1MzJmNTA3YTYzZmZlMzE3YzQ5YjdjYTg1NDczMzNhYTI1Li5hNzU4OTBjYzBhZmM2 YmUwNWUwYzYyODQwMGVkMzc2MTE1YjlmNmMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYnVpbHRpbnMvR2VuZXJhdG9yUHJvdG90eXBlLmpzCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9idWlsdGlucy9HZW5lcmF0b3JQcm90b3R5cGUuanMKQEAgLTI3LDMxICsyNywxNSBA QAogLy8gMjUuMy4zLjMgR2VuZXJhdG9yUmVzdW1lICggZ2VuZXJhdG9yLCB2YWx1ZSApCiAvLyAy NS4zLjMuNCBHZW5lcmF0b3JSZXN1bWVBYnJ1cHQoZ2VuZXJhdG9yLCBhYnJ1cHRDb21wbGV0aW9u KQogQGdsb2JhbFByaXZhdGUKLWZ1bmN0aW9uIGdlbmVyYXRvclJlc3VtZShnZW5lcmF0b3IsIHNl bnRWYWx1ZSwgcmVzdW1lTW9kZSkKK2Z1bmN0aW9uIGdlbmVyYXRvclJlc3VtZShnZW5lcmF0b3Is IHN0YXRlLCBnZW5lcmF0b3JUaGlzLCBzZW50VmFsdWUsIHZhbHVlLCByZXN1bWVNb2RlKQogewog ICAgICJ1c2Ugc3RyaWN0IjsKIAotICAgIGxldCBzdGF0ZSA9IGdlbmVyYXRvci5AZ2VuZXJhdG9y U3RhdGU7Ci0gICAgbGV0IGRvbmUgPSBmYWxzZTsKLSAgICBsZXQgdmFsdWUgPSBAdW5kZWZpbmVk OwotCi0gICAgaWYgKHR5cGVvZiBzdGF0ZSAhPT0gJ251bWJlcicpCi0gICAgICAgIEB0aHJvd1R5 cGVFcnJvcigifHRoaXN8IHNob3VsZCBiZSBhIGdlbmVyYXRvciIpOwotCi0gICAgaWYgKHN0YXRl ID09PSBAR2VuZXJhdG9yU3RhdGVFeGVjdXRpbmcpCi0gICAgICAgIEB0aHJvd1R5cGVFcnJvcigi R2VuZXJhdG9yIGlzIGV4ZWN1dGluZyIpOwotCi0gICAgaWYgKHN0YXRlID09PSBAR2VuZXJhdG9y U3RhdGVDb21wbGV0ZWQpIHsKLSAgICAgICAgaWYgKHJlc3VtZU1vZGUgPT09IEBHZW5lcmF0b3JS ZXN1bWVNb2RlVGhyb3cpCi0gICAgICAgICAgICB0aHJvdyBzZW50VmFsdWU7Ci0KLSAgICAgICAg ZG9uZSA9IHRydWU7Ci0gICAgICAgIGlmIChyZXN1bWVNb2RlID09PSBAR2VuZXJhdG9yUmVzdW1l TW9kZVJldHVybikKLSAgICAgICAgICAgIHZhbHVlID0gc2VudFZhbHVlOwotICAgIH0gZWxzZSB7 CisgICAgdmFyIGRvbmUgPSBzdGF0ZSA9PT0gQEdlbmVyYXRvclN0YXRlQ29tcGxldGVkOworICAg IGlmICghZG9uZSkgewogICAgICAgICB0cnkgewogICAgICAgICAgICAgZ2VuZXJhdG9yLkBnZW5l cmF0b3JTdGF0ZSA9IEBHZW5lcmF0b3JTdGF0ZUV4ZWN1dGluZzsKLSAgICAgICAgICAgIHZhbHVl ID0gZ2VuZXJhdG9yLkBnZW5lcmF0b3JOZXh0LkBjYWxsKGdlbmVyYXRvci5AZ2VuZXJhdG9yVGhp cywgZ2VuZXJhdG9yLCBzdGF0ZSwgc2VudFZhbHVlLCByZXN1bWVNb2RlLCBnZW5lcmF0b3IuQGdl bmVyYXRvckZyYW1lKTsKKyAgICAgICAgICAgIHZhbHVlID0gZ2VuZXJhdG9yLkBnZW5lcmF0b3JO ZXh0LkBjYWxsKGdlbmVyYXRvclRoaXMsIGdlbmVyYXRvciwgc3RhdGUsIHNlbnRWYWx1ZSwgcmVz dW1lTW9kZSwgZ2VuZXJhdG9yLkBnZW5lcmF0b3JGcmFtZSk7CiAgICAgICAgICAgICBpZiAoZ2Vu ZXJhdG9yLkBnZW5lcmF0b3JTdGF0ZSA9PT0gQEdlbmVyYXRvclN0YXRlRXhlY3V0aW5nKSB7CiAg ICAgICAgICAgICAgICAgZ2VuZXJhdG9yLkBnZW5lcmF0b3JTdGF0ZSA9IEBHZW5lcmF0b3JTdGF0 ZUNvbXBsZXRlZDsKICAgICAgICAgICAgICAgICBkb25lID0gdHJ1ZTsKQEAgLTY4LDE5ICs1Miw0 MyBAQCBmdW5jdGlvbiBuZXh0KHZhbHVlKQogewogICAgICJ1c2Ugc3RyaWN0IjsKIAotICAgIHJl dHVybiBAZ2VuZXJhdG9yUmVzdW1lKHRoaXMsIHZhbHVlLCBAR2VuZXJhdG9yUmVzdW1lTW9kZU5v cm1hbCk7CisgICAgdmFyIHN0YXRlID0gdGhpcy5AZ2VuZXJhdG9yU3RhdGU7CisgICAgaWYgKHR5 cGVvZiBzdGF0ZSAhPT0gJ251bWJlcicpCisgICAgICAgIEB0aHJvd1R5cGVFcnJvcigifHRoaXN8 IHNob3VsZCBiZSBhIGdlbmVyYXRvciIpOworCisgICAgaWYgKHN0YXRlID09PSBAR2VuZXJhdG9y U3RhdGVFeGVjdXRpbmcpCisgICAgICAgIEB0aHJvd1R5cGVFcnJvcigiR2VuZXJhdG9yIGlzIGV4 ZWN1dGluZyIpOworCisgICAgcmV0dXJuIEBnZW5lcmF0b3JSZXN1bWUodGhpcywgc3RhdGUsIHRo aXMuQGdlbmVyYXRvclRoaXMsIHZhbHVlLCBAdW5kZWZpbmVkLCBAR2VuZXJhdG9yUmVzdW1lTW9k ZU5vcm1hbCk7CiB9CiAKIGZ1bmN0aW9uIHJldHVybih2YWx1ZSkKIHsKICAgICAidXNlIHN0cmlj dCI7CiAKLSAgICByZXR1cm4gQGdlbmVyYXRvclJlc3VtZSh0aGlzLCB2YWx1ZSwgQEdlbmVyYXRv clJlc3VtZU1vZGVSZXR1cm4pOworICAgIHZhciBzdGF0ZSA9IHRoaXMuQGdlbmVyYXRvclN0YXRl OworICAgIGlmICh0eXBlb2Ygc3RhdGUgIT09ICdudW1iZXInKQorICAgICAgICBAdGhyb3dUeXBl RXJyb3IoInx0aGlzfCBzaG91bGQgYmUgYSBnZW5lcmF0b3IiKTsKKworICAgIGlmIChzdGF0ZSA9 PT0gQEdlbmVyYXRvclN0YXRlRXhlY3V0aW5nKQorICAgICAgICBAdGhyb3dUeXBlRXJyb3IoIkdl bmVyYXRvciBpcyBleGVjdXRpbmciKTsKKworICAgIHJldHVybiBAZ2VuZXJhdG9yUmVzdW1lKHRo aXMsIHN0YXRlLCB0aGlzLkBnZW5lcmF0b3JUaGlzLCB2YWx1ZSwgdmFsdWUsIEBHZW5lcmF0b3JS ZXN1bWVNb2RlUmV0dXJuKTsKIH0KIAogZnVuY3Rpb24gdGhyb3coZXhjZXB0aW9uKQogewogICAg ICJ1c2Ugc3RyaWN0IjsKIAotICAgIHJldHVybiBAZ2VuZXJhdG9yUmVzdW1lKHRoaXMsIGV4Y2Vw dGlvbiwgQEdlbmVyYXRvclJlc3VtZU1vZGVUaHJvdyk7CisgICAgdmFyIHN0YXRlID0gdGhpcy5A Z2VuZXJhdG9yU3RhdGU7CisgICAgaWYgKHR5cGVvZiBzdGF0ZSAhPT0gJ251bWJlcicpCisgICAg ICAgIEB0aHJvd1R5cGVFcnJvcigifHRoaXN8IHNob3VsZCBiZSBhIGdlbmVyYXRvciIpOworCisg ICAgaWYgKHN0YXRlID09PSBAR2VuZXJhdG9yU3RhdGVFeGVjdXRpbmcpCisgICAgICAgIEB0aHJv d1R5cGVFcnJvcigiR2VuZXJhdG9yIGlzIGV4ZWN1dGluZyIpOworCisgICAgaWYgKHN0YXRlID09 PSBAR2VuZXJhdG9yU3RhdGVDb21wbGV0ZWQpCisgICAgICAgIHRocm93IGV4Y2VwdGlvbjsKKwor ICAgIHJldHVybiBAZ2VuZXJhdG9yUmVzdW1lKHRoaXMsIHN0YXRlLCB0aGlzLkBnZW5lcmF0b3JU aGlzLCBleGNlcHRpb24sIEB1bmRlZmluZWQsIEBHZW5lcmF0b3JSZXN1bWVNb2RlVGhyb3cpOwog fQpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9BUkVTLTYvZ2x1ZS5qcyBiL1BlcmZvcm1h bmNlVGVzdHMvQVJFUy02L2dsdWUuanMKaW5kZXggMWU3NWQ4YzZmOTE4Y2RiZTY5YTNkNTA4Njhi ZmE3ZDFhOWRkNDJjYi4uMjIyNjgyYTQwNTkxMjBiNTBhMmU0M2M3MzMwMGY5YjcxMDgyMWJjYiAx MDA2NDQKLS0tIGEvUGVyZm9ybWFuY2VUZXN0cy9BUkVTLTYvZ2x1ZS5qcworKysgYi9QZXJmb3Jt YW5jZVRlc3RzL0FSRVMtNi9nbHVlLmpzCkBAIC00Nyw4ICs0Nyw4IEBAIGZ1bmN0aW9uIHJlcG9y dFJlc3VsdCguLi5hcmdzKSB7CiAgICAgfQogfQogCi1kcml2ZXIuYWRkQmVuY2htYXJrKEFpckJl bmNobWFya1J1bm5lcik7CisvLyBkcml2ZXIuYWRkQmVuY2htYXJrKEFpckJlbmNobWFya1J1bm5l cik7CiBkcml2ZXIuYWRkQmVuY2htYXJrKEJhc2ljQmVuY2htYXJrUnVubmVyKTsKLWRyaXZlci5h ZGRCZW5jaG1hcmsoQmFieWxvbkJlbmNobWFya1J1bm5lcik7Ci1kcml2ZXIuYWRkQmVuY2htYXJr KE1MQmVuY2htYXJrUnVubmVyKTsKKy8vIGRyaXZlci5hZGRCZW5jaG1hcmsoQmFieWxvbkJlbmNo bWFya1J1bm5lcik7CisvLyBkcml2ZXIuYWRkQmVuY2htYXJrKE1MQmVuY2htYXJrUnVubmVyKTsK IGRyaXZlci5yZWFkeVRyaWdnZXIoKTsK 325157 2017-10-27 06:16:38 -0700 2017-10-27 10:16:39 -0700 Patch bug-178935-20171027221637.patch text/plain 4676 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 ZTU1MGVmZjUxMzlhODFhOTRlZjVhMWEwYTYyOTE2YjcxODk1OGJmLi5iYTZjYWVhMjQ4NWFmZTYx MGNmNTQwZDliMzdjMDczNTI5NGY0YjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxNy0xMC0yNyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBUd2VhayBFUzYgZ2VuZXJhdG9yIGZ1bmN0aW9uIHRvIGFs bG93IGlubGluaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzg5MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXZSBvcHRpbWl6ZSBidWlsdGlucycgZ2VuZXJhdG9yIGhlbHBlciBmdW5jdGlvbnMgdG8g YWxsb3cgdGhlbSBpbmxpbmVkIGluIHRoZSBjYWxsZXIgc2lkZS4KKyAgICAgICAgVGhpcyBwYXRj aCBhZGp1c3QgdGhlIGxheWVyIGJldHdlZW4gQGdlbmVyYXRvclJlc3VtZSwgbmV4dCgpLCB0aHJv dygpLCBhbmQgcmV0dXJuKCkgdG8gYWxsb3cKKyAgICAgICAgdGhlbSBpbmxpbmVkIGluIERGRy4K KworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFzZWxpbmUgICAgICAg ICAgICAgICAgICBwYXRjaGVkCisKKyAgICAgICAgc3ByZWFkLWdlbmVyYXRvci5lczYgICAgICAz MDEuMjYzNystMTEuMTAxMSAgICBeICAgIDI2MC41OTA1Ky0xNC4yMjU4ICAgICAgIF4gZGVmaW5p dGVseSAxLjE1NjF4IGZhc3RlcgorICAgICAgICBnZW5lcmF0b3IuZXM2ICAgICAgICAgICAgIDI2 OS42MDMwKy0xMy4yNDM1ICAgIF4gICAgMTQ4Ljg4NDArLTYuNzYxNCAgICAgICAgXiBkZWZpbml0 ZWx5IDEuODEwOHggZmFzdGVyCisKKyAgICAgICAgKiBidWlsdGlucy9HZW5lcmF0b3JQcm90b3R5 cGUuanM6CisgICAgICAgIChnbG9iYWxQcml2YXRlLmdlbmVyYXRvclJlc3VtZSk6CisgICAgICAg IChuZXh0KToKKyAgICAgICAgKHJldHVybik6CisgICAgICAgICh0aHJvdyk6CisKIDIwMTctMTAt MjYgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVT U0lPTihyMjIyNjAxKTogV2UgZmFpbCB0byBwcm9wZXJseSBiYWNrdHJhY2sgaW50byBhIHN1YiBw YXR0ZXJuIG9mIGEgcGFyZW50aGVzaXMgd2l0aCBub24temVybyBtaW5pbXVtCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnVpbHRpbnMvR2VuZXJhdG9yUHJvdG90eXBlLmpzIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2J1aWx0aW5zL0dlbmVyYXRvclByb3RvdHlwZS5qcwppbmRl eCA0MTI4YTM1MzJmNTA3YTYzZmZlMzE3YzQ5YjdjYTg1NDczMzNhYTI1Li5hNzU4OTBjYzBhZmM2 YmUwNWUwYzYyODQwMGVkMzc2MTE1YjlmNmMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYnVpbHRpbnMvR2VuZXJhdG9yUHJvdG90eXBlLmpzCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9idWlsdGlucy9HZW5lcmF0b3JQcm90b3R5cGUuanMKQEAgLTI3LDMxICsyNywxNSBA QAogLy8gMjUuMy4zLjMgR2VuZXJhdG9yUmVzdW1lICggZ2VuZXJhdG9yLCB2YWx1ZSApCiAvLyAy NS4zLjMuNCBHZW5lcmF0b3JSZXN1bWVBYnJ1cHQoZ2VuZXJhdG9yLCBhYnJ1cHRDb21wbGV0aW9u KQogQGdsb2JhbFByaXZhdGUKLWZ1bmN0aW9uIGdlbmVyYXRvclJlc3VtZShnZW5lcmF0b3IsIHNl bnRWYWx1ZSwgcmVzdW1lTW9kZSkKK2Z1bmN0aW9uIGdlbmVyYXRvclJlc3VtZShnZW5lcmF0b3Is IHN0YXRlLCBnZW5lcmF0b3JUaGlzLCBzZW50VmFsdWUsIHZhbHVlLCByZXN1bWVNb2RlKQogewog ICAgICJ1c2Ugc3RyaWN0IjsKIAotICAgIGxldCBzdGF0ZSA9IGdlbmVyYXRvci5AZ2VuZXJhdG9y U3RhdGU7Ci0gICAgbGV0IGRvbmUgPSBmYWxzZTsKLSAgICBsZXQgdmFsdWUgPSBAdW5kZWZpbmVk OwotCi0gICAgaWYgKHR5cGVvZiBzdGF0ZSAhPT0gJ251bWJlcicpCi0gICAgICAgIEB0aHJvd1R5 cGVFcnJvcigifHRoaXN8IHNob3VsZCBiZSBhIGdlbmVyYXRvciIpOwotCi0gICAgaWYgKHN0YXRl ID09PSBAR2VuZXJhdG9yU3RhdGVFeGVjdXRpbmcpCi0gICAgICAgIEB0aHJvd1R5cGVFcnJvcigi R2VuZXJhdG9yIGlzIGV4ZWN1dGluZyIpOwotCi0gICAgaWYgKHN0YXRlID09PSBAR2VuZXJhdG9y U3RhdGVDb21wbGV0ZWQpIHsKLSAgICAgICAgaWYgKHJlc3VtZU1vZGUgPT09IEBHZW5lcmF0b3JS ZXN1bWVNb2RlVGhyb3cpCi0gICAgICAgICAgICB0aHJvdyBzZW50VmFsdWU7Ci0KLSAgICAgICAg ZG9uZSA9IHRydWU7Ci0gICAgICAgIGlmIChyZXN1bWVNb2RlID09PSBAR2VuZXJhdG9yUmVzdW1l TW9kZVJldHVybikKLSAgICAgICAgICAgIHZhbHVlID0gc2VudFZhbHVlOwotICAgIH0gZWxzZSB7 CisgICAgdmFyIGRvbmUgPSBzdGF0ZSA9PT0gQEdlbmVyYXRvclN0YXRlQ29tcGxldGVkOworICAg IGlmICghZG9uZSkgewogICAgICAgICB0cnkgewogICAgICAgICAgICAgZ2VuZXJhdG9yLkBnZW5l cmF0b3JTdGF0ZSA9IEBHZW5lcmF0b3JTdGF0ZUV4ZWN1dGluZzsKLSAgICAgICAgICAgIHZhbHVl ID0gZ2VuZXJhdG9yLkBnZW5lcmF0b3JOZXh0LkBjYWxsKGdlbmVyYXRvci5AZ2VuZXJhdG9yVGhp cywgZ2VuZXJhdG9yLCBzdGF0ZSwgc2VudFZhbHVlLCByZXN1bWVNb2RlLCBnZW5lcmF0b3IuQGdl bmVyYXRvckZyYW1lKTsKKyAgICAgICAgICAgIHZhbHVlID0gZ2VuZXJhdG9yLkBnZW5lcmF0b3JO ZXh0LkBjYWxsKGdlbmVyYXRvclRoaXMsIGdlbmVyYXRvciwgc3RhdGUsIHNlbnRWYWx1ZSwgcmVz dW1lTW9kZSwgZ2VuZXJhdG9yLkBnZW5lcmF0b3JGcmFtZSk7CiAgICAgICAgICAgICBpZiAoZ2Vu ZXJhdG9yLkBnZW5lcmF0b3JTdGF0ZSA9PT0gQEdlbmVyYXRvclN0YXRlRXhlY3V0aW5nKSB7CiAg ICAgICAgICAgICAgICAgZ2VuZXJhdG9yLkBnZW5lcmF0b3JTdGF0ZSA9IEBHZW5lcmF0b3JTdGF0 ZUNvbXBsZXRlZDsKICAgICAgICAgICAgICAgICBkb25lID0gdHJ1ZTsKQEAgLTY4LDE5ICs1Miw0 MyBAQCBmdW5jdGlvbiBuZXh0KHZhbHVlKQogewogICAgICJ1c2Ugc3RyaWN0IjsKIAotICAgIHJl dHVybiBAZ2VuZXJhdG9yUmVzdW1lKHRoaXMsIHZhbHVlLCBAR2VuZXJhdG9yUmVzdW1lTW9kZU5v cm1hbCk7CisgICAgdmFyIHN0YXRlID0gdGhpcy5AZ2VuZXJhdG9yU3RhdGU7CisgICAgaWYgKHR5 cGVvZiBzdGF0ZSAhPT0gJ251bWJlcicpCisgICAgICAgIEB0aHJvd1R5cGVFcnJvcigifHRoaXN8 IHNob3VsZCBiZSBhIGdlbmVyYXRvciIpOworCisgICAgaWYgKHN0YXRlID09PSBAR2VuZXJhdG9y U3RhdGVFeGVjdXRpbmcpCisgICAgICAgIEB0aHJvd1R5cGVFcnJvcigiR2VuZXJhdG9yIGlzIGV4 ZWN1dGluZyIpOworCisgICAgcmV0dXJuIEBnZW5lcmF0b3JSZXN1bWUodGhpcywgc3RhdGUsIHRo aXMuQGdlbmVyYXRvclRoaXMsIHZhbHVlLCBAdW5kZWZpbmVkLCBAR2VuZXJhdG9yUmVzdW1lTW9k ZU5vcm1hbCk7CiB9CiAKIGZ1bmN0aW9uIHJldHVybih2YWx1ZSkKIHsKICAgICAidXNlIHN0cmlj dCI7CiAKLSAgICByZXR1cm4gQGdlbmVyYXRvclJlc3VtZSh0aGlzLCB2YWx1ZSwgQEdlbmVyYXRv clJlc3VtZU1vZGVSZXR1cm4pOworICAgIHZhciBzdGF0ZSA9IHRoaXMuQGdlbmVyYXRvclN0YXRl OworICAgIGlmICh0eXBlb2Ygc3RhdGUgIT09ICdudW1iZXInKQorICAgICAgICBAdGhyb3dUeXBl RXJyb3IoInx0aGlzfCBzaG91bGQgYmUgYSBnZW5lcmF0b3IiKTsKKworICAgIGlmIChzdGF0ZSA9 PT0gQEdlbmVyYXRvclN0YXRlRXhlY3V0aW5nKQorICAgICAgICBAdGhyb3dUeXBlRXJyb3IoIkdl bmVyYXRvciBpcyBleGVjdXRpbmciKTsKKworICAgIHJldHVybiBAZ2VuZXJhdG9yUmVzdW1lKHRo aXMsIHN0YXRlLCB0aGlzLkBnZW5lcmF0b3JUaGlzLCB2YWx1ZSwgdmFsdWUsIEBHZW5lcmF0b3JS ZXN1bWVNb2RlUmV0dXJuKTsKIH0KIAogZnVuY3Rpb24gdGhyb3coZXhjZXB0aW9uKQogewogICAg ICJ1c2Ugc3RyaWN0IjsKIAotICAgIHJldHVybiBAZ2VuZXJhdG9yUmVzdW1lKHRoaXMsIGV4Y2Vw dGlvbiwgQEdlbmVyYXRvclJlc3VtZU1vZGVUaHJvdyk7CisgICAgdmFyIHN0YXRlID0gdGhpcy5A Z2VuZXJhdG9yU3RhdGU7CisgICAgaWYgKHR5cGVvZiBzdGF0ZSAhPT0gJ251bWJlcicpCisgICAg ICAgIEB0aHJvd1R5cGVFcnJvcigifHRoaXN8IHNob3VsZCBiZSBhIGdlbmVyYXRvciIpOworCisg ICAgaWYgKHN0YXRlID09PSBAR2VuZXJhdG9yU3RhdGVFeGVjdXRpbmcpCisgICAgICAgIEB0aHJv d1R5cGVFcnJvcigiR2VuZXJhdG9yIGlzIGV4ZWN1dGluZyIpOworCisgICAgaWYgKHN0YXRlID09 PSBAR2VuZXJhdG9yU3RhdGVDb21wbGV0ZWQpCisgICAgICAgIHRocm93IGV4Y2VwdGlvbjsKKwor ICAgIHJldHVybiBAZ2VuZXJhdG9yUmVzdW1lKHRoaXMsIHN0YXRlLCB0aGlzLkBnZW5lcmF0b3JU aGlzLCBleGNlcHRpb24sIEB1bmRlZmluZWQsIEBHZW5lcmF0b3JSZXN1bWVNb2RlVGhyb3cpOwog fQo=