124988 2013-11-28 11:03:44 -0800 Revert the X86 assembler peephole changes 2013-11-28 12:31:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 nrotem nrotem commit-queue fpizlo ossy oldest_to_newest 954796 0 nrotem 2013-11-28 11:03:44 -0800 Revert the X86 assembler peephole changes 954797 1 218019 nrotem 2013-11-28 11:04:00 -0800 Created attachment 218019 Patch 954798 2 nrotem 2013-11-28 11:04:26 -0800 This patch reverts: https://bugs.webkit.org/show_bug.cgi?id=124904 954801 3 218019 nrotem 2013-11-28 11:06:49 -0800 Comment on attachment 218019 Patch No need for review because I am only reverting a previous change. 954808 4 218019 ossy 2013-11-28 11:34:56 -0800 Comment on attachment 218019 Patch CQ won't land _without_ r+ and _with_ "Reviewed by NOBODY (OOPS!).", so rs=me for now. If you would like to land unreviewed patch, just remove this line and don't set review flag. 954812 5 fpizlo 2013-11-28 11:50:46 -0800 (In reply to comment #4) > (From update of attachment 218019 [details]) > CQ won't land _without_ r+ and _with_ "Reviewed by NOBODY (OOPS!).", so rs=me for now. > If you would like to land unreviewed patch, just remove this line and don't set review flag. Or just svn commit directly! Also there's usually no need for a bug for rollouts. Rollouts and build fixes usually just have a changelog message like "Unreviewed, revert r1234" or "Unreviewed, fix build". No need for the other changelog stuff. We're not terribly strict about how you do it though. 954818 6 218019 commit-queue 2013-11-28 12:31:08 -0800 Comment on attachment 218019 Patch Clearing flags on attachment: 218019 Committed r159855: <http://trac.webkit.org/changeset/159855> 954819 7 commit-queue 2013-11-28 12:31:10 -0800 All reviewed patches have been landed. Closing bug. 218019 2013-11-28 11:04:00 -0800 2013-11-28 12:31:08 -0800 Patch bug-124988-20131128110400.patch text/plain 8744 nrotem U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5ODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 OGE4MzFiMWNiNGFmMTJhMzEwMDk5ZjdkNWQwZDQ2OTdlYTdjODMxLi5iODdmMWYwOGI5NDc0MDJj OWQyOTdlZTJjNTUxMTk4YTI3MzUyOWFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxMy0xMS0yOCAgTmFkYXYgUm90ZW0gIDxucm90ZW1AYXBwbGUuY29tPgor CisgICAgICAgIFJldmVydCB0aGUgWDg2IGFzc2VtYmxlciBwZWVwaG9sZSBjaGFuZ2VzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ5ODgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGFzc2VtYmxlci9N YWNyb0Fzc2VtYmxlclg4Ni5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlclg4Njo6YWRk MzIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlclg4Njo6YWRkNjQpOgorICAgICAgICAo SlNDOjpNYWNyb0Fzc2VtYmxlclg4Njo6b3IzMik6CisgICAgICAgICogYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyWDg2Q29tbW9uLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyWDg2Q29t bW9uOjphZGQzMik6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyWDg2Q29tbW9uOjpvcjMy KToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJYODZDb21tb246OmJyYW5jaEFkZDMyKToK KyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZfNjQuaDoKKyAgICAgICAgKEpT Qzo6TWFjcm9Bc3NlbWJsZXJYODZfNjQ6OmFkZDMyKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3Nl bWJsZXJYODZfNjQ6Om9yMzIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlclg4Nl82NDo6 YWRkNjQpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlclg4Nl82NDo6b3I2NCk6CisgICAg ICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyWDg2XzY0Ojp4b3I2NCk6CisKIDIwMTMtMTEtMjggIEFu dHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBmZWF0dXJl OiBDU1MgdmFyaWFibGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL01hY3JvQXNzZW1ibGVyWDg2LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVy L01hY3JvQXNzZW1ibGVyWDg2LmgKaW5kZXggZDFmZWRkNThmMjgwNWQ5MTJjZDI0NWQwYzU4N2Vh OGMzN2U4OTIzMy4uNTQ3MTU4ZmE3YTViZTg4MjIwYTNiMThmZjlmOTY3OTY0MmU5ZjM3NiAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4 Ni5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJY ODYuaApAQCAtNjIsMTQgKzYyLDEyIEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYWRkMzIoVHJ1c3Rl ZEltbTMyIGltbSwgUmVnaXN0ZXJJRCBzcmMsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Ci0gICAg ICAgIGlmIChpbW0ubV92YWx1ZSkKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLmxlYWxfbXIoaW1t Lm1fdmFsdWUsIHNyYywgZGVzdCk7CisgICAgICAgIG1fYXNzZW1ibGVyLmxlYWxfbXIoaW1tLm1f dmFsdWUsIHNyYywgZGVzdCk7CiAgICAgfQogCiAgICAgdm9pZCBhZGQzMihUcnVzdGVkSW1tMzIg aW1tLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKICAgICB7Ci0gICAgICAgIGlmIChpbW0ubV92 YWx1ZSkKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZGxfaW0oaW1tLm1fdmFsdWUsIGFkZHJl c3MubV9wdHIpOworICAgICAgICBtX2Fzc2VtYmxlci5hZGRsX2ltKGltbS5tX3ZhbHVlLCBhZGRy ZXNzLm1fcHRyKTsKICAgICB9CiAgICAgCiAgICAgdm9pZCBhZGQzMihBYnNvbHV0ZUFkZHJlc3Mg YWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQpAQCAtNzksOCArNzcsNiBAQCBwdWJsaWM6CiAgICAg CiAgICAgdm9pZCBhZGQ2NChUcnVzdGVkSW1tMzIgaW1tLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVz cykKICAgICB7Ci0gICAgICAgIGlmICghaW1tLm1fdmFsdWUpCi0gICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIG1fYXNzZW1ibGVyLmFkZGxfaW0oaW1tLm1fdmFsdWUsIGFkZHJlc3MubV9wdHIp OwogICAgICAgICBtX2Fzc2VtYmxlci5hZGNsX2ltKGltbS5tX3ZhbHVlID4+IDMxLCByZWludGVy cHJldF9jYXN0PGNvbnN0IGNoYXIqPihhZGRyZXNzLm1fcHRyKSArIHNpemVvZihpbnQzMl90KSk7 CiAgICAgfQpAQCAtOTIsOCArODgsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBvcjMyKFRy dXN0ZWRJbW0zMiBpbW0sIEFic29sdXRlQWRkcmVzcyBhZGRyZXNzKQogICAgIHsKLSAgICAgICAg aWYgKGltbS5tX3ZhbHVlKQotICAgICAgICAgICAgbV9hc3NlbWJsZXIub3JsX2ltKGltbS5tX3Zh bHVlLCBhZGRyZXNzLm1fcHRyKTsKKyAgICAgICAgbV9hc3NlbWJsZXIub3JsX2ltKGltbS5tX3Zh bHVlLCBhZGRyZXNzLm1fcHRyKTsKICAgICB9CiAgICAgCiAgICAgdm9pZCBvcjMyKFJlZ2lzdGVy SUQgcmVnLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZDb21tb24uaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZDb21tb24uaAppbmRleCA0 Y2I5NGEwZjFhODhkNmRiZTdmNWNiNGEwZjViOWZjMjBhZWQ2ZDcxLi4xOGViYjFiYzdjZWMwMmRk Mzc5YTFmZmE3NjNlOTdjY2UyMTNkYTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2Q29tbW9uLmgKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4NkNvbW1vbi5oCkBAIC0xMTQsMTQg KzExNCwxMSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGFkZDMyKFRydXN0ZWRJbW0zMiBpbW0sIEFk ZHJlc3MgYWRkcmVzcykKICAgICB7Ci0gICAgICAgIGlmIChpbW0ubV92YWx1ZSkKLSAgICAgICAg ICAgIG1fYXNzZW1ibGVyLmFkZGxfaW0oaW1tLm1fdmFsdWUsIGFkZHJlc3Mub2Zmc2V0LCBhZGRy ZXNzLmJhc2UpOworICAgICAgICBtX2Fzc2VtYmxlci5hZGRsX2ltKGltbS5tX3ZhbHVlLCBhZGRy ZXNzLm9mZnNldCwgYWRkcmVzcy5iYXNlKTsKICAgICB9CiAKICAgICB2b2lkIGFkZDMyKFRydXN0 ZWRJbW0zMiBpbW0sIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Ci0gICAgICAgIGlmICghaW1tLm1f dmFsdWUpCi0gICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGlmIChpbW0ubV92YWx1ZSA9PSAx KQogICAgICAgICAgICAgbV9hc3NlbWJsZXIuaW5jX3IoZGVzdCk7CiAgICAgICAgIGVsc2UKQEAg LTE0MCw4ICsxMzcsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGFkZDMyKFRydXN0ZWRJbW0zMiBp bW0sIFJlZ2lzdGVySUQgc3JjLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewotICAgICAgICBpZiAo aW1tLm1fdmFsdWUpCi0gICAgICAgICAgICBtX2Fzc2VtYmxlci5sZWFsX21yKGltbS5tX3ZhbHVl LCBzcmMsIGRlc3QpOworICAgICAgICBtX2Fzc2VtYmxlci5sZWFsX21yKGltbS5tX3ZhbHVlLCBz cmMsIGRlc3QpOwogICAgIH0KICAgICAKICAgICB2b2lkIGFuZDMyKFJlZ2lzdGVySUQgc3JjLCBS ZWdpc3RlcklEIGRlc3QpCkBAIC0yNTYsOCArMjUyLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBv cjMyKFRydXN0ZWRJbW0zMiBpbW0sIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Ci0gICAgICAgIGlm IChpbW0ubV92YWx1ZSkKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLm9ybF9pcihpbW0ubV92YWx1 ZSwgZGVzdCk7CisgICAgICAgIG1fYXNzZW1ibGVyLm9ybF9pcihpbW0ubV92YWx1ZSwgZGVzdCk7 CiAgICAgfQogCiAgICAgdm9pZCBvcjMyKFJlZ2lzdGVySUQgc3JjLCBBZGRyZXNzIGRlc3QpCkBA IC0yNzIsOCArMjY3LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBvcjMyKFRydXN0ZWRJbW0zMiBp bW0sIEFkZHJlc3MgYWRkcmVzcykKICAgICB7Ci0gICAgICAgIGlmIChpbW0ubV92YWx1ZSkKLSAg ICAgICAgICAgIG1fYXNzZW1ibGVyLm9ybF9pbShpbW0ubV92YWx1ZSwgYWRkcmVzcy5vZmZzZXQs IGFkZHJlc3MuYmFzZSk7CisgICAgICAgIG1fYXNzZW1ibGVyLm9ybF9pbShpbW0ubV92YWx1ZSwg YWRkcmVzcy5vZmZzZXQsIGFkZHJlc3MuYmFzZSk7CiAgICAgfQogCiAgICAgdm9pZCBvcjMyKFJl Z2lzdGVySUQgb3AxLCBSZWdpc3RlcklEIG9wMiwgUmVnaXN0ZXJJRCBkZXN0KQpAQCAtMTI0Mywz NCArMTIzNywzMSBAQCBwdWJsaWM6CiAgICAgCiAgICAgSnVtcCBicmFuY2hBZGQzMihSZXN1bHRD b25kaXRpb24gY29uZCwgUmVnaXN0ZXJJRCBzcmMsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Ci0g ICAgICAgIG1fYXNzZW1ibGVyLmFkZGxfcnIoc3JjLCBkZXN0KTsKKyAgICAgICAgYWRkMzIoc3Jj LCBkZXN0KTsKICAgICAgICAgcmV0dXJuIEp1bXAobV9hc3NlbWJsZXIuakNDKHg4NkNvbmRpdGlv bihjb25kKSkpOwogICAgIH0KIAogICAgIEp1bXAgYnJhbmNoQWRkMzIoUmVzdWx0Q29uZGl0aW9u IGNvbmQsIFRydXN0ZWRJbW0zMiBpbW0sIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Ci0gICAgICAg IGlmIChpbW0ubV92YWx1ZSA9PSAxKQotICAgICAgICAgICAgbV9hc3NlbWJsZXIuaW5jX3IoZGVz dCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZGxfaXIoaW1tLm1f dmFsdWUsIGRlc3QpOworICAgICAgICBhZGQzMihpbW0sIGRlc3QpOwogICAgICAgICByZXR1cm4g SnVtcChtX2Fzc2VtYmxlci5qQ0MoeDg2Q29uZGl0aW9uKGNvbmQpKSk7CiAgICAgfQogICAgIAog ICAgIEp1bXAgYnJhbmNoQWRkMzIoUmVzdWx0Q29uZGl0aW9uIGNvbmQsIFRydXN0ZWRJbW0zMiBz cmMsIEFkZHJlc3MgZGVzdCkKICAgICB7Ci0gICAgICAgIG1fYXNzZW1ibGVyLmFkZGxfaW0oc3Jj Lm1fdmFsdWUsIGRlc3Qub2Zmc2V0LCBkZXN0LmJhc2UpOworICAgICAgICBhZGQzMihzcmMsIGRl c3QpOwogICAgICAgICByZXR1cm4gSnVtcChtX2Fzc2VtYmxlci5qQ0MoeDg2Q29uZGl0aW9uKGNv bmQpKSk7CiAgICAgfQogCiAgICAgSnVtcCBicmFuY2hBZGQzMihSZXN1bHRDb25kaXRpb24gY29u ZCwgUmVnaXN0ZXJJRCBzcmMsIEFkZHJlc3MgZGVzdCkKICAgICB7Ci0gICAgICAgIG1fYXNzZW1i bGVyLmFkZGxfcm0oc3JjLCBkZXN0Lm9mZnNldCwgZGVzdC5iYXNlKTsKKyAgICAgICAgYWRkMzIo c3JjLCBkZXN0KTsKICAgICAgICAgcmV0dXJuIEp1bXAobV9hc3NlbWJsZXIuakNDKHg4NkNvbmRp dGlvbihjb25kKSkpOwogICAgIH0KIAogICAgIEp1bXAgYnJhbmNoQWRkMzIoUmVzdWx0Q29uZGl0 aW9uIGNvbmQsIEFkZHJlc3Mgc3JjLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewotICAgICAgICBt X2Fzc2VtYmxlci5hZGRsX21yKHNyYy5vZmZzZXQsIHNyYy5iYXNlLCBkZXN0KTsKKyAgICAgICAg YWRkMzIoc3JjLCBkZXN0KTsKICAgICAgICAgcmV0dXJuIEp1bXAobV9hc3NlbWJsZXIuakNDKHg4 NkNvbmRpdGlvbihjb25kKSkpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4Nl82NC5oIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4Nl82NC5oCmluZGV4IDBhZmE4Mjg4ZmUy OWYwYmQwNmJhMGM0YzM1NzE3ZmQyNGE2NjFjODIuLmU4MTc0YmIxZThmYzc4MjA0MWQyZjI3Mzdj YmY4ZTVmZmMxOGI1NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTWFjcm9Bc3NlbWJsZXJYODZfNjQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNz ZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2XzY0LmgKQEAgLTU5LDggKzU5LDYgQEAgcHVibGljOgog CiAgICAgdm9pZCBhZGQzMihUcnVzdGVkSW1tMzIgaW1tLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVz cykKICAgICB7Ci0gICAgICAgIGlmICghaW1tLm1fdmFsdWUpCi0gICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIG1vdmUoVHJ1c3RlZEltbVB0cihhZGRyZXNzLm1fcHRyKSwgc2NyYXRjaFJlZ2lz dGVyKTsKICAgICAgICAgYWRkMzIoaW1tLCBBZGRyZXNzKHNjcmF0Y2hSZWdpc3RlcikpOwogICAg IH0KQEAgLTc5LDggKzc3LDYgQEAgcHVibGljOgogICAgIAogICAgIHZvaWQgb3IzMihUcnVzdGVk SW1tMzIgaW1tLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKICAgICB7Ci0gICAgICAgIGlmICgh aW1tLm1fdmFsdWUpCi0gICAgICAgICAgICByZXR1cm47CiAgICAgICAgIG1vdmUoVHJ1c3RlZElt bVB0cihhZGRyZXNzLm1fcHRyKSwgc2NyYXRjaFJlZ2lzdGVyKTsKICAgICAgICAgb3IzMihpbW0s IEFkZHJlc3Moc2NyYXRjaFJlZ2lzdGVyKSk7CiAgICAgfQpAQCAtMjAwLDggKzE5Niw2IEBAIHB1 YmxpYzoKIAogICAgIHZvaWQgYWRkNjQoVHJ1c3RlZEltbTMyIGltbSwgUmVnaXN0ZXJJRCBzcmNE ZXN0KQogICAgIHsKLSAgICAgICAgaWYgKCFpbW0ubV92YWx1ZSkKLSAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgaWYgKGltbS5tX3ZhbHVlID09IDEpCiAgICAgICAgICAgICBtX2Fzc2VtYmxl ci5pbmNxX3Ioc3JjRGVzdCk7CiAgICAgICAgIGVsc2UKQEAgLTIxMCw4ICsyMDQsNiBAQCBwdWJs aWM6CiAKICAgICB2b2lkIGFkZDY0KFRydXN0ZWRJbW02NCBpbW0sIFJlZ2lzdGVySUQgZGVzdCkK ICAgICB7Ci0gICAgICAgIGlmICghaW1tLm1fdmFsdWUpCi0gICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIGlmIChpbW0ubV92YWx1ZSA9PSAxKQogICAgICAgICAgICAgbV9hc3NlbWJsZXIuaW5j cV9yKGRlc3QpOwogICAgICAgICBlbHNlIHsKQEAgLTIyMiwyMCArMjE0LDE2IEBAIHB1YmxpYzoK IAogICAgIHZvaWQgYWRkNjQoVHJ1c3RlZEltbTMyIGltbSwgUmVnaXN0ZXJJRCBzcmMsIFJlZ2lz dGVySUQgZGVzdCkKICAgICB7Ci0gICAgICAgIGlmIChpbW0ubV92YWx1ZSkKLSAgICAgICAgICAg IG1fYXNzZW1ibGVyLmxlYXFfbXIoaW1tLm1fdmFsdWUsIHNyYywgZGVzdCk7CisgICAgICAgIG1f YXNzZW1ibGVyLmxlYXFfbXIoaW1tLm1fdmFsdWUsIHNyYywgZGVzdCk7CiAgICAgfQogCiAgICAg dm9pZCBhZGQ2NChUcnVzdGVkSW1tMzIgaW1tLCBBZGRyZXNzIGFkZHJlc3MpCiAgICAgewotICAg ICAgICBpZiAoaW1tLm1fdmFsdWUpCi0gICAgICAgICAgICBtX2Fzc2VtYmxlci5hZGRxX2ltKGlt bS5tX3ZhbHVlLCBhZGRyZXNzLm9mZnNldCwgYWRkcmVzcy5iYXNlKTsKKyAgICAgICAgbV9hc3Nl bWJsZXIuYWRkcV9pbShpbW0ubV92YWx1ZSwgYWRkcmVzcy5vZmZzZXQsIGFkZHJlc3MuYmFzZSk7 CiAgICAgfQogCiAgICAgdm9pZCBhZGQ2NChUcnVzdGVkSW1tMzIgaW1tLCBBYnNvbHV0ZUFkZHJl c3MgYWRkcmVzcykKICAgICB7Ci0gICAgICAgIGlmICghaW1tLm1fdmFsdWUpCi0gICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIG1vdmUoVHJ1c3RlZEltbVB0cihhZGRyZXNzLm1fcHRyKSwgc2Ny YXRjaFJlZ2lzdGVyKTsKICAgICAgICAgYWRkNjQoaW1tLCBBZGRyZXNzKHNjcmF0Y2hSZWdpc3Rl cikpOwogICAgIH0KQEAgLTI4MywxNiArMjcxLDEzIEBAIHB1YmxpYzoKIAogICAgIHZvaWQgb3I2 NChUcnVzdGVkSW1tNjQgaW1tLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewotICAgICAgICBpZiAo IWltbS5tX3ZhbHVlKQotICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBtb3ZlKGltbSwgc2Ny YXRjaFJlZ2lzdGVyKTsKICAgICAgICAgb3I2NChzY3JhdGNoUmVnaXN0ZXIsIGRlc3QpOwogICAg IH0KIAogICAgIHZvaWQgb3I2NChUcnVzdGVkSW1tMzIgaW1tLCBSZWdpc3RlcklEIGRlc3QpCiAg ICAgewotICAgICAgICBpZiAoaW1tLm1fdmFsdWUpCi0gICAgICAgICAgICBtX2Fzc2VtYmxlci5v cnFfaXIoaW1tLm1fdmFsdWUsIGRlc3QpOworICAgICAgICBtX2Fzc2VtYmxlci5vcnFfaXIoaW1t Lm1fdmFsdWUsIGRlc3QpOwogICAgIH0KIAogICAgIHZvaWQgb3I2NChSZWdpc3RlcklEIG9wMSwg UmVnaXN0ZXJJRCBvcDIsIFJlZ2lzdGVySUQgZGVzdCkKQEAgLTMwOSw4ICsyOTQsNiBAQCBwdWJs aWM6CiAKICAgICB2b2lkIG9yNjQoVHJ1c3RlZEltbTMyIGltbSwgUmVnaXN0ZXJJRCBzcmMsIFJl Z2lzdGVySUQgZGVzdCkKICAgICB7Ci0gICAgICAgIGlmICghaW1tLm1fdmFsdWUpCi0gICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIG1vdmUoc3JjLCBkZXN0KTsKICAgICAgICAgb3I2NChpbW0s IGRlc3QpOwogICAgIH0KQEAgLTM1NSw4ICszMzgsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHhv cjY0KFRydXN0ZWRJbW0zMiBpbW0sIFJlZ2lzdGVySUQgc3JjRGVzdCkKICAgICB7Ci0gICAgICAg IGlmIChpbW0ubV92YWx1ZSkKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLnhvcnFfaXIoaW1tLm1f dmFsdWUsIHNyY0Rlc3QpOworICAgICAgICBtX2Fzc2VtYmxlci54b3JxX2lyKGltbS5tX3ZhbHVl LCBzcmNEZXN0KTsKICAgICB9CiAKICAgICB2b2lkIGxvYWQ2NChJbXBsaWNpdEFkZHJlc3MgYWRk cmVzcywgUmVnaXN0ZXJJRCBkZXN0KQo=