231362 2021-10-07 07:39:32 -0700 [JSC][32bit] Fix wrong branchAdd32 assembly for ARMv7 2021-10-13 10:50:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mikhail webkit-unassigned ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1801596 0 mikhail 2021-10-07 07:39:32 -0700 [JSC][32bit] Fix wrong branchAdd32 assembly for ARMv7 1801597 1 440502 mikhail 2021-10-07 07:45:23 -0700 Created attachment 440502 Patch 1801621 2 440502 keith_miller 2021-10-07 09:17:46 -0700 Comment on attachment 440502 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440502&action=review > Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h:1859 > + // Do the add. > + ARMThumbImmediate armImm = ARMThumbImmediate::makeEncodedImm(imm.m_value); > + if (armImm.isValid()) > + m_assembler.add_S(dataTempRegister, dataTempRegister, armImm); > + else { > + move(imm, addressTempRegister); > + m_assembler.add_S(dataTempRegister, dataTempRegister, addressTempRegister); > + } Can we add an add32 with flags helper that is this? It seems like that could be useful elsewhere in this file. 1801743 3 440530 mikhail 2021-10-07 13:14:15 -0700 Created attachment 440530 Patch 1802690 4 440530 ysuzuki 2021-10-11 10:43:16 -0700 Comment on attachment 440530 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440530&action=review r=me with changes. > Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h:200 > + void add32(TrustedImm32 imm, Address address, bool updateFlags = false) Let's define it as add32Impl helper private function, and define add32 as void add32(TrustedImm32 imm, Address address) { constexpr bool updateFlags = false; add32Impl(imm, address, updateFlags); } > Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h:229 > + void add32(TrustedImm32 imm, AbsoluteAddress address, bool updateFlags = false) Let's define it as add32Impl helper private function, and define add32 as void add32(TrustedImm32 imm, AbsoluteAddress address) { constexpr bool updateFlags = false; add32Impl(imm, address, updateFlags); } > Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h:1861 > + add32(imm, dest, true); Let's make it readable by, constexpr bool updateFlags = true; add32(imm, dest, updateFlags); > Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h:1867 > + add32(imm, dest, true); Let's make it readable by, constexpr bool updateFlags = true; add32(imm, dest, updateFlags); 1803763 5 441077 mikhail 2021-10-13 07:39:03 -0700 Created attachment 441077 Patch 1803848 6 ews-feeder 2021-10-13 10:49:20 -0700 Committed r284103 (242931@main): <https://commits.webkit.org/242931@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441077. 1803850 7 webkit-bug-importer 2021-10-13 10:50:17 -0700 <rdar://problem/84206141> 440502 2021-10-07 07:45:23 -0700 2021-10-07 13:14:09 -0700 Patch bug-231362-20211007144522.patch text/plain 3162 mikhail U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 YzUyN2ZiNmZlZjIwNjViZWEzODc0OGJjOGE0MWI3MWQzZjljNmY5Li4wOTY4NWJmNTFjZTBiN2Ey MzUxMTBlZWU5NmMzYjJiZmRkZTc0NmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAyMS0xMC0wNyAgTWlraGFpbCBSLiBHYWRlbGhhICA8bWlraGFpbEBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtKU0NdWzMyYml0XSBGaXggd3JvbmcgYnJhbmNoQWRkMzIgYXNz ZW1ibHkgZm9yIEFSTXY3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzEzNjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZnRlciB0aGUgdW5saW5rZWQgYmFzZWxpbmUgaml0IHdhcyBtZXJnZWQsIGEgbmV3 IGJyYW5jaEFkZDMyIG1ldGhvZAorICAgICAgICBuZWVkZWQgdG8gYmUgaW1wbGVtZW50ZWQgZm9y IEFSTXY3LCBob3dldmVyLCB0aGUgZmlyc3QgdmVyc2lvbgorICAgICAgICBzdWJtaXR0ZWQgYnkg bWUgdXNlZCB0aGUgYWRkMzIgbWV0aG9kIHRvIHBlcmZvcm0gdGhlIGFkZCBiZWZvcmUKKyAgICAg ICAgYnJhbmNoaW5nLgorCisgICAgICAgIEluIHRoaXMgcGF0Y2gsIHdlIGZpeCB0aGUgY2FsbCB0 byBhZGQzMiB0byBpbnN0ZWFkIGNhbGwgYWRkcywgc28gdGhlIAorICAgICAgICBjb3JyZWN0IGZs YWdzIGFyZSBzZXQgaW4gdGhlIHByb2Nlc3Nvci4KKworICAgICAgICAoUGF0Y2ggY28tYXV0aG9y ZWQgd2l0aCBHZXphIExvcmUpCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJB Uk12Ny5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3OjpicmFuY2hBZGQzMik6 CisKIDIwMjEtMTAtMDYgIFhhbiBMw7NwZXogIDx4YW5AaWdhbGlhLmNvbT4KIAogICAgICAgICBb SlNDXVszMmJpdF0gUmVtb3ZlIGEgYnVuY2ggb2YgY29tcGlsZXIgd2FybmluZ3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5o IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgK aW5kZXggMmVmNDg2MDMxYzA3NzllMjc4ZDNhZWFlNjE3YTg1ZGJmZmY4NjE5MC4uZDEzYmIzY2Vj N2ViMGZjMWM5YTBjOTRlN2NhNGU4ZmFlZWYzZWFiZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKQEAgLTE4NDUsMTUg KzE4NDUsNDEgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gYnJhbmNoQWRkMzIoY29uZCwgZGVz dCwgaW1tLCBkZXN0KTsKICAgICB9CiAKLSAgICBKdW1wIGJyYW5jaEFkZDMyKFJlc3VsdENvbmRp dGlvbiBjb25kLCBUcnVzdGVkSW1tMzIgaW1tLCBBYnNvbHV0ZUFkZHJlc3MgZGVzdCkKKyAgICBK dW1wIGJyYW5jaEFkZDMyKFJlc3VsdENvbmRpdGlvbiBjb25kLCBUcnVzdGVkSW1tMzIgaW1tLCBB YnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKICAgICB7Ci0gICAgICAgIGFkZDMyKGltbSwgZGVzdCk7 CisgICAgICAgIGxvYWQzMihhZGRyZXNzLm1fcHRyLCBkYXRhVGVtcFJlZ2lzdGVyKTsKKworICAg ICAgICAvLyBEbyB0aGUgYWRkLgorICAgICAgICBBUk1UaHVtYkltbWVkaWF0ZSBhcm1JbW0gPSBB Uk1UaHVtYkltbWVkaWF0ZTo6bWFrZUVuY29kZWRJbW0oaW1tLm1fdmFsdWUpOworICAgICAgICBp ZiAoYXJtSW1tLmlzVmFsaWQoKSkKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZF9TKGRhdGFU ZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIsIGFybUltbSk7CisgICAgICAgIGVsc2Ugewor ICAgICAgICAgICAgbW92ZShpbW0sIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOworICAgICAgICAgICAg bV9hc3NlbWJsZXIuYWRkX1MoZGF0YVRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3RlciwgYWRk cmVzc1RlbXBSZWdpc3Rlcik7CisgICAgICAgIH0KKworICAgICAgICAvLyBTdG9yZSB0aGUgcmVz dWx0LgorICAgICAgICBzdG9yZTMyKGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3MubV9wdHIpOwog ICAgICAgICByZXR1cm4gSnVtcChtYWtlQnJhbmNoKGNvbmQpKTsKICAgICB9CiAKLSAgICBKdW1w IGJyYW5jaEFkZDMyKFJlc3VsdENvbmRpdGlvbiBjb25kLCBUcnVzdGVkSW1tMzIgaW1tLCBBZGRy ZXNzIGRlc3QpCisgICAgSnVtcCBicmFuY2hBZGQzMihSZXN1bHRDb25kaXRpb24gY29uZCwgVHJ1 c3RlZEltbTMyIGltbSwgQWRkcmVzcyBhZGRyZXNzKQogICAgIHsKLSAgICAgICAgYWRkMzIoaW1t LCBkZXN0KTsKKyAgICAgICAgQXJtQWRkcmVzcyBhYWRkciA9IHNldHVwQXJtQWRkcmVzcyhhZGRy ZXNzKTsKKyAgICAgICAgbG9hZDMyKGFhZGRyLCBkYXRhVGVtcFJlZ2lzdGVyKTsKKworICAgICAg ICAvLyBEbyB0aGUgYWRkLgorICAgICAgICBBUk1UaHVtYkltbWVkaWF0ZSBhcm1JbW0gPSBBUk1U aHVtYkltbWVkaWF0ZTo6bWFrZUVuY29kZWRJbW0oaW1tLm1fdmFsdWUpOworICAgICAgICBpZiAo YXJtSW1tLmlzVmFsaWQoKSkKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZF9TKGRhdGFUZW1w UmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIsIGFybUltbSk7CisgICAgICAgIGVsc2UgeworICAg ICAgICAgICAgbW92ZShpbW0sIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOworICAgICAgICAgICAgbV9h c3NlbWJsZXIuYWRkX1MoZGF0YVRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3RlciwgYWRkcmVz c1RlbXBSZWdpc3Rlcik7CisgICAgICAgICAgICBhYWRkciA9IHNldHVwQXJtQWRkcmVzcyhhZGRy ZXNzKTsKKyAgICAgICAgfQorCisgICAgICAgIC8vIFN0b3JlIHRoZSByZXN1bHQuCisgICAgICAg IHN0b3JlMzIoZGF0YVRlbXBSZWdpc3RlciwgYWFkZHIpOwogICAgICAgICByZXR1cm4gSnVtcCht YWtlQnJhbmNoKGNvbmQpKTsKICAgICB9CiAK 440530 2021-10-07 13:14:15 -0700 2021-10-13 07:38:56 -0700 Patch bug-231362-20211007201414.patch text/plain 4889 mikhail U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 YzUyN2ZiNmZlZjIwNjViZWEzODc0OGJjOGE0MWI3MWQzZjljNmY5Li5jZjVhZTNhZWVhZTU4NDc0 NTM3MGI1MWE3Mzk2ZWVkNjkyMTlkMDkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAyMS0xMC0wNyAgTWlraGFpbCBSLiBHYWRlbGhhICA8bWlraGFpbEBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtKU0NdWzMyYml0XSBGaXggd3JvbmcgYnJhbmNoQWRkMzIgYXNz ZW1ibHkgZm9yIEFSTXY3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzEzNjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZnRlciB0aGUgdW5saW5rZWQgYmFzZWxpbmUgaml0IHdhcyBtZXJnZWQsIGEgbmV3 IGJyYW5jaEFkZDMyIG1ldGhvZAorICAgICAgICBuZWVkZWQgdG8gYmUgaW1wbGVtZW50ZWQgZm9y IEFSTXY3LCBob3dldmVyLCB0aGUgZmlyc3QgdmVyc2lvbgorICAgICAgICBzdWJtaXR0ZWQgYnkg bWUgdXNlZCB0aGUgYWRkMzIgbWV0aG9kIHRvIHBlcmZvcm0gdGhlIGFkZCBiZWZvcmUKKyAgICAg ICAgYnJhbmNoaW5nLgorCisgICAgICAgIEluIHRoaXMgcGF0Y2gsIHdlIGZpeCB0aGUgY2FsbCB0 byBhZGQzMiBieSBhZGRpbmcgYSBmbGFnIHRoYXQgd2lsbAorICAgICAgICBzZWxlY3QgZWl0aGVy IGFkZCBvciBhZGQsIGFuZCBtYWtlIGJyYW5jaEFkZDMyIGNhbGwgdGhlIGFkZHMgdmVyc2lvbi4K KworICAgICAgICAoUGF0Y2ggY28tYXV0aG9yZWQgd2l0aCBHZXphIExvcmUpCisKKyAgICAgICAg KiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fz c2VtYmxlckFSTXY3OjpicmFuY2hBZGQzMik6CisKIDIwMjEtMTAtMDYgIFhhbiBMw7NwZXogIDx4 YW5AaWdhbGlhLmNvbT4KIAogICAgICAgICBbSlNDXVszMmJpdF0gUmVtb3ZlIGEgYnVuY2ggb2Yg Y29tcGlsZXIgd2FybmluZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKaW5kZXggMmVmNDg2MDMxYzA3NzllMjc4ZDNhZWFl NjE3YTg1ZGJmZmY4NjE5MC4uMjI0YWQyYTFhODlkNWQyOWNhNWFlZDNkMzAwMzcyNTYxZmYyMzc4 MSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2Vt YmxlckFSTXY3LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fz c2VtYmxlckFSTXY3LmgKQEAgLTE4OSw3ICsxODksNiBAQCBwdWJsaWM6CiAgICAgICAgIH0KIAog ICAgICAgICBBUk1UaHVtYkltbWVkaWF0ZSBhcm1JbW0gPSBBUk1UaHVtYkltbWVkaWF0ZTo6bWFr ZVVJbnQxMk9yRW5jb2RlZEltbShpbW0ubV92YWx1ZSk7Ci0KICAgICAgICAgaWYgKGFybUltbS5p c1ZhbGlkKCkpCiAgICAgICAgICAgICBtX2Fzc2VtYmxlci5hZGQoZGVzdCwgc3JjLCBhcm1JbW0p OwogICAgICAgICBlbHNlIHsKQEAgLTE5OCwxOCArMTk3LDI0IEBAIHB1YmxpYzoKICAgICAgICAg fQogICAgIH0KIAotICAgIHZvaWQgYWRkMzIoVHJ1c3RlZEltbTMyIGltbSwgQWRkcmVzcyBhZGRy ZXNzKQorICAgIHZvaWQgYWRkMzIoVHJ1c3RlZEltbTMyIGltbSwgQWRkcmVzcyBhZGRyZXNzLCBi b29sIHVwZGF0ZUZsYWdzID0gZmFsc2UpCiAgICAgewogICAgICAgICBsb2FkMzIoYWRkcmVzcywg ZGF0YVRlbXBSZWdpc3Rlcik7CiAKLSAgICAgICAgQVJNVGh1bWJJbW1lZGlhdGUgYXJtSW1tID0g QVJNVGh1bWJJbW1lZGlhdGU6Om1ha2VVSW50MTJPckVuY29kZWRJbW0oaW1tLm1fdmFsdWUpOwot ICAgICAgICBpZiAoYXJtSW1tLmlzVmFsaWQoKSkKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFk ZChkYXRhVGVtcFJlZ2lzdGVyLCBkYXRhVGVtcFJlZ2lzdGVyLCBhcm1JbW0pOwotICAgICAgICBl bHNlIHsKKyAgICAgICAgQVJNVGh1bWJJbW1lZGlhdGUgYXJtSW1tID0gQVJNVGh1bWJJbW1lZGlh dGU6Om1ha2VFbmNvZGVkSW1tKGltbS5tX3ZhbHVlKTsKKyAgICAgICAgaWYgKGFybUltbS5pc1Zh bGlkKCkpIHsKKyAgICAgICAgICAgIGlmICh1cGRhdGVGbGFncykKKyAgICAgICAgICAgICAgICBt X2Fzc2VtYmxlci5hZGRfUyhkYXRhVGVtcFJlZ2lzdGVyLCBkYXRhVGVtcFJlZ2lzdGVyLCBhcm1J bW0pOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZChk YXRhVGVtcFJlZ2lzdGVyLCBkYXRhVGVtcFJlZ2lzdGVyLCBhcm1JbW0pOworICAgICAgICB9IGVs c2UgewogICAgICAgICAgICAgLy8gSHJycm0sIHNpbmNlIGRhdGFUZW1wUmVnaXN0ZXIgaG9sZHMg dGhlIGRhdGEgbG9hZGVkLAogICAgICAgICAgICAgLy8gdXNlIGFkZHJlc3NUZW1wUmVnaXN0ZXIg dG8gaG9sZCB0aGUgaW1tZWRpYXRlLgogICAgICAgICAgICAgbW92ZShpbW0sIGFkZHJlc3NUZW1w UmVnaXN0ZXIpOwotICAgICAgICAgICAgbV9hc3NlbWJsZXIuYWRkKGRhdGFUZW1wUmVnaXN0ZXIs IGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOworICAgICAgICAgICAgaWYg KHVwZGF0ZUZsYWdzKQorICAgICAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZF9TKGRhdGFUZW1w UmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOworICAgICAg ICAgICAgZWxzZQorICAgICAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZChkYXRhVGVtcFJlZ2lz dGVyLCBkYXRhVGVtcFJlZ2lzdGVyLCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsKICAgICAgICAgfQog CiAgICAgICAgIHN0b3JlMzIoZGF0YVRlbXBSZWdpc3RlciwgYWRkcmVzcyk7CkBAIC0yMjEsMTgg KzIyNiwyNCBAQCBwdWJsaWM6CiAgICAgICAgIGFkZDMyKGRhdGFUZW1wUmVnaXN0ZXIsIGRlc3Qp OwogICAgIH0KIAotICAgIHZvaWQgYWRkMzIoVHJ1c3RlZEltbTMyIGltbSwgQWJzb2x1dGVBZGRy ZXNzIGFkZHJlc3MpCisgICAgdm9pZCBhZGQzMihUcnVzdGVkSW1tMzIgaW1tLCBBYnNvbHV0ZUFk ZHJlc3MgYWRkcmVzcywgYm9vbCB1cGRhdGVGbGFncyA9IGZhbHNlKQogICAgIHsKICAgICAgICAg bG9hZDMyKGFkZHJlc3MubV9wdHIsIGRhdGFUZW1wUmVnaXN0ZXIpOwogCi0gICAgICAgIEFSTVRo dW1iSW1tZWRpYXRlIGFybUltbSA9IEFSTVRodW1iSW1tZWRpYXRlOjptYWtlVUludDEyT3JFbmNv ZGVkSW1tKGltbS5tX3ZhbHVlKTsKLSAgICAgICAgaWYgKGFybUltbS5pc1ZhbGlkKCkpCi0gICAg ICAgICAgICBtX2Fzc2VtYmxlci5hZGQoZGF0YVRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3Rl ciwgYXJtSW1tKTsKLSAgICAgICAgZWxzZSB7CisgICAgICAgIEFSTVRodW1iSW1tZWRpYXRlIGFy bUltbSA9IEFSTVRodW1iSW1tZWRpYXRlOjptYWtlRW5jb2RlZEltbShpbW0ubV92YWx1ZSk7Cisg ICAgICAgIGlmIChhcm1JbW0uaXNWYWxpZCgpKSB7CisgICAgICAgICAgICBpZiAodXBkYXRlRmxh Z3MpCisgICAgICAgICAgICAgICAgbV9hc3NlbWJsZXIuYWRkX1MoZGF0YVRlbXBSZWdpc3Rlciwg ZGF0YVRlbXBSZWdpc3RlciwgYXJtSW1tKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg ICAgICBtX2Fzc2VtYmxlci5hZGQoZGF0YVRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3Rlciwg YXJtSW1tKTsKKyAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIEhycnJtLCBzaW5jZSBk YXRhVGVtcFJlZ2lzdGVyIGhvbGRzIHRoZSBkYXRhIGxvYWRlZCwKICAgICAgICAgICAgIC8vIHVz ZSBhZGRyZXNzVGVtcFJlZ2lzdGVyIHRvIGhvbGQgdGhlIGltbWVkaWF0ZS4KICAgICAgICAgICAg IG1vdmUoaW1tLCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsKLSAgICAgICAgICAgIG1fYXNzZW1ibGVy LmFkZChkYXRhVGVtcFJlZ2lzdGVyLCBkYXRhVGVtcFJlZ2lzdGVyLCBhZGRyZXNzVGVtcFJlZ2lz dGVyKTsKKyAgICAgICAgICAgIGlmICh1cGRhdGVGbGFncykKKyAgICAgICAgICAgICAgICBtX2Fz c2VtYmxlci5hZGRfUyhkYXRhVGVtcFJlZ2lzdGVyLCBkYXRhVGVtcFJlZ2lzdGVyLCBhZGRyZXNz VGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBtX2Fzc2Vt Ymxlci5hZGQoZGF0YVRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3RlciwgYWRkcmVzc1RlbXBS ZWdpc3Rlcik7CiAgICAgICAgIH0KIAogICAgICAgICBzdG9yZTMyKGRhdGFUZW1wUmVnaXN0ZXIs IGFkZHJlc3MubV9wdHIpOwpAQCAtMTg0NywxMyArMTg1OCwxMyBAQCBwdWJsaWM6CiAKICAgICBK dW1wIGJyYW5jaEFkZDMyKFJlc3VsdENvbmRpdGlvbiBjb25kLCBUcnVzdGVkSW1tMzIgaW1tLCBB YnNvbHV0ZUFkZHJlc3MgZGVzdCkKICAgICB7Ci0gICAgICAgIGFkZDMyKGltbSwgZGVzdCk7Cisg ICAgICAgIGFkZDMyKGltbSwgZGVzdCwgdHJ1ZSk7CiAgICAgICAgIHJldHVybiBKdW1wKG1ha2VC cmFuY2goY29uZCkpOwogICAgIH0KIAogICAgIEp1bXAgYnJhbmNoQWRkMzIoUmVzdWx0Q29uZGl0 aW9uIGNvbmQsIFRydXN0ZWRJbW0zMiBpbW0sIEFkZHJlc3MgZGVzdCkKICAgICB7Ci0gICAgICAg IGFkZDMyKGltbSwgZGVzdCk7CisgICAgICAgIGFkZDMyKGltbSwgZGVzdCwgdHJ1ZSk7CiAgICAg ICAgIHJldHVybiBKdW1wKG1ha2VCcmFuY2goY29uZCkpOwogICAgIH0KIAo= 441077 2021-10-13 07:39:03 -0700 2021-10-13 10:49:21 -0700 Patch bug-231362-20211013143901.patch text/plain 6070 mikhail U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 MzE4YmM1NzJhZGE0YTZmYTM2ZDBkNjc5MTdjN2JlMGFiZmZhMDA2Li4wNTQwMWU1Yzg3N2Q5MjRh NjJmODc5ZmE4MzAxNWU3MTkxMzU5NzI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMS0xMC0wNyAgTWlraGFpbCBSLiBHYWRlbGhhICA8bWlraGFpbEBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtKU0NdWzMyYml0XSBGaXggd3JvbmcgYnJhbmNoQWRkMzIgYXNz ZW1ibHkgZm9yIEFSTXY3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzEzNjIKKworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisg ICAgICAgIEFmdGVyIHRoZSB1bmxpbmtlZCBiYXNlbGluZSBqaXQgd2FzIG1lcmdlZCwgYSBuZXcg YnJhbmNoQWRkMzIgbWV0aG9kCisgICAgICAgIG5lZWRlZCB0byBiZSBpbXBsZW1lbnRlZCBmb3Ig QVJNdjcsIGhvd2V2ZXIsIHRoZSBmaXJzdCB2ZXJzaW9uCisgICAgICAgIHN1Ym1pdHRlZCBieSBt ZSB1c2VkIHRoZSBhZGQzMiBtZXRob2QgdG8gcGVyZm9ybSB0aGUgYWRkIGJlZm9yZQorICAgICAg ICBicmFuY2hpbmcuCisKKyAgICAgICAgSW4gdGhpcyBwYXRjaCwgd2UgZml4IHRoZSBjYWxsIHRv IGFkZDMyIGJ5IGFkZGluZyBhIG5ldyBwcml2YXRlIG1ldGhvZAorICAgICAgICBhZGQzMkltcGwg d2l0aCBhbiBvcHRpb25hbCBwYXJhbWV0ZXIgdGhhdCBzZWxlY3RzIGVpdGhlciBhZGQgb3IgYWRk cywKKyAgICAgICAgbWFrZSBicmFuY2hBZGQzMiBjYWxsIHRoZSBhZGRzIHZlcnNpb24uCisKKyAg ICAgICAgKFBhdGNoIGNvLWF1dGhvcmVkIHdpdGggR2V6YSBMb3JlKQorCisgICAgICAgICogYXNz ZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNdjcuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJs ZXJBUk12Nzo6YnJhbmNoQWRkMzIpOgorCiAyMDIxLTEwLTEzICBEaWVnbyBQaW5vIEdhcmNpYSAg PGRwaW5vQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVW5yZXZpZXdlZCwgYnVpbGQgZml4 IGZvciBVYnVudHUgMTguMDQgYWZ0ZXIgcjI4Mzg1MgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmggYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNdjcuaAppbmRleCA5NTk4OTZiOWNh MmRlYTI4ZDYxZTkxYzljMzUzNzQ3NTViNDg3YTYyLi5mNjE1YTUwY2VlOTVmMGU4ZmM0MDcxNDlj MjQxMDQ5ZjdiMTZiNmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL01hY3JvQXNzZW1ibGVyQVJNdjcuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNz ZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNdjcuaApAQCAtMTg5LDcgKzE4OSw2IEBAIHB1YmxpYzoK ICAgICAgICAgfQogCiAgICAgICAgIEFSTVRodW1iSW1tZWRpYXRlIGFybUltbSA9IEFSTVRodW1i SW1tZWRpYXRlOjptYWtlVUludDEyT3JFbmNvZGVkSW1tKGltbS5tX3ZhbHVlKTsKLQogICAgICAg ICBpZiAoYXJtSW1tLmlzVmFsaWQoKSkKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZChkZXN0 LCBzcmMsIGFybUltbSk7CiAgICAgICAgIGVsc2UgewpAQCAtMjAwLDE5ICsxOTksOCBAQCBwdWJs aWM6CiAKICAgICB2b2lkIGFkZDMyKFRydXN0ZWRJbW0zMiBpbW0sIEFkZHJlc3MgYWRkcmVzcykK ICAgICB7Ci0gICAgICAgIGxvYWQzMihhZGRyZXNzLCBkYXRhVGVtcFJlZ2lzdGVyKTsKLQotICAg ICAgICBBUk1UaHVtYkltbWVkaWF0ZSBhcm1JbW0gPSBBUk1UaHVtYkltbWVkaWF0ZTo6bWFrZVVJ bnQxMk9yRW5jb2RlZEltbShpbW0ubV92YWx1ZSk7Ci0gICAgICAgIGlmIChhcm1JbW0uaXNWYWxp ZCgpKQotICAgICAgICAgICAgbV9hc3NlbWJsZXIuYWRkKGRhdGFUZW1wUmVnaXN0ZXIsIGRhdGFU ZW1wUmVnaXN0ZXIsIGFybUltbSk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgLy8gSHJy cm0sIHNpbmNlIGRhdGFUZW1wUmVnaXN0ZXIgaG9sZHMgdGhlIGRhdGEgbG9hZGVkLAotICAgICAg ICAgICAgLy8gdXNlIGFkZHJlc3NUZW1wUmVnaXN0ZXIgdG8gaG9sZCB0aGUgaW1tZWRpYXRlLgot ICAgICAgICAgICAgbW92ZShpbW0sIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOwotICAgICAgICAgICAg bV9hc3NlbWJsZXIuYWRkKGRhdGFUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJl c3NUZW1wUmVnaXN0ZXIpOwotICAgICAgICB9Ci0KLSAgICAgICAgc3RvcmUzMihkYXRhVGVtcFJl Z2lzdGVyLCBhZGRyZXNzKTsKKyAgICAgICAgY29uc3RleHByIGJvb2wgdXBkYXRlRmxhZ3MgPSBm YWxzZTsKKyAgICAgICAgYWRkMzJJbXBsKGltbSwgYWRkcmVzcywgdXBkYXRlRmxhZ3MpOwogICAg IH0KIAogICAgIHZvaWQgYWRkMzIoQWRkcmVzcyBzcmMsIFJlZ2lzdGVySUQgZGVzdCkKQEAgLTIy MywxOSArMjExLDggQEAgcHVibGljOgogCiAgICAgdm9pZCBhZGQzMihUcnVzdGVkSW1tMzIgaW1t LCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKICAgICB7Ci0gICAgICAgIGxvYWQzMihhZGRyZXNz Lm1fcHRyLCBkYXRhVGVtcFJlZ2lzdGVyKTsKLQotICAgICAgICBBUk1UaHVtYkltbWVkaWF0ZSBh cm1JbW0gPSBBUk1UaHVtYkltbWVkaWF0ZTo6bWFrZVVJbnQxMk9yRW5jb2RlZEltbShpbW0ubV92 YWx1ZSk7Ci0gICAgICAgIGlmIChhcm1JbW0uaXNWYWxpZCgpKQotICAgICAgICAgICAgbV9hc3Nl bWJsZXIuYWRkKGRhdGFUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIsIGFybUltbSk7Ci0g ICAgICAgIGVsc2UgewotICAgICAgICAgICAgLy8gSHJycm0sIHNpbmNlIGRhdGFUZW1wUmVnaXN0 ZXIgaG9sZHMgdGhlIGRhdGEgbG9hZGVkLAotICAgICAgICAgICAgLy8gdXNlIGFkZHJlc3NUZW1w UmVnaXN0ZXIgdG8gaG9sZCB0aGUgaW1tZWRpYXRlLgotICAgICAgICAgICAgbW92ZShpbW0sIGFk ZHJlc3NUZW1wUmVnaXN0ZXIpOwotICAgICAgICAgICAgbV9hc3NlbWJsZXIuYWRkKGRhdGFUZW1w UmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOwotICAgICAg ICB9Ci0KLSAgICAgICAgc3RvcmUzMihkYXRhVGVtcFJlZ2lzdGVyLCBhZGRyZXNzLm1fcHRyKTsK KyAgICAgICAgY29uc3RleHByIGJvb2wgdXBkYXRlRmxhZ3MgPSBmYWxzZTsKKyAgICAgICAgYWRk MzJJbXBsKGltbSwgYWRkcmVzcywgdXBkYXRlRmxhZ3MpOwogICAgIH0KIAogICAgIHZvaWQgZ2V0 RWZmZWN0aXZlQWRkcmVzcyhCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQpAQCAt MTU3Nyw2ICsxNTU0LDUyIEBAIHByaXZhdGU6CiAgICAgICAgIH0KICAgICB9CiAKKyAgICB2b2lk IGFkZDMySW1wbChUcnVzdGVkSW1tMzIgaW1tLCBBZGRyZXNzIGFkZHJlc3MsIGJvb2wgdXBkYXRl RmxhZ3MgPSBmYWxzZSkKKyAgICB7CisgICAgICAgIGxvYWQzMihhZGRyZXNzLCBkYXRhVGVtcFJl Z2lzdGVyKTsKKworICAgICAgICBBUk1UaHVtYkltbWVkaWF0ZSBhcm1JbW0gPSBBUk1UaHVtYklt bWVkaWF0ZTo6bWFrZUVuY29kZWRJbW0oaW1tLm1fdmFsdWUpOworICAgICAgICBpZiAoYXJtSW1t LmlzVmFsaWQoKSkgeworICAgICAgICAgICAgaWYgKHVwZGF0ZUZsYWdzKQorICAgICAgICAgICAg ICAgIG1fYXNzZW1ibGVyLmFkZF9TKGRhdGFUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIs IGFybUltbSk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgbV9hc3NlbWJsZXIu YWRkKGRhdGFUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIsIGFybUltbSk7CisgICAgICAg IH0gZWxzZSB7CisgICAgICAgICAgICAvLyBIcnJybSwgc2luY2UgZGF0YVRlbXBSZWdpc3RlciBo b2xkcyB0aGUgZGF0YSBsb2FkZWQsCisgICAgICAgICAgICAvLyB1c2UgYWRkcmVzc1RlbXBSZWdp c3RlciB0byBob2xkIHRoZSBpbW1lZGlhdGUuCisgICAgICAgICAgICBtb3ZlKGltbSwgYWRkcmVz c1RlbXBSZWdpc3Rlcik7CisgICAgICAgICAgICBpZiAodXBkYXRlRmxhZ3MpCisgICAgICAgICAg ICAgICAgbV9hc3NlbWJsZXIuYWRkX1MoZGF0YVRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3Rl ciwgYWRkcmVzc1RlbXBSZWdpc3Rlcik7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAg ICAgbV9hc3NlbWJsZXIuYWRkKGRhdGFUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIsIGFk ZHJlc3NUZW1wUmVnaXN0ZXIpOworICAgICAgICB9CisKKyAgICAgICAgc3RvcmUzMihkYXRhVGVt cFJlZ2lzdGVyLCBhZGRyZXNzKTsKKyAgICB9CisKKyAgICB2b2lkIGFkZDMySW1wbChUcnVzdGVk SW1tMzIgaW1tLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVzcywgYm9vbCB1cGRhdGVGbGFncyA9IGZh bHNlKQorICAgIHsKKyAgICAgICAgbG9hZDMyKGFkZHJlc3MubV9wdHIsIGRhdGFUZW1wUmVnaXN0 ZXIpOworCisgICAgICAgIEFSTVRodW1iSW1tZWRpYXRlIGFybUltbSA9IEFSTVRodW1iSW1tZWRp YXRlOjptYWtlRW5jb2RlZEltbShpbW0ubV92YWx1ZSk7CisgICAgICAgIGlmIChhcm1JbW0uaXNW YWxpZCgpKSB7CisgICAgICAgICAgICBpZiAodXBkYXRlRmxhZ3MpCisgICAgICAgICAgICAgICAg bV9hc3NlbWJsZXIuYWRkX1MoZGF0YVRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3RlciwgYXJt SW1tKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBtX2Fzc2VtYmxlci5hZGQo ZGF0YVRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3RlciwgYXJtSW1tKTsKKyAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgIC8vIEhycnJtLCBzaW5jZSBkYXRhVGVtcFJlZ2lzdGVyIGhvbGRz IHRoZSBkYXRhIGxvYWRlZCwKKyAgICAgICAgICAgIC8vIHVzZSBhZGRyZXNzVGVtcFJlZ2lzdGVy IHRvIGhvbGQgdGhlIGltbWVkaWF0ZS4KKyAgICAgICAgICAgIG1vdmUoaW1tLCBhZGRyZXNzVGVt cFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIGlmICh1cGRhdGVGbGFncykKKyAgICAgICAgICAgICAg ICBtX2Fzc2VtYmxlci5hZGRfUyhkYXRhVGVtcFJlZ2lzdGVyLCBkYXRhVGVtcFJlZ2lzdGVyLCBh ZGRyZXNzVGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBt X2Fzc2VtYmxlci5hZGQoZGF0YVRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3RlciwgYWRkcmVz c1RlbXBSZWdpc3Rlcik7CisgICAgICAgIH0KKworICAgICAgICBzdG9yZTMyKGRhdGFUZW1wUmVn aXN0ZXIsIGFkZHJlc3MubV9wdHIpOworICAgIH0KKwogcHVibGljOgogICAgIHZvaWQgdGVzdDMy KFJlZ2lzdGVySUQgcmVnLCBUcnVzdGVkSW1tMzIgbWFzayA9IFRydXN0ZWRJbW0zMigtMSkpCiAg ICAgewpAQCAtMTg0NywxMyArMTg3MCwxNSBAQCBwdWJsaWM6CiAKICAgICBKdW1wIGJyYW5jaEFk ZDMyKFJlc3VsdENvbmRpdGlvbiBjb25kLCBUcnVzdGVkSW1tMzIgaW1tLCBBYnNvbHV0ZUFkZHJl c3MgZGVzdCkKICAgICB7Ci0gICAgICAgIGFkZDMyKGltbSwgZGVzdCk7CisgICAgICAgIGNvbnN0 ZXhwciBib29sIHVwZGF0ZUZsYWdzID0gdHJ1ZTsKKyAgICAgICAgYWRkMzJJbXBsKGltbSwgZGVz dCwgdXBkYXRlRmxhZ3MpOwogICAgICAgICByZXR1cm4gSnVtcChtYWtlQnJhbmNoKGNvbmQpKTsK ICAgICB9CiAKICAgICBKdW1wIGJyYW5jaEFkZDMyKFJlc3VsdENvbmRpdGlvbiBjb25kLCBUcnVz dGVkSW1tMzIgaW1tLCBBZGRyZXNzIGRlc3QpCiAgICAgewotICAgICAgICBhZGQzMihpbW0sIGRl c3QpOworICAgICAgICBjb25zdGV4cHIgYm9vbCB1cGRhdGVGbGFncyA9IHRydWU7CisgICAgICAg IGFkZDMySW1wbChpbW0sIGRlc3QsIHVwZGF0ZUZsYWdzKTsKICAgICAgICAgcmV0dXJuIEp1bXAo bWFrZUJyYW5jaChjb25kKSk7CiAgICAgfQogCg==