194659 2019-02-14 11:28:02 -0800 [JSC] Non-JIT entrypoints should share NativeJITCode per entrypoint type 2019-02-14 13:38:08 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 193606 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1506271 0 ysuzuki 2019-02-14 11:28:02 -0800 ... 1506300 1 362047 ysuzuki 2019-02-14 12:26:48 -0800 Created attachment 362047 Patch 1506306 2 362047 mark.lam 2019-02-14 12:48:16 -0800 Comment on attachment 362047 Patch r=me 1506335 3 ysuzuki 2019-02-14 13:35:22 -0800 Committed r241560: <https://trac.webkit.org/changeset/241560> 1506336 4 webkit-bug-importer 2019-02-14 13:36:27 -0800 <rdar://problem/48086188> 362047 2019-02-14 12:26:48 -0800 2019-02-14 12:48:16 -0800 Patch bug-194659-20190214122648.patch text/plain 9684 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm MTMyM2JiYWEwZDY3YmFmYzhhMjQ4NjIzZjg3YWQ0M2I0MTgxZWQwLi5iZWZiN2YwOTY2YTM3ZWNk NDhlYjllYzc1NzVhNDZlMjY0ZWUwY2E3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxOS0wMi0xNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIE5vbi1KSVQgZW50cnlwb2ludHMgc2hvdWxkIHNoYXJlIE5hdGl2 ZUpJVENvZGUgcGVyIGVudHJ5cG9pbnQgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0NjU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm9uLUpJVCBlbnRyeXBvaW50cyBjcmVhdGUgTmF0aXZlSklU Q29kZSBldmVyeSB0aW1lIGl0IGlzIGNhbGxlZC4gQnV0IGl0IGlzIG1lYW5pbmdsZXNzIHNpbmNl IHRoZXNlIGVudHJ5IHBvaW50IGNvZGUgYXJlIGlkZW50aWNhbC4KKyAgICAgICAgV2Ugc2hvdWxk IGNyZWF0ZSBvbmUgcGVyIGVudHJ5cG9pbnQgdHlwZSAoZm9yIGZ1bmN0aW9uLCB3ZSBzaG91bGQg aGF2ZSBDb2RlRm9yQ2FsbCBhbmQgQ29kZUZvckNvbnN0cnVjdCkgYW5kIGNvbnRpbnVlIHRvIHVz ZSB0aGVtLgorICAgICAgICBBbmQgd2UgdXNlIE5hdGl2ZUpJVENvZGUgaW5zdGVhZCBvZiBEaXJl Y3RKSVRDb2RlIGlmIGl0IGRvZXMgbm90IGhhdmUgZGlmZmVyZW5jZSBiZXR3ZWVuIHVzdWFsIGVu dHJ5cG9pbnQgYW5kIGFyaXR5IGNoZWNrIGVudHJ5cG9pbnQuCisKKyAgICAgICAgKiBkZmcvREZH SklUQ29kZS5oOgorICAgICAgICAqIGRmZy9ERkdKSVRGaW5hbGl6ZXIuY3BwOgorICAgICAgICAo SlNDOjpERkc6OkpJVEZpbmFsaXplcjo6ZmluYWxpemUpOgorICAgICAgICAoSlNDOjpERkc6OkpJ VEZpbmFsaXplcjo6ZmluYWxpemVGdW5jdGlvbik6CisgICAgICAgICogaml0L0pJVENvZGUuY3Bw OgorICAgICAgICAoSlNDOjpEaXJlY3RKSVRDb2RlOjppbml0aWFsaXplQ29kZVJlZkZvckRGRyk6 CisgICAgICAgIChKU0M6OkRpcmVjdEpJVENvZGU6OmluaXRpYWxpemVDb2RlUmVmKTogRGVsZXRl ZC4KKyAgICAgICAgKEpTQzo6TmF0aXZlSklUQ29kZTo6aW5pdGlhbGl6ZUNvZGVSZWYpOiBEZWxl dGVkLgorICAgICAgICAqIGppdC9KSVRDb2RlLmg6CisgICAgICAgICogbGxpbnQvTExJbnRFbnRy eXBvaW50LmNwcDoKKyAgICAgICAgKEpTQzo6TExJbnQ6OnNldEZ1bmN0aW9uRW50cnlwb2ludCk6 CisgICAgICAgIChKU0M6OkxMSW50OjpzZXRFdmFsRW50cnlwb2ludCk6CisgICAgICAgIChKU0M6 OkxMSW50OjpzZXRQcm9ncmFtRW50cnlwb2ludCk6CisgICAgICAgIChKU0M6OkxMSW50OjpzZXRN b2R1bGVQcm9ncmFtRW50cnlwb2ludCk6IFJldGFnZ2VkIGlzIHJlbW92ZWQgc2luY2UgdGhlIHRh ZyBpcyB0aGUgc2FtZS4KKwogMjAxOS0wMi0xNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBw bGUuY29tPgogCiAgICAgICAgIFtKU0NdIFNob3VsZCBoYXZlIGRlZmF1bHQgTmF0aXZlSklUQ29k ZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb2RlLmggYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvZGUuaAppbmRleCA4NDdhODM1NmFkNzkz MDRlMDYwNzBlMzZkNDE2MmY3MmE3ZjhlZDFjLi4yNjJlMDRmNDAxZjEzY2U3ODMwNzBjZDk5MTVm MjMxZTJhZmQyZWIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJ VENvZGUuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvZGUuaApAQCAt MTI3LDYgKzEyNyw4IEBAIGNsYXNzIEpJVENvZGUgOiBwdWJsaWMgRGlyZWN0SklUQ29kZSB7CiAg ICAgc3RhdGljIHB0cmRpZmZfdCBjb21tb25EYXRhT2Zmc2V0KCkgeyByZXR1cm4gT0JKRUNUX09G RlNFVE9GKEpJVENvZGUsIGNvbW1vbik7IH0KIAogICAgIE9wdGlvbmFsPENvZGVPcmlnaW4+IGZp bmRQQyhDb2RlQmxvY2sqLCB2b2lkKiBwYykgb3ZlcnJpZGU7CisKKyAgICB1c2luZyBEaXJlY3RK SVRDb2RlOjppbml0aWFsaXplQ29kZVJlZkZvckRGRzsKICAgICAKIHByaXZhdGU6CiAgICAgZnJp ZW5kIGNsYXNzIEpJVENvbXBpbGVyOyAvLyBBbGxvdyBKSVRDb21waWxlciB0byBjYWxsIHNldENv ZGVSZWYoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklURmlu YWxpemVyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklURmluYWxpemVyLmNw cAppbmRleCA3MzMyNmUyZDMzZjQ5MTkxNmViMWEwNmQzYTk1NjQxOGRlODdmMDE2Li4xNTg4MmM2 Zjk2ZDJmZDBlODFlZWUwNzI5ZjgzMzdkZTg0ZDU0YzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR0pJVEZpbmFsaXplci5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdKSVRGaW5hbGl6ZXIuY3BwCkBAIC01Nyw3ICs1Nyw3IEBAIHNpemVfdCBK SVRGaW5hbGl6ZXI6OmNvZGVTaXplKCkKIGJvb2wgSklURmluYWxpemVyOjpmaW5hbGl6ZSgpCiB7 CiAgICAgTWFjcm9Bc3NlbWJsZXJDb2RlUmVmPEpTRW50cnlQdHJUYWc+IGNvZGVSZWYgPSBGSU5B TElaRV9ERkdfQ09ERSgqbV9saW5rQnVmZmVyLCBKU0VudHJ5UHRyVGFnLCAiREZHIEpJVCBjb2Rl IGZvciAlcyIsIHRvQ1N0cmluZyhDb2RlQmxvY2tXaXRoSklUVHlwZShtX3BsYW4uY29kZUJsb2Nr KCksIEpJVENvZGU6OkRGR0pJVCkpLmRhdGEoKSk7Ci0gICAgbV9qaXRDb2RlLT5pbml0aWFsaXpl Q29kZVJlZihjb2RlUmVmLCBjb2RlUmVmLmNvZGUoKSk7CisgICAgbV9qaXRDb2RlLT5pbml0aWFs aXplQ29kZVJlZkZvckRGRyhjb2RlUmVmLCBjb2RlUmVmLmNvZGUoKSk7CiAKICAgICBtX3BsYW4u Y29kZUJsb2NrKCktPnNldEpJVENvZGUobV9qaXRDb2RlLmNvcHlSZWYoKSk7CiAKQEAgLTY5LDcg KzY5LDcgQEAgYm9vbCBKSVRGaW5hbGl6ZXI6OmZpbmFsaXplKCkKIGJvb2wgSklURmluYWxpemVy OjpmaW5hbGl6ZUZ1bmN0aW9uKCkKIHsKICAgICBSRUxFQVNFX0FTU0VSVCghbV93aXRoQXJpdHlD aGVjay5pc0VtcHR5VmFsdWUoKSk7Ci0gICAgbV9qaXRDb2RlLT5pbml0aWFsaXplQ29kZVJlZigK KyAgICBtX2ppdENvZGUtPmluaXRpYWxpemVDb2RlUmVmRm9yREZHKAogICAgICAgICBGSU5BTEla RV9ERkdfQ09ERSgqbV9saW5rQnVmZmVyLCBKU0VudHJ5UHRyVGFnLCAiREZHIEpJVCBjb2RlIGZv ciAlcyIsIHRvQ1N0cmluZyhDb2RlQmxvY2tXaXRoSklUVHlwZShtX3BsYW4uY29kZUJsb2NrKCks IEpJVENvZGU6OkRGR0pJVCkpLmRhdGEoKSksCiAgICAgICAgIG1fd2l0aEFyaXR5Q2hlY2spOwog ICAgIG1fcGxhbi5jb2RlQmxvY2soKS0+c2V0SklUQ29kZShtX2ppdENvZGUuY29weVJlZigpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUQ29kZS5jcHAgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVENvZGUuY3BwCmluZGV4IDcxNGFiMjNhNDM1NWFkYjEy NDE1ZTZiZDdmYTU1ZWVlYzM4NTVmZWIuLmUyOTVhOGFiYTc0ZjBlNjQ0Yzk1ODY1YzhmZTQwY2Fl N2QyN2U2NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUQ29kZS5j cHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDb2RlLmNwcApAQCAtMTcyLDcg KzE3Miw3IEBAIERpcmVjdEpJVENvZGU6On5EaXJlY3RKSVRDb2RlKCkKIHsKIH0KIAotdm9pZCBE aXJlY3RKSVRDb2RlOjppbml0aWFsaXplQ29kZVJlZihKSVRDb2RlOjpDb2RlUmVmPEpTRW50cnlQ dHJUYWc+IHJlZiwgSklUQ29kZTo6Q29kZVB0cjxKU0VudHJ5UHRyVGFnPiB3aXRoQXJpdHlDaGVj aykKK3ZvaWQgRGlyZWN0SklUQ29kZTo6aW5pdGlhbGl6ZUNvZGVSZWZGb3JERkcoSklUQ29kZTo6 Q29kZVJlZjxKU0VudHJ5UHRyVGFnPiByZWYsIEpJVENvZGU6OkNvZGVQdHI8SlNFbnRyeVB0clRh Zz4gd2l0aEFyaXR5Q2hlY2spCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoIW1fcmVmKTsKICAgICBt X3JlZiA9IHJlZjsKQEAgLTIxMCwxMiArMjEwLDYgQEAgTmF0aXZlSklUQ29kZTo6fk5hdGl2ZUpJ VENvZGUoKQogewogfQogCi12b2lkIE5hdGl2ZUpJVENvZGU6OmluaXRpYWxpemVDb2RlUmVmKENv ZGVSZWY8SlNFbnRyeVB0clRhZz4gcmVmKQotewotICAgIEFTU0VSVCghbV9yZWYpOwotICAgIG1f cmVmID0gcmVmOwotfQotCiBKSVRDb2RlOjpDb2RlUHRyPEpTRW50cnlQdHJUYWc+IE5hdGl2ZUpJ VENvZGU6OmFkZHJlc3NGb3JDYWxsKEFyaXR5Q2hlY2tNb2RlIGFyaXR5KQogewogICAgIFJFTEVB U0VfQVNTRVJUKG1fcmVmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv SklUQ29kZS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDb2RlLmgKaW5kZXggODQ3 NGI5YTA3NjI0YzZmMDBmZGFlYzc1ZmRjZDViNDM3NjJiOWFkNS4uODc1ZjU5MjEwYWM2YTEwNmUz ZmQwMmVjZGZjOGIzYzNkYjlkMTgxOSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9KSVRDb2RlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDb2RlLmgK QEAgLTIzNiwxMCArMjM2LDExIEBAIGNsYXNzIERpcmVjdEpJVENvZGUgOiBwdWJsaWMgSklUQ29k ZVdpdGhDb2RlUmVmIHsKICAgICBEaXJlY3RKSVRDb2RlKENvZGVSZWY8SlNFbnRyeVB0clRhZz4s IENvZGVQdHI8SlNFbnRyeVB0clRhZz4gd2l0aEFyaXR5Q2hlY2ssIEpJVFR5cGUsIEludHJpbnNp Yyk7IC8vIEZvciBnZW5lcmF0ZWQgdGh1bmsuCiAgICAgdmlydHVhbCB+RGlyZWN0SklUQ29kZSgp OwogICAgIAotICAgIHZvaWQgaW5pdGlhbGl6ZUNvZGVSZWYoQ29kZVJlZjxKU0VudHJ5UHRyVGFn PiwgQ29kZVB0cjxKU0VudHJ5UHRyVGFnPiB3aXRoQXJpdHlDaGVjayk7Ci0KICAgICBDb2RlUHRy PEpTRW50cnlQdHJUYWc+IGFkZHJlc3NGb3JDYWxsKEFyaXR5Q2hlY2tNb2RlKSBvdmVycmlkZTsK IAorcHJvdGVjdGVkOgorICAgIHZvaWQgaW5pdGlhbGl6ZUNvZGVSZWZGb3JERkcoQ29kZVJlZjxK U0VudHJ5UHRyVGFnPiwgQ29kZVB0cjxKU0VudHJ5UHRyVGFnPiB3aXRoQXJpdHlDaGVjayk7CisK IHByaXZhdGU6CiAgICAgQ29kZVB0cjxKU0VudHJ5UHRyVGFnPiBtX3dpdGhBcml0eUNoZWNrOwog fTsKQEAgLTI0OSw4ICsyNTAsNiBAQCBjbGFzcyBOYXRpdmVKSVRDb2RlIDogcHVibGljIEpJVENv ZGVXaXRoQ29kZVJlZiB7CiAgICAgTmF0aXZlSklUQ29kZShKSVRUeXBlKTsKICAgICBOYXRpdmVK SVRDb2RlKENvZGVSZWY8SlNFbnRyeVB0clRhZz4sIEpJVFR5cGUsIEludHJpbnNpYyk7CiAgICAg dmlydHVhbCB+TmF0aXZlSklUQ29kZSgpOwotICAgIAotICAgIHZvaWQgaW5pdGlhbGl6ZUNvZGVS ZWYoQ29kZVJlZjxKU0VudHJ5UHRyVGFnPik7CiAKICAgICBDb2RlUHRyPEpTRW50cnlQdHJUYWc+ IGFkZHJlc3NGb3JDYWxsKEFyaXR5Q2hlY2tNb2RlKSBvdmVycmlkZTsKIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRFbnRyeXBvaW50LmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludEVudHJ5cG9pbnQuY3BwCmluZGV4IGY3YWQ3NGM1 YWUyY2U3YjZhMTA0ODEzMWY0NWU5ZGI1MjI2MWY0Y2QuLmE3Yjc2Mzc4Zjc1ZGM3NzRkYWI0NDg5 NGJmNWNmNjI4NmRmOGZkMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGlu dC9MTEludEVudHJ5cG9pbnQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9M TEludEVudHJ5cG9pbnQuY3BwCkBAIC01OCwxMyArNTgsMjAgQEAgc3RhdGljIHZvaWQgc2V0RnVu Y3Rpb25FbnRyeXBvaW50KFZNJiB2bSwgQ29kZUJsb2NrKiBjb2RlQmxvY2spCiAKICAgICBVTlVT RURfUEFSQU0odm0pOwogICAgIGlmIChraW5kID09IENvZGVGb3JDYWxsKSB7Ci0gICAgICAgIGNv ZGVCbG9jay0+c2V0SklUQ29kZSgKLSAgICAgICAgICAgIGFkb3B0UmVmKCpuZXcgRGlyZWN0SklU Q29kZShnZXRDb2RlUmVmPEpTRW50cnlQdHJUYWc+KGxsaW50X2Z1bmN0aW9uX2Zvcl9jYWxsX3By b2xvZ3VlKSwgZ2V0Q29kZVB0cjxKU0VudHJ5UHRyVGFnPihsbGludF9mdW5jdGlvbl9mb3JfY2Fs bF9hcml0eV9jaGVjayksIEpJVENvZGU6OkludGVycHJldGVyVGh1bmspKSk7Ci0gICAgICAgIHJl dHVybjsKKyAgICAgICAgc3RhdGljIERpcmVjdEpJVENvZGUqIGppdENvZGU7CisgICAgICAgIHN0 YXRpYyBzdGQ6Om9uY2VfZmxhZyBvbmNlS2V5OworICAgICAgICBzdGQ6OmNhbGxfb25jZShvbmNl S2V5LCBbJl0geworICAgICAgICAgICAgaml0Q29kZSA9IG5ldyBEaXJlY3RKSVRDb2RlKGdldENv ZGVSZWY8SlNFbnRyeVB0clRhZz4obGxpbnRfZnVuY3Rpb25fZm9yX2NhbGxfcHJvbG9ndWUpLCBn ZXRDb2RlUHRyPEpTRW50cnlQdHJUYWc+KGxsaW50X2Z1bmN0aW9uX2Zvcl9jYWxsX2FyaXR5X2No ZWNrKSwgSklUQ29kZTo6SW50ZXJwcmV0ZXJUaHVuayk7CisgICAgICAgIH0pOworICAgICAgICBj b2RlQmxvY2stPnNldEpJVENvZGUobWFrZVJlZigqaml0Q29kZSkpOworICAgIH0gZWxzZSB7Cisg ICAgICAgIHN0YXRpYyBEaXJlY3RKSVRDb2RlKiBqaXRDb2RlOworICAgICAgICBzdGF0aWMgc3Rk OjpvbmNlX2ZsYWcgb25jZUtleTsKKyAgICAgICAgc3RkOjpjYWxsX29uY2Uob25jZUtleSwgWyZd IHsKKyAgICAgICAgICAgIGppdENvZGUgPSBuZXcgRGlyZWN0SklUQ29kZShnZXRDb2RlUmVmPEpT RW50cnlQdHJUYWc+KGxsaW50X2Z1bmN0aW9uX2Zvcl9jb25zdHJ1Y3RfcHJvbG9ndWUpLCBnZXRD b2RlUHRyPEpTRW50cnlQdHJUYWc+KGxsaW50X2Z1bmN0aW9uX2Zvcl9jb25zdHJ1Y3RfYXJpdHlf Y2hlY2spLCBKSVRDb2RlOjpJbnRlcnByZXRlclRodW5rKTsKKyAgICAgICAgfSk7CisgICAgICAg IGNvZGVCbG9jay0+c2V0SklUQ29kZShtYWtlUmVmKCpqaXRDb2RlKSk7CiAgICAgfQotICAgIEFT U0VSVChraW5kID09IENvZGVGb3JDb25zdHJ1Y3QpOwotICAgIGNvZGVCbG9jay0+c2V0SklUQ29k ZSgKLSAgICAgICAgYWRvcHRSZWYoKm5ldyBEaXJlY3RKSVRDb2RlKGdldENvZGVSZWY8SlNFbnRy eVB0clRhZz4obGxpbnRfZnVuY3Rpb25fZm9yX2NvbnN0cnVjdF9wcm9sb2d1ZSksIGdldENvZGVQ dHI8SlNFbnRyeVB0clRhZz4obGxpbnRfZnVuY3Rpb25fZm9yX2NvbnN0cnVjdF9hcml0eV9jaGVj ayksIEpJVENvZGU6OkludGVycHJldGVyVGh1bmspKSk7CiB9CiAKIHN0YXRpYyB2b2lkIHNldEV2 YWxFbnRyeXBvaW50KFZNJiB2bSwgQ29kZUJsb2NrKiBjb2RlQmxvY2spCkBAIC03OSw5ICs4Niwx MiBAQCBzdGF0aWMgdm9pZCBzZXRFdmFsRW50cnlwb2ludChWTSYgdm0sIENvZGVCbG9jayogY29k ZUJsb2NrKQogI2VuZGlmIC8vIEVOQUJMRShKSVQpCiAKICAgICBVTlVTRURfUEFSQU0odm0pOwot ICAgIE1hY3JvQXNzZW1ibGVyQ29kZVJlZjxKU0VudHJ5UHRyVGFnPiBjb2RlUmVmID0gZ2V0Q29k ZVJlZjxKU0VudHJ5UHRyVGFnPihsbGludF9ldmFsX3Byb2xvZ3VlKTsKLSAgICBjb2RlQmxvY2st PnNldEpJVENvZGUoCi0gICAgICAgIGFkb3B0UmVmKCpuZXcgRGlyZWN0SklUQ29kZShjb2RlUmVm LCBjb2RlUmVmLmNvZGUoKSwgSklUQ29kZTo6SW50ZXJwcmV0ZXJUaHVuaykpKTsKKyAgICBzdGF0 aWMgTmF0aXZlSklUQ29kZSogaml0Q29kZTsKKyAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcgb25j ZUtleTsKKyAgICBzdGQ6OmNhbGxfb25jZShvbmNlS2V5LCBbJl0geworICAgICAgICBqaXRDb2Rl ID0gbmV3IE5hdGl2ZUpJVENvZGUoZ2V0Q29kZVJlZjxKU0VudHJ5UHRyVGFnPihsbGludF9ldmFs X3Byb2xvZ3VlKSwgSklUQ29kZTo6SW50ZXJwcmV0ZXJUaHVuaywgTm9JbnRyaW5zaWMpOworICAg IH0pOworICAgIGNvZGVCbG9jay0+c2V0SklUQ29kZShtYWtlUmVmKCpqaXRDb2RlKSk7CiB9CiAK IHN0YXRpYyB2b2lkIHNldFByb2dyYW1FbnRyeXBvaW50KFZNJiB2bSwgQ29kZUJsb2NrKiBjb2Rl QmxvY2spCkBAIC05Niw5ICsxMDYsMTIgQEAgc3RhdGljIHZvaWQgc2V0UHJvZ3JhbUVudHJ5cG9p bnQoVk0mIHZtLCBDb2RlQmxvY2sqIGNvZGVCbG9jaykKICNlbmRpZiAvLyBFTkFCTEUoSklUKQog CiAgICAgVU5VU0VEX1BBUkFNKHZtKTsKLSAgICBNYWNyb0Fzc2VtYmxlckNvZGVSZWY8SlNFbnRy eVB0clRhZz4gY29kZVJlZiA9IGdldENvZGVSZWY8SlNFbnRyeVB0clRhZz4obGxpbnRfcHJvZ3Jh bV9wcm9sb2d1ZSk7Ci0gICAgY29kZUJsb2NrLT5zZXRKSVRDb2RlKAotICAgICAgICBhZG9wdFJl ZigqbmV3IERpcmVjdEpJVENvZGUoY29kZVJlZiwgY29kZVJlZi5jb2RlKCksIEpJVENvZGU6Oklu dGVycHJldGVyVGh1bmspKSk7CisgICAgc3RhdGljIE5hdGl2ZUpJVENvZGUqIGppdENvZGU7Cisg ICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VLZXk7CisgICAgc3RkOjpjYWxsX29uY2Uob25j ZUtleSwgWyZdIHsKKyAgICAgICAgaml0Q29kZSA9IG5ldyBOYXRpdmVKSVRDb2RlKGdldENvZGVS ZWY8SlNFbnRyeVB0clRhZz4obGxpbnRfcHJvZ3JhbV9wcm9sb2d1ZSksIEpJVENvZGU6OkludGVy cHJldGVyVGh1bmssIE5vSW50cmluc2ljKTsKKyAgICB9KTsKKyAgICBjb2RlQmxvY2stPnNldEpJ VENvZGUobWFrZVJlZigqaml0Q29kZSkpOwogfQogCiBzdGF0aWMgdm9pZCBzZXRNb2R1bGVQcm9n cmFtRW50cnlwb2ludChWTSYgdm0sIENvZGVCbG9jayogY29kZUJsb2NrKQpAQCAtMTEzLDkgKzEy NiwxMiBAQCBzdGF0aWMgdm9pZCBzZXRNb2R1bGVQcm9ncmFtRW50cnlwb2ludChWTSYgdm0sIENv ZGVCbG9jayogY29kZUJsb2NrKQogI2VuZGlmIC8vIEVOQUJMRShKSVQpCiAKICAgICBVTlVTRURf UEFSQU0odm0pOwotICAgIE1hY3JvQXNzZW1ibGVyQ29kZVJlZjxKU0VudHJ5UHRyVGFnPiBjb2Rl UmVmID0gZ2V0Q29kZVJlZjxKU0VudHJ5UHRyVGFnPihsbGludF9tb2R1bGVfcHJvZ3JhbV9wcm9s b2d1ZSkucmV0YWdnZWQ8SlNFbnRyeVB0clRhZz4oKTsKLSAgICBjb2RlQmxvY2stPnNldEpJVENv ZGUoCi0gICAgICAgIGFkb3B0UmVmKCpuZXcgRGlyZWN0SklUQ29kZShjb2RlUmVmLCBjb2RlUmVm LmNvZGUoKSwgSklUQ29kZTo6SW50ZXJwcmV0ZXJUaHVuaykpKTsKKyAgICBzdGF0aWMgTmF0aXZl SklUQ29kZSogaml0Q29kZTsKKyAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcgb25jZUtleTsKKyAg ICBzdGQ6OmNhbGxfb25jZShvbmNlS2V5LCBbJl0geworICAgICAgICBqaXRDb2RlID0gbmV3IE5h dGl2ZUpJVENvZGUoZ2V0Q29kZVJlZjxKU0VudHJ5UHRyVGFnPihsbGludF9tb2R1bGVfcHJvZ3Jh bV9wcm9sb2d1ZSksIEpJVENvZGU6OkludGVycHJldGVyVGh1bmssIE5vSW50cmluc2ljKTsKKyAg ICB9KTsKKyAgICBjb2RlQmxvY2stPnNldEpJVENvZGUobWFrZVJlZigqaml0Q29kZSkpOwogfQog CiB2b2lkIHNldEVudHJ5cG9pbnQoVk0mIHZtLCBDb2RlQmxvY2sqIGNvZGVCbG9jaykK