148336 2015-08-21 15:41:22 -0700 ValueRecovery should distinguish between doubles in an FPR and JSValues in an FPR 2015-08-31 16:13:35 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 basile_clement basile_clement oldest_to_newest 1119957 0 basile_clement 2015-08-21 15:41:22 -0700 jsc-tailcall: ValueRecovery should distinguish between doubles in an FPR and JSValues in an FPR 1119961 1 259674 basile_clement 2015-08-21 15:47:32 -0700 Created attachment 259674 Patch 1120213 2 259674 msaboff 2015-08-23 18:15:46 -0700 Comment on attachment 259674 Patch r=me 1120291 3 basile_clement 2015-08-24 10:32:09 -0700 Committed r188868 <http://trac.webkit.org/changeset/188868> 1122336 4 basile_clement 2015-08-31 16:10:57 -0700 (In reply to comment #3) > Committed r188868 <http://trac.webkit.org/changeset/188868> This was on the jsc-tailcall branch. 1122337 5 basile_clement 2015-08-31 16:13:35 -0700 Committed r189192: <http://trac.webkit.org/changeset/189192> 259674 2015-08-21 15:47:32 -0700 2015-08-23 18:15:46 -0700 Patch bug-148336-20150821154726.patch text/plain 12320 basile_clement U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz NTVhZTg3OGYzMmM1MDMyYmIyZTllMjBkYTExZGRkOGI0NGUxNGVjLi5kZjFjNDNlOGMwMWM4NDcy ZjE4YzA1NWRiZDBjM2JhZjdlMWM0OWRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0MSBAQAogMjAxNS0wOC0yMSAgQmFzaWxlIENsZW1lbnQgIDxiYXNpbGVfY2xlbWVudEBh cHBsZS5jb20+CiAKKyAgICAgICAganNjLXRhaWxjYWxsOiBWYWx1ZVJlY292ZXJ5IHNob3VsZCBk aXN0aW5ndWlzaCBiZXR3ZWVuIGRvdWJsZXMgaW4gYW4gRlBSIGFuZCBKU1ZhbHVlcyBpbiBhbiBG UFIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODMz NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJl bnRseSwgVmFsdWVSZWNvdmVyeTo6SW5GUFIgbWVhbnMgInRoaXMgaXMgYSAqZG91YmxlKiB2YWx1 ZSBpbiBhbgorICAgICAgICBGUFIiLiBMZXQncyBjaGFuZ2UgdGhlIHNlbWFudGljcyB0byBiZSAi dGhpcyBpcyBhICpKU1ZBbHVlKiBpbiBhbiBGUFIiCisgICAgICAgICh0byBtYXRjaCBWYWx1ZVJl Y292ZXJ5OjpJbkdQUiksIGFuZCBpbnRyb2R1Y2UKKyAgICAgICAgVmFsdWVSZWNvdmVyeTo6VW5i b3hlZERvdWJsZUluRlBSIHRvIG1lYW4gInRoaXMgaXMgYSBkb3VibGUgdmFsdWUgaW4gYW4KKyAg ICAgICAgRlBSIi4KKworICAgICAgICAqIGJ5dGVjb2RlL1ZhbHVlUmVjb3ZlcnkuY3BwOgorICAg ICAgICAoSlNDOjpWYWx1ZVJlY292ZXJ5OjpkdW1wSW5Db250ZXh0KToKKyAgICAgICAgKiBieXRl Y29kZS9WYWx1ZVJlY292ZXJ5Lmg6CisgICAgICAgIChKU0M6OlZhbHVlUmVjb3Zlcnk6Om9wZXJh dG9yIGJvb2wpOgorICAgICAgICAoSlNDOjpWYWx1ZVJlY292ZXJ5OjppbkZQUik6CisgICAgICAg IChKU0M6OlZhbHVlUmVjb3Zlcnk6OmlzSW5HUFIpOgorICAgICAgICAoSlNDOjpWYWx1ZVJlY292 ZXJ5Ojppc0luRlBSKToKKyAgICAgICAgKEpTQzo6VmFsdWVSZWNvdmVyeTo6aXNJblJlZ2lzdGVy cyk6CisgICAgICAgIChKU0M6OlZhbHVlUmVjb3Zlcnk6OmlzSW5KU1N0YWNrKToKKyAgICAgICAg KEpTQzo6VmFsdWVSZWNvdmVyeTo6ZGF0YUZvcm1hdCk6CisgICAgICAgIChKU0M6OlZhbHVlUmVj b3Zlcnk6Omdwcik6CisgICAgICAgIChKU0M6OlZhbHVlUmVjb3Zlcnk6OmlzSW5KU1ZhbHVlUmVn cyk6CisgICAgICAgIChKU0M6OlZhbHVlUmVjb3Zlcnk6OmpzVmFsdWVSZWdzKToKKyAgICAgICAg KEpTQzo6VmFsdWVSZWNvdmVyeTo6ZnByKToKKyAgICAgICAgKEpTQzo6VmFsdWVSZWNvdmVyeTo6 dmlydHVhbFJlZ2lzdGVyKToKKyAgICAgICAgKEpTQzo6VmFsdWVSZWNvdmVyeTo6Y29uc3RhbnQp OgorICAgICAgICAqIGRmZy9ERkdPU1JFeGl0Q29tcGlsZXIzMl82NC5jcHA6CisgICAgICAgIChK U0M6OkRGRzo6T1NSRXhpdENvbXBpbGVyOjpjb21waWxlRXhpdCk6CisgICAgICAgICogZGZnL0RG R09TUkV4aXRDb21waWxlcjY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpPU1JFeGl0Q29tcGls ZXI6OmNvbXBpbGVFeGl0KToKKyAgICAgICAgKiBkZmcvREZHVmFyaWFibGVFdmVudFN0cmVhbS5j cHA6CisgICAgICAgIChKU0M6OkRGRzo6VmFyaWFibGVFdmVudFN0cmVhbTo6cmVjb25zdHJ1Y3Qp OgorCisyMDE1LTA4LTIxICBCYXNpbGUgQ2xlbWVudCAgPGJhc2lsZV9jbGVtZW50QGFwcGxlLmNv bT4KKwogICAgICAgICBqc2MtdGFpbGNhbGw6IFdlIHNob3VsZCBub3QgYXNzdW1lIHRoYXQgb25s eSB0aGUgYmFzZWxpbmUgSklUIGNhbiBoYXZlIEJ5SWQgYWNjZXNzZXMKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODMzMAogCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVmFsdWVSZWNvdmVyeS5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVmFsdWVSZWNvdmVyeS5jcHAKaW5kZXggOTk2ZmQzYmZl NjQzMzRhNTgzMGJjOTI4ZTM2NGEzNTIzMGFkMmU3OC4uOWMwODNiMDRhN2RjMWI0M2IyMmFlYjcy OTk1Y2Y5ZmJjNmY3YWNmNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL1ZhbHVlUmVjb3ZlcnkuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9WYWx1ZVJlY292ZXJ5LmNwcApAQCAtODYsNiArODYsOSBAQCB2b2lkIFZhbHVlUmVjb3Zlcnk6 OmR1bXBJbkNvbnRleHQoUHJpbnRTdHJlYW0mIG91dCwgRHVtcENvbnRleHQqIGNvbnRleHQpIGNv bnN0CiAgICAgY2FzZSBJbkZQUjoKICAgICAgICAgb3V0LnByaW50KGZwcigpKTsKICAgICAgICAg cmV0dXJuOworICAgIGNhc2UgVW5ib3hlZERvdWJsZUluRlBSOgorICAgICAgICBvdXQucHJpbnQo ImRvdWJsZSgiLCBmcHIoKSwgIikiKTsKKyAgICAgICAgcmV0dXJuOwogI2lmIFVTRShKU1ZBTFVF MzJfNjQpCiAgICAgY2FzZSBJblBhaXI6CiAgICAgICAgIG91dC5wcmludCgicGFpcigiLCB0YWdH UFIoKSwgIiwgIiwgcGF5bG9hZEdQUigpLCAiKSIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb2RlL1ZhbHVlUmVjb3ZlcnkuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9WYWx1ZVJlY292ZXJ5LmgKaW5kZXggNDI2NTFlMmM3ZWUzOTAxYmMzZWNhMDFl MzMxMmVlY2UxMjJkZDhkMi4uZTM2MmU4MzJiNzI2NjUzZWJkMjc2NGZiYjUwY2IwNWYxNzM2NDQy NCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1ZhbHVlUmVjb3Zl cnkuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvVmFsdWVSZWNvdmVyeS5o CkBAIC01NSw2ICs1NSw3IEBAIGVudW0gVmFsdWVSZWNvdmVyeVRlY2huaXF1ZSB7CiAgICAgSW5Q YWlyLAogI2VuZGlmCiAgICAgSW5GUFIsCisgICAgVW5ib3hlZERvdWJsZUluRlBSLAogICAgIC8v IEl0J3MgaW4gdGhlIHN0YWNrLCBidXQgYXQgYSBkaWZmZXJlbnQgbG9jYXRpb24uCiAgICAgRGlz cGxhY2VkSW5KU1N0YWNrLAogICAgIC8vIEl0J3MgaW4gdGhlIHN0YWNrLCBhdCBhIGRpZmZlcmVu dCBsb2NhdGlvbiwgYW5kIGl0J3MgdW5ib3hlZC4KQEAgLTgyLDYgKzgzLDcgQEAgcHVibGljOgog ICAgIAogICAgIGJvb2wgaXNTZXQoKSBjb25zdCB7IHJldHVybiBtX3RlY2huaXF1ZSAhPSBEb250 S25vdzsgfQogICAgIGJvb2wgb3BlcmF0b3IhKCkgY29uc3QgeyByZXR1cm4gIWlzU2V0KCk7IH0K KyAgICBleHBsaWNpdCBvcGVyYXRvciBib29sKCkgY29uc3QgeyByZXR1cm4gaXNTZXQoKTsgfQog ICAgIAogICAgIHN0YXRpYyBWYWx1ZVJlY292ZXJ5IGluR1BSKE1hY3JvQXNzZW1ibGVyOjpSZWdp c3RlcklEIGdwciwgRGF0YUZvcm1hdCBkYXRhRm9ybWF0KQogICAgIHsKQEAgLTExNywxMCArMTE5 LDE0IEBAIHB1YmxpYzoKICAgICB9CiAjZW5kaWYKIAotICAgIHN0YXRpYyBWYWx1ZVJlY292ZXJ5 IGluRlBSKE1hY3JvQXNzZW1ibGVyOjpGUFJlZ2lzdGVySUQgZnByKQorICAgIHN0YXRpYyBWYWx1 ZVJlY292ZXJ5IGluRlBSKE1hY3JvQXNzZW1ibGVyOjpGUFJlZ2lzdGVySUQgZnByLCBEYXRhRm9y bWF0IGRhdGFGb3JtYXQpCiAgICAgeworICAgICAgICBBU1NFUlQoZGF0YUZvcm1hdCA9PSBEYXRh Rm9ybWF0RG91YmxlIHx8IGRhdGFGb3JtYXQgJiBEYXRhRm9ybWF0SlMpOwogICAgICAgICBWYWx1 ZVJlY292ZXJ5IHJlc3VsdDsKLSAgICAgICAgcmVzdWx0Lm1fdGVjaG5pcXVlID0gSW5GUFI7Cisg ICAgICAgIGlmIChkYXRhRm9ybWF0ID09IERhdGFGb3JtYXREb3VibGUpCisgICAgICAgICAgICBy ZXN1bHQubV90ZWNobmlxdWUgPSBVbmJveGVkRG91YmxlSW5GUFI7CisgICAgICAgIGVsc2UKKyAg ICAgICAgICAgIHJlc3VsdC5tX3RlY2huaXF1ZSA9IEluRlBSOwogICAgICAgICByZXN1bHQubV9z b3VyY2UuZnByID0gZnByOwogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0KQEAgLTE4NSwx MiArMTkxLDEyIEBAIHB1YmxpYzoKICAgICAgICAgcmVzdWx0Lm1fc291cmNlLm5vZGVJRCA9IGlk LmJpdHMoKTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9Ci0gICAgCisKICAgICBWYWx1 ZVJlY292ZXJ5VGVjaG5pcXVlIHRlY2huaXF1ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdGVjaG5pcXVl OyB9CiAgICAgCiAgICAgYm9vbCBpc0NvbnN0YW50KCkgY29uc3QgeyByZXR1cm4gbV90ZWNobmlx dWUgPT0gQ29uc3RhbnQ7IH0KLSAgICAKLSAgICBib29sIGlzSW5SZWdpc3RlcnMoKSBjb25zdAor CisgICAgYm9vbCBpc0luR1BSKCkgY29uc3QKICAgICB7CiAgICAgICAgIHN3aXRjaCAobV90ZWNo bmlxdWUpIHsKICAgICAgICAgY2FzZSBJbkdQUjoKQEAgLTE5OSwxOSArMjA1LDgxIEBAIHB1Ymxp YzoKICAgICAgICAgY2FzZSBVbmJveGVkQ2VsbEluR1BSOgogICAgICAgICBjYXNlIFVuYm94ZWRJ bnQ1MkluR1BSOgogICAgICAgICBjYXNlIFVuYm94ZWRTdHJpY3RJbnQ1MkluR1BSOgotI2lmIFVT RShKU1ZBTFVFMzJfNjQpCi0gICAgICAgIGNhc2UgSW5QYWlyOgotI2VuZGlmCisgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGJvb2wgaXNJbkZQUigpIGNvbnN0CisgICAgewor ICAgICAgICBzd2l0Y2ggKG1fdGVjaG5pcXVlKSB7CiAgICAgICAgIGNhc2UgSW5GUFI6CisgICAg ICAgIGNhc2UgVW5ib3hlZERvdWJsZUluRlBSOgorICAgICAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAg ICB9CisgICAgCisgICAgYm9vbCBpc0luUmVnaXN0ZXJzKCkgY29uc3QKKyAgICB7CisgICAgICAg IHJldHVybiBpc0luSlNWYWx1ZVJlZ3MoKSB8fCBpc0luR1BSKCkgfHwgaXNJbkZQUigpOworICAg IH0KKworICAgIGJvb2wgaXNJbkpTU3RhY2soKSBjb25zdAorICAgIHsKKyAgICAgICAgc3dpdGNo IChtX3RlY2huaXF1ZSkgeworICAgICAgICBjYXNlIERpc3BsYWNlZEluSlNTdGFjazoKKyAgICAg ICAgY2FzZSBJbnQzMkRpc3BsYWNlZEluSlNTdGFjazoKKyAgICAgICAgY2FzZSBJbnQ1MkRpc3Bs YWNlZEluSlNTdGFjazoKKyAgICAgICAgY2FzZSBTdHJpY3RJbnQ1MkRpc3BsYWNlZEluSlNTdGFj azoKKyAgICAgICAgY2FzZSBEb3VibGVEaXNwbGFjZWRJbkpTU3RhY2s6CisgICAgICAgIGNhc2Ug Q2VsbERpc3BsYWNlZEluSlNTdGFjazoKKyAgICAgICAgY2FzZSBCb29sZWFuRGlzcGxhY2VkSW5K U1N0YWNrOgogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KICAgICB9CisKKyAgICBEYXRhRm9ybWF0 IGRhdGFGb3JtYXQoKSBjb25zdAorICAgIHsKKyAgICAgICAgc3dpdGNoIChtX3RlY2huaXF1ZSkg eworICAgICAgICBjYXNlIEluR1BSOgorICAgICAgICBjYXNlIEluRlBSOgorICAgICAgICBjYXNl IERpc3BsYWNlZEluSlNTdGFjazoKKyAgICAgICAgY2FzZSBDb25zdGFudDoKKyNpZiBVU0UoSlNW QUxVRTMyXzY0KQorICAgICAgICBjYXNlIEluUGFpcjoKKyNlbmRpZgorICAgICAgICAgICAgcmV0 dXJuIERhdGFGb3JtYXRKUzsKKyAgICAgICAgY2FzZSBVbmJveGVkSW50MzJJbkdQUjoKKyAgICAg ICAgY2FzZSBJbnQzMkRpc3BsYWNlZEluSlNTdGFjazoKKyAgICAgICAgICAgIHJldHVybiBEYXRh Rm9ybWF0SW50MzI7CisgICAgICAgIGNhc2UgVW5ib3hlZEludDUySW5HUFI6CisgICAgICAgIGNh c2UgSW50NTJEaXNwbGFjZWRJbkpTU3RhY2s6CisgICAgICAgICAgICByZXR1cm4gRGF0YUZvcm1h dEludDUyOworICAgICAgICBjYXNlIFVuYm94ZWRTdHJpY3RJbnQ1MkluR1BSOgorICAgICAgICBj YXNlIFN0cmljdEludDUyRGlzcGxhY2VkSW5KU1N0YWNrOgorICAgICAgICAgICAgcmV0dXJuIERh dGFGb3JtYXRTdHJpY3RJbnQ1MjsKKyAgICAgICAgY2FzZSBVbmJveGVkQm9vbGVhbkluR1BSOgor ICAgICAgICBjYXNlIEJvb2xlYW5EaXNwbGFjZWRJbkpTU3RhY2s6CisgICAgICAgICAgICByZXR1 cm4gRGF0YUZvcm1hdEJvb2xlYW47CisgICAgICAgIGNhc2UgVW5ib3hlZENlbGxJbkdQUjoKKyAg ICAgICAgY2FzZSBDZWxsRGlzcGxhY2VkSW5KU1N0YWNrOgorICAgICAgICAgICAgcmV0dXJuIERh dGFGb3JtYXRDZWxsOworICAgICAgICBjYXNlIFVuYm94ZWREb3VibGVJbkZQUjoKKyAgICAgICAg Y2FzZSBEb3VibGVEaXNwbGFjZWRJbkpTU3RhY2s6CisgICAgICAgICAgICByZXR1cm4gRGF0YUZv cm1hdERvdWJsZTsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIHJldHVybiBEYXRhRm9y bWF0Tm9uZTsKKyAgICAgICAgfQorICAgIH0KICAgICAKICAgICBNYWNyb0Fzc2VtYmxlcjo6UmVn aXN0ZXJJRCBncHIoKSBjb25zdAogICAgIHsKLSAgICAgICAgQVNTRVJUKG1fdGVjaG5pcXVlID09 IEluR1BSIHx8IG1fdGVjaG5pcXVlID09IFVuYm94ZWRJbnQzMkluR1BSIHx8IG1fdGVjaG5pcXVl ID09IFVuYm94ZWRCb29sZWFuSW5HUFIgfHwgbV90ZWNobmlxdWUgPT0gVW5ib3hlZEludDUySW5H UFIgfHwgbV90ZWNobmlxdWUgPT0gVW5ib3hlZFN0cmljdEludDUySW5HUFIgfHwgbV90ZWNobmlx dWUgPT0gVW5ib3hlZENlbGxJbkdQUik7CisgICAgICAgIEFTU0VSVChpc0luR1BSKCkpOwogICAg ICAgICByZXR1cm4gbV9zb3VyY2UuZ3ByOwogICAgIH0KICAgICAKQEAgLTIyNywxNyArMjk1LDM5 IEBAIHB1YmxpYzoKICAgICAgICAgQVNTRVJUKG1fdGVjaG5pcXVlID09IEluUGFpcik7CiAgICAg ICAgIHJldHVybiBtX3NvdXJjZS5wYWlyLnBheWxvYWRHUFI7CiAgICAgfQorCisgICAgYm9vbCBp c0luSlNWYWx1ZVJlZ3MoKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIG1fdGVjaG5pcXVl ID09IEluUGFpcjsKKyAgICB9CisKKyAgICBKU1ZhbHVlUmVncyBqc1ZhbHVlUmVncygpIGNvbnN0 CisgICAgeworICAgICAgICBBU1NFUlQoaXNJbkpTVmFsdWVSZWdzKCkpOworICAgICAgICByZXR1 cm4gSlNWYWx1ZVJlZ3ModGFnR1BSKCksIHBheWxvYWRHUFIoKSk7CisgICAgfQorI2Vsc2UKKyAg ICBib29sIGlzSW5KU1ZhbHVlUmVncygpIGNvbnN0CisgICAgeworICAgICAgICByZXR1cm4gaXNJ bkdQUigpOworICAgIH0KKworICAgIEpTVmFsdWVSZWdzIGpzVmFsdWVSZWdzKCkgY29uc3QKKyAg ICB7CisgICAgICAgIEFTU0VSVChpc0luR1BSKCkpOworICAgICAgICByZXR1cm4gSlNWYWx1ZVJl Z3MoZ3ByKCkpOworICAgIH0KICNlbmRpZgogICAgIAogICAgIE1hY3JvQXNzZW1ibGVyOjpGUFJl Z2lzdGVySUQgZnByKCkgY29uc3QKICAgICB7Ci0gICAgICAgIEFTU0VSVChtX3RlY2huaXF1ZSA9 PSBJbkZQUik7CisgICAgICAgIEFTU0VSVChpc0luRlBSKCkpOwogICAgICAgICByZXR1cm4gbV9z b3VyY2UuZnByOwogICAgIH0KICAgICAKICAgICBWaXJ0dWFsUmVnaXN0ZXIgdmlydHVhbFJlZ2lz dGVyKCkgY29uc3QKICAgICB7Ci0gICAgICAgIEFTU0VSVChtX3RlY2huaXF1ZSA9PSBEaXNwbGFj ZWRJbkpTU3RhY2sgfHwgbV90ZWNobmlxdWUgPT0gSW50MzJEaXNwbGFjZWRJbkpTU3RhY2sgfHwg bV90ZWNobmlxdWUgPT0gRG91YmxlRGlzcGxhY2VkSW5KU1N0YWNrIHx8IG1fdGVjaG5pcXVlID09 IENlbGxEaXNwbGFjZWRJbkpTU3RhY2sgfHwgbV90ZWNobmlxdWUgPT0gQm9vbGVhbkRpc3BsYWNl ZEluSlNTdGFjayB8fCBtX3RlY2huaXF1ZSA9PSBJbnQ1MkRpc3BsYWNlZEluSlNTdGFjayB8fCBt X3RlY2huaXF1ZSA9PSBTdHJpY3RJbnQ1MkRpc3BsYWNlZEluSlNTdGFjayk7CisgICAgICAgIEFT U0VSVChpc0luSlNTdGFjaygpKTsKICAgICAgICAgcmV0dXJuIFZpcnR1YWxSZWdpc3RlcihtX3Nv dXJjZS52aXJ0dWFsUmVnKTsKICAgICB9CiAgICAgCkBAIC0yNjQsNyArMzU0LDcgQEAgcHVibGlj OgogICAgIAogICAgIEpTVmFsdWUgY29uc3RhbnQoKSBjb25zdAogICAgIHsKLSAgICAgICAgQVNT RVJUKG1fdGVjaG5pcXVlID09IENvbnN0YW50KTsKKyAgICAgICAgQVNTRVJUKGlzQ29uc3RhbnQo KSk7CiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjpkZWNvZGUobV9zb3VyY2UuY29uc3RhbnQpOwog ICAgIH0KICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NS RXhpdENvbXBpbGVyMzJfNjQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JF eGl0Q29tcGlsZXIzMl82NC5jcHAKaW5kZXggYzQwNzdkZmU3ODhiOWIxN2ZmNTNmMWM1Y2Q1YmNk M2QwY2E5MGI0Ny4uMzQ4Njg4MzI3MzE5YzIyZmZmNDJkNjY2YmM4NDNlNzk4NGUzYmM2OCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0Q29tcGlsZXIzMl82 NC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0Q29tcGlsZXIz Ml82NC5jcHAKQEAgLTE5MSw2ICsxOTEsNyBAQCB2b2lkIE9TUkV4aXRDb21waWxlcjo6Y29tcGls ZUV4aXQoY29uc3QgT1NSRXhpdCYgZXhpdCwgY29uc3QgT3BlcmFuZHM8VmFsdWVSZWNvdgogICAg ICAgICBjb25zdCBWYWx1ZVJlY292ZXJ5JiByZWNvdmVyeSA9IG9wZXJhbmRzW2luZGV4XTsKICAg ICAgICAgCiAgICAgICAgIHN3aXRjaCAocmVjb3ZlcnkudGVjaG5pcXVlKCkpIHsKKyAgICAgICAg Y2FzZSBVbmJveGVkRG91YmxlSW5GUFI6CiAgICAgICAgIGNhc2UgSW5GUFI6CiAgICAgICAgICAg ICBtX2ppdC5tb3ZlKEFzc2VtYmx5SGVscGVyczo6VHJ1c3RlZEltbVB0cihzY3JhdGNoICsgaW5k ZXgpLCBHUFJJbmZvOjpyZWdUMCk7CiAgICAgICAgICAgICBtX2ppdC5zdG9yZURvdWJsZShyZWNv dmVyeS5mcHIoKSwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoR1BSSW5mbzo6cmVnVDApKTsKQEAg LTI2MSw2ICsyNjIsNyBAQCB2b2lkIE9TUkV4aXRDb21waWxlcjo6Y29tcGlsZUV4aXQoY29uc3Qg T1NSRXhpdCYgZXhpdCwgY29uc3QgT3BlcmFuZHM8VmFsdWVSZWNvdgogICAgICAgICBzd2l0Y2gg KHJlY292ZXJ5LnRlY2huaXF1ZSgpKSB7CiAgICAgICAgIGNhc2UgSW5QYWlyOgogICAgICAgICBj YXNlIERpc3BsYWNlZEluSlNTdGFjazoKKyAgICAgICAgY2FzZSBJbkZQUjoKICAgICAgICAgICAg IG1faml0LmxvYWQzMigKICAgICAgICAgICAgICAgICAmYml0d2lzZV9jYXN0PEVuY29kZWRWYWx1 ZURlc2NyaXB0b3IqPihzY3JhdGNoICsgaW5kZXgpLT5hc0JpdHMudGFnLAogICAgICAgICAgICAg ICAgIEdQUkluZm86OnJlZ1QwKTsKQEAgLTI3NSw3ICsyNzcsNyBAQCB2b2lkIE9TUkV4aXRDb21w aWxlcjo6Y29tcGlsZUV4aXQoY29uc3QgT1NSRXhpdCYgZXhpdCwgY29uc3QgT3BlcmFuZHM8VmFs dWVSZWNvdgogICAgICAgICAgICAgICAgIEFzc2VtYmx5SGVscGVyczo6cGF5bG9hZEZvcihvcGVy YW5kKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIAotICAgICAgICBjYXNlIElu RlBSOgorICAgICAgICBjYXNlIFVuYm94ZWREb3VibGVJbkZQUjoKICAgICAgICAgY2FzZSBEb3Vi bGVEaXNwbGFjZWRJbkpTU3RhY2s6CiAgICAgICAgICAgICBtX2ppdC5tb3ZlKEFzc2VtYmx5SGVs cGVyczo6VHJ1c3RlZEltbVB0cihzY3JhdGNoICsgaW5kZXgpLCBHUFJJbmZvOjpyZWdUMCk7CiAg ICAgICAgICAgICBtX2ppdC5sb2FkRG91YmxlKE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKEdQUklu Zm86OnJlZ1QwKSwgRlBSSW5mbzo6ZnBSZWdUMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR09TUkV4aXRDb21waWxlcjY0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHT1NSRXhpdENvbXBpbGVyNjQuY3BwCmluZGV4IDU1YjFmNWEyMGU4NTlkN2Rm NTZhMmE4YjJkYjc3MWJmZjZlYzdkNGYuLmIyMjU4NzkwYWI2M2VmN2UwNmM0NjJiODQ0NjEzN2Ew ZTdiMmNlYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhp dENvbXBpbGVyNjQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhp dENvbXBpbGVyNjQuY3BwCkBAIC0yMDksNiArMjA5LDcgQEAgdm9pZCBPU1JFeGl0Q29tcGlsZXI6 OmNvbXBpbGVFeGl0KGNvbnN0IE9TUkV4aXQmIGV4aXQsIGNvbnN0IE9wZXJhbmRzPFZhbHVlUmVj b3YKICAgICAgICAgY29uc3QgVmFsdWVSZWNvdmVyeSYgcmVjb3ZlcnkgPSBvcGVyYW5kc1tpbmRl eF07CiAgICAgICAgIAogICAgICAgICBzd2l0Y2ggKHJlY292ZXJ5LnRlY2huaXF1ZSgpKSB7Cisg ICAgICAgIGNhc2UgVW5ib3hlZERvdWJsZUluRlBSOgogICAgICAgICBjYXNlIEluRlBSOgogICAg ICAgICAgICAgbV9qaXQubW92ZShBc3NlbWJseUhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoc2NyYXRj aCArIGluZGV4KSwgR1BSSW5mbzo6cmVnVDApOwogICAgICAgICAgICAgbV9qaXQuc3RvcmVEb3Vi bGUocmVjb3ZlcnkuZnByKCksIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKEdQUkluZm86OnJlZ1Qw KSk7CkBAIC0yNzcsNiArMjc4LDcgQEAgdm9pZCBPU1JFeGl0Q29tcGlsZXI6OmNvbXBpbGVFeGl0 KGNvbnN0IE9TUkV4aXQmIGV4aXQsIGNvbnN0IE9wZXJhbmRzPFZhbHVlUmVjb3YKICAgICAgICAg Y2FzZSBEaXNwbGFjZWRJbkpTU3RhY2s6CiAgICAgICAgIGNhc2UgQ2VsbERpc3BsYWNlZEluSlNT dGFjazoKICAgICAgICAgY2FzZSBCb29sZWFuRGlzcGxhY2VkSW5KU1N0YWNrOgorICAgICAgICBj YXNlIEluRlBSOgogICAgICAgICAgICAgbV9qaXQubG9hZDY0KHNjcmF0Y2ggKyBpbmRleCwgR1BS SW5mbzo6cmVnVDApOwogICAgICAgICAgICAgbV9qaXQuc3RvcmU2NChHUFJJbmZvOjpyZWdUMCwg QXNzZW1ibHlIZWxwZXJzOjphZGRyZXNzRm9yKG9wZXJhbmQpKTsKICAgICAgICAgICAgIGJyZWFr OwpAQCAtMzA1LDcgKzMwNyw3IEBAIHZvaWQgT1NSRXhpdENvbXBpbGVyOjpjb21waWxlRXhpdChj b25zdCBPU1JFeGl0JiBleGl0LCBjb25zdCBPcGVyYW5kczxWYWx1ZVJlY292CiAgICAgICAgICAg ICBtX2ppdC5zdG9yZTY0KEdQUkluZm86OnJlZ1QwLCBBc3NlbWJseUhlbHBlcnM6OmFkZHJlc3NG b3Iob3BlcmFuZCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAKLSAgICAgICAg Y2FzZSBJbkZQUjoKKyAgICAgICAgY2FzZSBVbmJveGVkRG91YmxlSW5GUFI6CiAgICAgICAgIGNh c2UgRG91YmxlRGlzcGxhY2VkSW5KU1N0YWNrOgogICAgICAgICAgICAgbV9qaXQubW92ZShBc3Nl bWJseUhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoc2NyYXRjaCArIGluZGV4KSwgR1BSSW5mbzo6cmVn VDApOwogICAgICAgICAgICAgbV9qaXQubG9hZERvdWJsZShNYWNyb0Fzc2VtYmxlcjo6QWRkcmVz cyhHUFJJbmZvOjpyZWdUMCksIEZQUkluZm86OmZwUmVnVDApOwpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdWYXJpYWJsZUV2ZW50U3RyZWFtLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHVmFyaWFibGVFdmVudFN0cmVhbS5jcHAKaW5kZXggZTNmNDEz YzNiOGZmMmZmNmExMDI1MDMzM2VhNDBjYTI4ODc5ZmFmOC4uNWU2ZmVhMjAzZDIzYTRiOWU5N2Mz ODI3NzEyYjZiMzkzMjg4MTRjYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdWYXJpYWJsZUV2ZW50U3RyZWFtLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1ZhcmlhYmxlRXZlbnRTdHJlYW0uY3BwCkBAIC0yMDgsNyArMjA4LDcgQEAgdm9pZCBW YXJpYWJsZUV2ZW50U3RyZWFtOjpyZWNvbnN0cnVjdCgKICAgICAgICAgCiAgICAgICAgIGlmIChp bmZvLmZpbGxlZCkgewogICAgICAgICAgICAgaWYgKGluZm8uZm9ybWF0ID09IERhdGFGb3JtYXRE b3VibGUpIHsKLSAgICAgICAgICAgICAgICB2YWx1ZVJlY292ZXJpZXNbaV0gPSBWYWx1ZVJlY292 ZXJ5OjppbkZQUihpbmZvLnUuZnByKTsKKyAgICAgICAgICAgICAgICB2YWx1ZVJlY292ZXJpZXNb aV0gPSBWYWx1ZVJlY292ZXJ5OjppbkZQUihpbmZvLnUuZnByLCBEYXRhRm9ybWF0RG91YmxlKTsK ICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KICNpZiBVU0UoSlNWQUxV RTMyXzY0KQo=