204126 2019-11-12 13:33:48 -0800 Support or16(TrustedImm32, AbsoluteAddress) in the MIPS MacroAssembler 2019-11-14 12:52:20 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=202832 InRadar P2 Normal --- 1 rmorisset ticaiolima commit-queue ews-watchlist guijemont jsc32 keith_miller mark.lam msaboff pmatos saam ticaiolima tzagallo webkit-bug-importer xan.lopez oldest_to_newest 1589612 0 rmorisset 2019-11-12 13:33:48 -0800 My patch at https://bugs.webkit.org/show_bug.cgi?id=202832 was rolled out, because it was using or32 on a now-16bits field. I am currently fixing it, which includes implementing or16 in the 32 and 64-bits x86 and ARM MacroAssembler backends. I cannot fix the MIPS backend as I have no way to test it and don't even know which processors it is supposed to work on; so once I am done and lands the patch again it will probably break the MIPS port. The solution is simply to implement or16(TrustedImm32, AbsoluteAddress) in MacroAssemblerMIPS.h. There is already a 32-bit version, so it should not be too difficult. 1589737 1 383417 ticaiolima 2019-11-12 18:23:54 -0800 Created attachment 383417 WIP - Patch This seems to be the proper implementation. I'm running tests to validate it. 1589965 2 383476 ticaiolima 2019-11-13 11:33:04 -0800 Created attachment 383476 WIP - Patch Diff from current https://bugs.webkit.org/show_bug.cgi?id=202832 1589995 3 383476 rmorisset 2019-11-13 12:43:15 -0800 Comment on attachment 383476 WIP - Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383476&action=review > Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h:-491 > - m_assembler.lw(immTempRegister, addrTempRegister, adr & 0xffff); This patch appears to be altering the implementation of or32, instead of adding or16? 1590158 4 383476 ticaiolima 2019-11-13 18:25:39 -0800 Comment on attachment 383476 WIP - Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383476&action=review >> Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h:-491 >> - m_assembler.lw(immTempRegister, addrTempRegister, adr & 0xffff); > > This patch appears to be altering the implementation of or32, instead of adding or16? Actually, this is a diff from your current patch that already landed. I'm uploading a Patch to this soon. 1590163 5 383533 ticaiolima 2019-11-13 18:31:34 -0800 Created attachment 383533 Patch 1590198 6 383533 mark.lam 2019-11-13 21:04:58 -0800 Comment on attachment 383533 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383533&action=review > JSTests/stress/regress-57020338.js:6 > + for (let j = 0; j < 10000; j++) { I’m not sure this is a valid is an appropriate change to make. Robin, is 10000 sufficient to repro the problem in x86_64? If not,, then the timeout issue on slow ports should be handled in a different way. 1590225 7 383552 ticaiolima 2019-11-14 03:16:03 -0800 Created attachment 383552 Patch 1590228 8 ticaiolima 2019-11-14 03:31:58 -0800 (In reply to Mark Lam from comment #6) > Comment on attachment 383533 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=383533&action=review > > > JSTests/stress/regress-57020338.js:6 > > + for (let j = 0; j < 10000; j++) { > > I’m not sure this is a valid is an appropriate change to make. Robin, is > 10000 sufficient to repro the problem in x86_64? If not,, then the timeout > issue on slow ports should be handled in a different way. To reproduce the issue, I changed `ArithProfile<BitfieldType>::emitUnconditionalSet` to use `or32` instead of `or16`. I was able to see crashes in x86_64, but not every time. Now, I changed another place and I was able to reproduce segfault 100/100 tries in my x86_64 macOS build. I also tested this on jsc-only and reproduced the crash. 1590285 9 ticaiolima 2019-11-14 11:42:24 -0800 ping 1590288 10 383552 mark.lam 2019-11-14 11:45:03 -0800 Comment on attachment 383552 Patch rs=me 1590289 11 ticaiolima 2019-11-14 11:46:55 -0800 For the record, both issues of stress/ensure-code-block-is-not-precise-allocation.js.dfg-eager (MIPS) and stress/toctou-having-a-bad-time-new-array.js (ARMv7) are not related with this Patch. The former is due the broken OSR to LLInt into MIPS and later is a OOM on ToT (see one report here https://build.webkit.org/builders/JSCOnly%20Linux%20ARMv7%20Thumb2%20Release/builds/9979/steps/jscore-test/logs/stdio) 1590292 12 383552 ticaiolima 2019-11-14 12:08:03 -0800 Comment on attachment 383552 Patch Thank you very much for the review! 1590306 13 383552 commit-queue 2019-11-14 12:51:10 -0800 Comment on attachment 383552 Patch Clearing flags on attachment: 383552 Committed r252463: <https://trac.webkit.org/changeset/252463> 1590307 14 commit-queue 2019-11-14 12:51:12 -0800 All reviewed patches have been landed. Closing bug. 1590308 15 webkit-bug-importer 2019-11-14 12:52:20 -0800 <rdar://problem/57200550> 383417 2019-11-12 18:23:54 -0800 2019-11-13 11:33:04 -0800 WIP - Patch or16_mips.diff text/plain 2201 ticaiolima ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJs ZXJNSVBTLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVy TUlQUy5oCmluZGV4IDgxNzJhZjc1ZTAxLi5lYmY3MzVhZmVmNiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oCkBAIC00ODks NyArNDg5LDcgQEAgcHVibGljOgogICAgICAgICAgICAgdWludHB0cl90IGFkciA9IHJlaW50ZXJw cmV0X2Nhc3Q8dWludHB0cl90PihkZXN0Lm1fcHRyKTsKICAgICAgICAgICAgIG1fYXNzZW1ibGVy Lmx1aShhZGRyVGVtcFJlZ2lzdGVyLCAoYWRyICsgMHg4MDAwKSA+PiAxNik7CiAgICAgICAgICAg ICBtX2Fzc2VtYmxlci5saHUoaW1tVGVtcFJlZ2lzdGVyLCBhZGRyVGVtcFJlZ2lzdGVyLCBhZHIg JiAweGZmZmYpOwotICAgICAgICAgICAgb3IxNihpbW0sIGltbVRlbXBSZWdpc3Rlcik7CisgICAg ICAgICAgICBvcjMyKGltbSwgaW1tVGVtcFJlZ2lzdGVyKTsKICAgICAgICAgICAgIG1fYXNzZW1i bGVyLnNoKGltbVRlbXBSZWdpc3RlciwgYWRkclRlbXBSZWdpc3RlciwgYWRyICYgMHhmZmZmKTsK ICAgICAgICAgfQogICAgIH0KQEAgLTExOTEsNiArMTE5MSwyMiBAQCBwdWJsaWM6CiAgICAgICAg IHJldHVybiBkYXRhTGFiZWw7CiAgICAgfQogCisgICAgdm9pZCBsb2FkMTYoY29uc3Qgdm9pZCog YWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAgICAgICAgaWYgKG1fZml4ZWRXaWR0 aCkgeworICAgICAgICAgICAgLyoKKyAgICAgICAgICAgICAgICBsaSAgYWRkclRlbXAsIGFkZHJl c3MKKyAgICAgICAgICAgICAgICBsaHUgIGRlc3QsIDAoYWRkclRlbXApCisgICAgICAgICAgICAq LworICAgICAgICAgICAgbW92ZShUcnVzdGVkSW1tUHRyKGFkZHJlc3MpLCBhZGRyVGVtcFJlZ2lz dGVyKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLmxodShkZXN0LCBhZGRyVGVtcFJlZ2lzdGVy LCAwKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHVpbnRwdHJfdCBhZHIgPSByZWlu dGVycHJldF9jYXN0PHVpbnRwdHJfdD4oYWRkcmVzcyk7CisgICAgICAgICAgICBtX2Fzc2VtYmxl ci5sdWkoYWRkclRlbXBSZWdpc3RlciwgKGFkciArIDB4ODAwMCkgPj4gMTYpOworICAgICAgICAg ICAgbV9hc3NlbWJsZXIubGh1KGRlc3QsIGFkZHJUZW1wUmVnaXN0ZXIsIGFkciAmIDB4ZmZmZik7 CisgICAgICAgIH0KKyAgICB9CisKICAgICAvKiBOZWVkIHRvIHVzZSB6ZXJvLWV4dGVuZWQgbG9h ZCBoYWxmLXdvcmQgZm9yIGxvYWQxNi4gICovCiAgICAgdm9pZCBsb2FkMTYoSW1wbGljaXRBZGRy ZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CkBAIC0xMzU5LDYgKzEzNzUsMjIg QEAgcHVibGljOgogICAgICAgICB9CiAgICAgfQogCisgICAgdm9pZCBzdG9yZTE2KFJlZ2lzdGVy SUQgc3JjLCBjb25zdCB2b2lkKiBhZGRyZXNzKQorICAgIHsKKyAgICAgICAgaWYgKG1fZml4ZWRX aWR0aCkgeworICAgICAgICAgICAgLyoKKyAgICAgICAgICAgICAgICBsaSAgYWRkclRlbXAsIGFk ZHJlc3MKKyAgICAgICAgICAgICAgICBzaCAgc3JjLCAwKGFkZHJUZW1wKQorICAgICAgICAgICAg Ki8KKyAgICAgICAgICAgIG1vdmUoVHJ1c3RlZEltbVB0cihhZGRyZXNzKSwgYWRkclRlbXBSZWdp c3Rlcik7CisgICAgICAgICAgICBtX2Fzc2VtYmxlci5zaChzcmMsIGFkZHJUZW1wUmVnaXN0ZXIs IDApOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdWludHB0cl90IGFkciA9IHJlaW50 ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihhZGRyZXNzKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVy Lmx1aShhZGRyVGVtcFJlZ2lzdGVyLCAoYWRyICsgMHg4MDAwKSA+PiAxNik7CisgICAgICAgICAg ICBtX2Fzc2VtYmxlci5zaChzcmMsIGFkZHJUZW1wUmVnaXN0ZXIsIGFkciAmIDB4ZmZmZik7Cisg ICAgICAgIH0KKyAgICB9CisKICAgICB2b2lkIHN0b3JlMTYoUmVnaXN0ZXJJRCBzcmMsIEltcGxp Y2l0QWRkcmVzcyBhZGRyZXNzKQogICAgIHsKICAgICAgICAgaWYgKGFkZHJlc3Mub2Zmc2V0ID49 IC0zMjc2OCAmJiBhZGRyZXNzLm9mZnNldCA8PSAzMjc2Nwo= 383476 2019-11-13 11:33:04 -0800 2019-11-13 18:31:30 -0800 WIP - Patch or16_mips.diff text/plain 2377 ticaiolima ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJs ZXJNSVBTLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVy TUlQUy5oCmluZGV4IDBlMTkxYTFiYjc0Li5lYmY3MzVhZmVmNiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oCkBAIC00ODgs OSArNDg4LDkgQEAgcHVibGljOgogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdWludHB0 cl90IGFkciA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihkZXN0Lm1fcHRyKTsKICAgICAg ICAgICAgIG1fYXNzZW1ibGVyLmx1aShhZGRyVGVtcFJlZ2lzdGVyLCAoYWRyICsgMHg4MDAwKSA+ PiAxNik7Ci0gICAgICAgICAgICBtX2Fzc2VtYmxlci5sdyhpbW1UZW1wUmVnaXN0ZXIsIGFkZHJU ZW1wUmVnaXN0ZXIsIGFkciAmIDB4ZmZmZik7Ci0gICAgICAgICAgICBvcjE2KGltbSwgaW1tVGVt cFJlZ2lzdGVyKTsKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLnN3KGltbVRlbXBSZWdpc3Rlciwg YWRkclRlbXBSZWdpc3RlciwgYWRyICYgMHhmZmZmKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVy LmxodShpbW1UZW1wUmVnaXN0ZXIsIGFkZHJUZW1wUmVnaXN0ZXIsIGFkciAmIDB4ZmZmZik7Cisg ICAgICAgICAgICBvcjMyKGltbSwgaW1tVGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIG1fYXNz ZW1ibGVyLnNoKGltbVRlbXBSZWdpc3RlciwgYWRkclRlbXBSZWdpc3RlciwgYWRyICYgMHhmZmZm KTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMTE5MSw2ICsxMTkxLDIyIEBAIHB1YmxpYzoKICAg ICAgICAgcmV0dXJuIGRhdGFMYWJlbDsKICAgICB9CiAKKyAgICB2b2lkIGxvYWQxNihjb25zdCB2 b2lkKiBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCisgICAgeworICAgICAgICBpZiAobV9maXhl ZFdpZHRoKSB7CisgICAgICAgICAgICAvKgorICAgICAgICAgICAgICAgIGxpICBhZGRyVGVtcCwg YWRkcmVzcworICAgICAgICAgICAgICAgIGxodSAgZGVzdCwgMChhZGRyVGVtcCkKKyAgICAgICAg ICAgICovCisgICAgICAgICAgICBtb3ZlKFRydXN0ZWRJbW1QdHIoYWRkcmVzcyksIGFkZHJUZW1w UmVnaXN0ZXIpOworICAgICAgICAgICAgbV9hc3NlbWJsZXIubGh1KGRlc3QsIGFkZHJUZW1wUmVn aXN0ZXIsIDApOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdWludHB0cl90IGFkciA9 IHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihhZGRyZXNzKTsKKyAgICAgICAgICAgIG1fYXNz ZW1ibGVyLmx1aShhZGRyVGVtcFJlZ2lzdGVyLCAoYWRyICsgMHg4MDAwKSA+PiAxNik7CisgICAg ICAgICAgICBtX2Fzc2VtYmxlci5saHUoZGVzdCwgYWRkclRlbXBSZWdpc3RlciwgYWRyICYgMHhm ZmZmKTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIC8qIE5lZWQgdG8gdXNlIHplcm8tZXh0ZW5l ZCBsb2FkIGhhbGYtd29yZCBmb3IgbG9hZDE2LiAgKi8KICAgICB2b2lkIGxvYWQxNihJbXBsaWNp dEFkZHJlc3MgYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKQEAgLTEzNTksNiArMTM3 NSwyMiBAQCBwdWJsaWM6CiAgICAgICAgIH0KICAgICB9CiAKKyAgICB2b2lkIHN0b3JlMTYoUmVn aXN0ZXJJRCBzcmMsIGNvbnN0IHZvaWQqIGFkZHJlc3MpCisgICAgeworICAgICAgICBpZiAobV9m aXhlZFdpZHRoKSB7CisgICAgICAgICAgICAvKgorICAgICAgICAgICAgICAgIGxpICBhZGRyVGVt cCwgYWRkcmVzcworICAgICAgICAgICAgICAgIHNoICBzcmMsIDAoYWRkclRlbXApCisgICAgICAg ICAgICAqLworICAgICAgICAgICAgbW92ZShUcnVzdGVkSW1tUHRyKGFkZHJlc3MpLCBhZGRyVGVt cFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNoKHNyYywgYWRkclRlbXBSZWdp c3RlciwgMCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICB1aW50cHRyX3QgYWRyID0g cmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGFkZHJlc3MpOworICAgICAgICAgICAgbV9hc3Nl bWJsZXIubHVpKGFkZHJUZW1wUmVnaXN0ZXIsIChhZHIgKyAweDgwMDApID4+IDE2KTsKKyAgICAg ICAgICAgIG1fYXNzZW1ibGVyLnNoKHNyYywgYWRkclRlbXBSZWdpc3RlciwgYWRyICYgMHhmZmZm KTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIHZvaWQgc3RvcmUxNihSZWdpc3RlcklEIHNyYywg SW1wbGljaXRBZGRyZXNzIGFkZHJlc3MpCiAgICAgewogICAgICAgICBpZiAoYWRkcmVzcy5vZmZz ZXQgPj0gLTMyNzY4ICYmIGFkZHJlc3Mub2Zmc2V0IDw9IDMyNzY3Cg== 383533 2019-11-13 18:31:34 -0800 2019-11-14 03:15:59 -0800 Patch bug-204126-20191113233132.patch text/plain 6121 ticaiolima U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 ZWM3YjVjZGIwZTI2NWVmOWJjMGVjNWY4ODE5YzE2OWM1MjQzZmQ5Li42OGM2ZTA1OGZjNWZhMmUx NTU5YjQ5MjgxN2QwNWQ4MDRhNjFkOTZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxOS0xMS0xMyAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+ CisKKyAgICAgICAgU3VwcG9ydCBvcjE2KFRydXN0ZWRJbW0zMiwgQWJzb2x1dGVBZGRyZXNzKSBp biB0aGUgTUlQUyBNYWNyb0Fzc2VtYmxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA0MTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBhZGp1c3RpbmcgdGhlIGltcGxlbWVudGF0aW9uIG9m IGBvcjE2YCBmb3IgTUlQUy4gVGhpcyByZXF1aXJlZAorICAgICAgICB0aGUgYWRkaXRpb24gb2Yg YGxvYWQxNmAgYW5kIGBzdG9yZTE2YCBmb3IgdGhpcyBtYWNybyBhc3NlbWJsZXIgYXMKKyAgICAg ICAgd2VsbC4gVGhpcyBpcyBhbHNvIGZpeGluZyBidWlsZCBpc3N1ZSBvbiBBUk12NyBgb3IxNmAg aW1wbGVtZW50YXRpb24uCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12 Ny5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3OjpvcjE2KToKKyAgICAgICAg KiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNz ZW1ibGVyTUlQUzo6b3IxNik6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyTUlQUzo6bG9h ZDE2KToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJNSVBTOjpzdG9yZTE2KToKKwogMjAx OS0xMS0xMyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUuY29tPgogCiAgICAgICAg IFNwbGl0IEFyaXRoUHJvZmlsZSBpbnRvIGEgVW5hcnkgYW5kIGEgQmluYXJ5IHZlcnNpb24KZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJB Uk12Ny5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFS TXY3LmgKaW5kZXggNGVlYzc2YTYzZTRlMmZhN2FiZjMzMjY5ZmViY2YxZmQ3OWI2M2ZkMS4uMzg4 NTNiZWJkNjg5NmI2MDkxZDMzMGFlYzk0MDY1ZjIxOGUyN2M1ZSAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKQEAgLTM3 MCwxNiArMzcwLDE2IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIEFSTVRodW1iSW1tZWRpYXRl IGFybUltbSA9IEFSTVRodW1iSW1tZWRpYXRlOjptYWtlRW5jb2RlZEltbShpbW0ubV92YWx1ZSk7 CiAgICAgICAgIGlmIChhcm1JbW0uaXNWYWxpZCgpKSB7Ci0gICAgICAgICAgICBtb3ZlKFRydXN0 ZWRJbW1QdHIoYWRkcmVzcy5tX3B0ciksIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOworICAgICAgICAg ICAgbW92ZShUcnVzdGVkSW1tUHRyKGRlc3QubV9wdHIpLCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsK ICAgICAgICAgICAgIGxvYWQxNihhZGRyZXNzVGVtcFJlZ2lzdGVyLCBkYXRhVGVtcFJlZ2lzdGVy KTsKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLm9ycihkYXRhVGVtcFJlZ2lzdGVyLCBkYXRhVGVt cFJlZ2lzdGVyLCBhcm1JbW0pOwogICAgICAgICAgICAgc3RvcmUxNihkYXRhVGVtcFJlZ2lzdGVy LCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIG1v dmUoVHJ1c3RlZEltbVB0cihhZGRyZXNzLm1fcHRyKSwgYWRkcmVzc1RlbXBSZWdpc3Rlcik7Cisg ICAgICAgICAgICBtb3ZlKFRydXN0ZWRJbW1QdHIoZGVzdC5tX3B0ciksIGFkZHJlc3NUZW1wUmVn aXN0ZXIpOwogICAgICAgICAgICAgbG9hZDE2KGFkZHJlc3NUZW1wUmVnaXN0ZXIsIGRhdGFUZW1w UmVnaXN0ZXIpOwogICAgICAgICAgICAgbW92ZShpbW0sIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOwog ICAgICAgICAgICAgbV9hc3NlbWJsZXIub3JyKGRhdGFUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVn aXN0ZXIsIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOwotICAgICAgICAgICAgbW92ZShUcnVzdGVkSW1t UHRyKGFkZHJlc3MubV9wdHIpLCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIG1v dmUoVHJ1c3RlZEltbVB0cihkZXN0Lm1fcHRyKSwgYWRkcmVzc1RlbXBSZWdpc3Rlcik7CiAgICAg ICAgICAgICBzdG9yZTE2KGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOwog ICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgKaW5kZXggMGUxOTFhMWJiNzQyOGY0YzY2MDA2MWNlOTI3 MzQ0ZWE5ZWUzMzUwNC4uZWJmNzM1YWZlZjY1MmIwMTFmNWEyY2EyZDEzMjA4YTI0YjE2OWZkNSAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxl ck1JUFMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyTUlQUy5oCkBAIC00ODgsOSArNDg4LDkgQEAgcHVibGljOgogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgdWludHB0cl90IGFkciA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pihk ZXN0Lm1fcHRyKTsKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLmx1aShhZGRyVGVtcFJlZ2lzdGVy LCAoYWRyICsgMHg4MDAwKSA+PiAxNik7Ci0gICAgICAgICAgICBtX2Fzc2VtYmxlci5sdyhpbW1U ZW1wUmVnaXN0ZXIsIGFkZHJUZW1wUmVnaXN0ZXIsIGFkciAmIDB4ZmZmZik7Ci0gICAgICAgICAg ICBvcjE2KGltbSwgaW1tVGVtcFJlZ2lzdGVyKTsKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLnN3 KGltbVRlbXBSZWdpc3RlciwgYWRkclRlbXBSZWdpc3RlciwgYWRyICYgMHhmZmZmKTsKKyAgICAg ICAgICAgIG1fYXNzZW1ibGVyLmxodShpbW1UZW1wUmVnaXN0ZXIsIGFkZHJUZW1wUmVnaXN0ZXIs IGFkciAmIDB4ZmZmZik7CisgICAgICAgICAgICBvcjMyKGltbSwgaW1tVGVtcFJlZ2lzdGVyKTsK KyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNoKGltbVRlbXBSZWdpc3RlciwgYWRkclRlbXBSZWdp c3RlciwgYWRyICYgMHhmZmZmKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMTE5MSw2ICsxMTkx LDIyIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGRhdGFMYWJlbDsKICAgICB9CiAKKyAgICB2 b2lkIGxvYWQxNihjb25zdCB2b2lkKiBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCisgICAgewor ICAgICAgICBpZiAobV9maXhlZFdpZHRoKSB7CisgICAgICAgICAgICAvKgorICAgICAgICAgICAg ICAgIGxpICBhZGRyVGVtcCwgYWRkcmVzcworICAgICAgICAgICAgICAgIGxodSAgZGVzdCwgMChh ZGRyVGVtcCkKKyAgICAgICAgICAgICovCisgICAgICAgICAgICBtb3ZlKFRydXN0ZWRJbW1QdHIo YWRkcmVzcyksIGFkZHJUZW1wUmVnaXN0ZXIpOworICAgICAgICAgICAgbV9hc3NlbWJsZXIubGh1 KGRlc3QsIGFkZHJUZW1wUmVnaXN0ZXIsIDApOworICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgdWludHB0cl90IGFkciA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihhZGRyZXNzKTsK KyAgICAgICAgICAgIG1fYXNzZW1ibGVyLmx1aShhZGRyVGVtcFJlZ2lzdGVyLCAoYWRyICsgMHg4 MDAwKSA+PiAxNik7CisgICAgICAgICAgICBtX2Fzc2VtYmxlci5saHUoZGVzdCwgYWRkclRlbXBS ZWdpc3RlciwgYWRyICYgMHhmZmZmKTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIC8qIE5lZWQg dG8gdXNlIHplcm8tZXh0ZW5lZCBsb2FkIGhhbGYtd29yZCBmb3IgbG9hZDE2LiAgKi8KICAgICB2 b2lkIGxvYWQxNihJbXBsaWNpdEFkZHJlc3MgYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQogICAg IHsKQEAgLTEzNTksNiArMTM3NSwyMiBAQCBwdWJsaWM6CiAgICAgICAgIH0KICAgICB9CiAKKyAg ICB2b2lkIHN0b3JlMTYoUmVnaXN0ZXJJRCBzcmMsIGNvbnN0IHZvaWQqIGFkZHJlc3MpCisgICAg eworICAgICAgICBpZiAobV9maXhlZFdpZHRoKSB7CisgICAgICAgICAgICAvKgorICAgICAgICAg ICAgICAgIGxpICBhZGRyVGVtcCwgYWRkcmVzcworICAgICAgICAgICAgICAgIHNoICBzcmMsIDAo YWRkclRlbXApCisgICAgICAgICAgICAqLworICAgICAgICAgICAgbW92ZShUcnVzdGVkSW1tUHRy KGFkZHJlc3MpLCBhZGRyVGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNo KHNyYywgYWRkclRlbXBSZWdpc3RlciwgMCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICB1aW50cHRyX3QgYWRyID0gcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGFkZHJlc3MpOwor ICAgICAgICAgICAgbV9hc3NlbWJsZXIubHVpKGFkZHJUZW1wUmVnaXN0ZXIsIChhZHIgKyAweDgw MDApID4+IDE2KTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNoKHNyYywgYWRkclRlbXBSZWdp c3RlciwgYWRyICYgMHhmZmZmKTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIHZvaWQgc3RvcmUx NihSZWdpc3RlcklEIHNyYywgSW1wbGljaXRBZGRyZXNzIGFkZHJlc3MpCiAgICAgewogICAgICAg ICBpZiAoYWRkcmVzcy5vZmZzZXQgPj0gLTMyNzY4ICYmIGFkZHJlc3Mub2Zmc2V0IDw9IDMyNzY3 CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGVmZTU0ZmE2ZGViY2EzMTc1ODVkYTA1ZWEyYzI1MzllMmJlZTg0MGEuLjI1NGVhZWJhZWUwODE4 NGQ3NjlhNGE5ZTUxN2Y1ZjhjM2Q2OTI1YTYgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9n CisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMTEtMTMgIENh aW8gTGltYSAgPHRpY2Fpb2xpbWFAZ21haWwuY29tPgorCisgICAgICAgIFN1cHBvcnQgb3IxNihU cnVzdGVkSW1tMzIsIEFic29sdXRlQWRkcmVzcykgaW4gdGhlIE1JUFMgTWFjcm9Bc3NlbWJsZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDEyNgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlY3JlYXNp bmcgdGhlIG51bWJlciBvZiBpdGVyYXRpb25zIG9mIHRlc3QgdG8gYXZvaWQgdGltZW91dCBpbnRv IHNsb3cKKyAgICAgICAgcG9ydHMuCisKKyAgICAgICAgKiBzdHJlc3MvcmVncmVzcy01NzAyMDMz OC5qczoKKwogMjAxOS0xMS0xMyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUuY29t PgogCiAgICAgICAgIFNwbGl0IEFyaXRoUHJvZmlsZSBpbnRvIGEgVW5hcnkgYW5kIGEgQmluYXJ5 IHZlcnNpb24KZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL3JlZ3Jlc3MtNTcwMjAzMzguanMg Yi9KU1Rlc3RzL3N0cmVzcy9yZWdyZXNzLTU3MDIwMzM4LmpzCmluZGV4IDBiMDc0Y2Q1NDE3OTNl YWJkMmQxMDk4YjgzNWZkMzM3MGU5ZjYyZjguLjFjODE2N2U1MjY1ZDRjODExYzBhNTUyMjcyYjI1 OWRhOTRmOWVlODQgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL3JlZ3Jlc3MtNTcwMjAzMzgu anMKKysrIGIvSlNUZXN0cy9zdHJlc3MvcmVncmVzcy01NzAyMDMzOC5qcwpAQCAtMyw3ICszLDcg QEAgbGV0IGNvZGUgPSBgCiBsZXQgeiA9IHt9OwogZnVuY3Rpb24gZm9vKCkgewogICBjb25zdCB4 ID0gdW5kZWZpbmVkICogW107Ci0gIGZvciAobGV0IGogPSAwOyBqIDwgNTAwMDA7IGorKykgewor ICBmb3IgKGxldCBqID0gMDsgaiA8IDEwMDAwOyBqKyspIHsKICAgICBjb25zdCB5ID0geCAqIDA7 CiAgICAgelt7fV0gPSB5OwogICB9Cg== 383552 2019-11-14 03:16:03 -0800 2019-11-14 12:51:10 -0800 Patch bug-204126-20191114081601.patch text/plain 6052 ticaiolima U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 ZWM3YjVjZGIwZTI2NWVmOWJjMGVjNWY4ODE5YzE2OWM1MjQzZmQ5Li42OGM2ZTA1OGZjNWZhMmUx NTU5YjQ5MjgxN2QwNWQ4MDRhNjFkOTZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxOS0xMS0xMyAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+ CisKKyAgICAgICAgU3VwcG9ydCBvcjE2KFRydXN0ZWRJbW0zMiwgQWJzb2x1dGVBZGRyZXNzKSBp biB0aGUgTUlQUyBNYWNyb0Fzc2VtYmxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA0MTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBhZGp1c3RpbmcgdGhlIGltcGxlbWVudGF0aW9uIG9m IGBvcjE2YCBmb3IgTUlQUy4gVGhpcyByZXF1aXJlZAorICAgICAgICB0aGUgYWRkaXRpb24gb2Yg YGxvYWQxNmAgYW5kIGBzdG9yZTE2YCBmb3IgdGhpcyBtYWNybyBhc3NlbWJsZXIgYXMKKyAgICAg ICAgd2VsbC4gVGhpcyBpcyBhbHNvIGZpeGluZyBidWlsZCBpc3N1ZSBvbiBBUk12NyBgb3IxNmAg aW1wbGVtZW50YXRpb24uCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12 Ny5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3OjpvcjE2KToKKyAgICAgICAg KiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNz ZW1ibGVyTUlQUzo6b3IxNik6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyTUlQUzo6bG9h ZDE2KToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJNSVBTOjpzdG9yZTE2KToKKwogMjAx OS0xMS0xMyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUuY29tPgogCiAgICAgICAg IFNwbGl0IEFyaXRoUHJvZmlsZSBpbnRvIGEgVW5hcnkgYW5kIGEgQmluYXJ5IHZlcnNpb24KZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJB Uk12Ny5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFS TXY3LmgKaW5kZXggNGVlYzc2YTYzZTRlMmZhN2FiZjMzMjY5ZmViY2YxZmQ3OWI2M2ZkMS4uMzg4 NTNiZWJkNjg5NmI2MDkxZDMzMGFlYzk0MDY1ZjIxOGUyN2M1ZSAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgKQEAgLTM3 MCwxNiArMzcwLDE2IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIEFSTVRodW1iSW1tZWRpYXRl IGFybUltbSA9IEFSTVRodW1iSW1tZWRpYXRlOjptYWtlRW5jb2RlZEltbShpbW0ubV92YWx1ZSk7 CiAgICAgICAgIGlmIChhcm1JbW0uaXNWYWxpZCgpKSB7Ci0gICAgICAgICAgICBtb3ZlKFRydXN0 ZWRJbW1QdHIoYWRkcmVzcy5tX3B0ciksIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOworICAgICAgICAg ICAgbW92ZShUcnVzdGVkSW1tUHRyKGRlc3QubV9wdHIpLCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsK ICAgICAgICAgICAgIGxvYWQxNihhZGRyZXNzVGVtcFJlZ2lzdGVyLCBkYXRhVGVtcFJlZ2lzdGVy KTsKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLm9ycihkYXRhVGVtcFJlZ2lzdGVyLCBkYXRhVGVt cFJlZ2lzdGVyLCBhcm1JbW0pOwogICAgICAgICAgICAgc3RvcmUxNihkYXRhVGVtcFJlZ2lzdGVy LCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIG1v dmUoVHJ1c3RlZEltbVB0cihhZGRyZXNzLm1fcHRyKSwgYWRkcmVzc1RlbXBSZWdpc3Rlcik7Cisg ICAgICAgICAgICBtb3ZlKFRydXN0ZWRJbW1QdHIoZGVzdC5tX3B0ciksIGFkZHJlc3NUZW1wUmVn aXN0ZXIpOwogICAgICAgICAgICAgbG9hZDE2KGFkZHJlc3NUZW1wUmVnaXN0ZXIsIGRhdGFUZW1w UmVnaXN0ZXIpOwogICAgICAgICAgICAgbW92ZShpbW0sIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOwog ICAgICAgICAgICAgbV9hc3NlbWJsZXIub3JyKGRhdGFUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVn aXN0ZXIsIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOwotICAgICAgICAgICAgbW92ZShUcnVzdGVkSW1t UHRyKGFkZHJlc3MubV9wdHIpLCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIG1v dmUoVHJ1c3RlZEltbVB0cihkZXN0Lm1fcHRyKSwgYWRkcmVzc1RlbXBSZWdpc3Rlcik7CiAgICAg ICAgICAgICBzdG9yZTE2KGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOwog ICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgKaW5kZXggMGUxOTFhMWJiNzQyOGY0YzY2MDA2MWNlOTI3 MzQ0ZWE5ZWUzMzUwNC4uZWJmNzM1YWZlZjY1MmIwMTFmNWEyY2EyZDEzMjA4YTI0YjE2OWZkNSAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxl ck1JUFMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyTUlQUy5oCkBAIC00ODgsOSArNDg4LDkgQEAgcHVibGljOgogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgdWludHB0cl90IGFkciA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pihk ZXN0Lm1fcHRyKTsKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLmx1aShhZGRyVGVtcFJlZ2lzdGVy LCAoYWRyICsgMHg4MDAwKSA+PiAxNik7Ci0gICAgICAgICAgICBtX2Fzc2VtYmxlci5sdyhpbW1U ZW1wUmVnaXN0ZXIsIGFkZHJUZW1wUmVnaXN0ZXIsIGFkciAmIDB4ZmZmZik7Ci0gICAgICAgICAg ICBvcjE2KGltbSwgaW1tVGVtcFJlZ2lzdGVyKTsKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLnN3 KGltbVRlbXBSZWdpc3RlciwgYWRkclRlbXBSZWdpc3RlciwgYWRyICYgMHhmZmZmKTsKKyAgICAg ICAgICAgIG1fYXNzZW1ibGVyLmxodShpbW1UZW1wUmVnaXN0ZXIsIGFkZHJUZW1wUmVnaXN0ZXIs IGFkciAmIDB4ZmZmZik7CisgICAgICAgICAgICBvcjMyKGltbSwgaW1tVGVtcFJlZ2lzdGVyKTsK KyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNoKGltbVRlbXBSZWdpc3RlciwgYWRkclRlbXBSZWdp c3RlciwgYWRyICYgMHhmZmZmKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMTE5MSw2ICsxMTkx LDIyIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGRhdGFMYWJlbDsKICAgICB9CiAKKyAgICB2 b2lkIGxvYWQxNihjb25zdCB2b2lkKiBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCisgICAgewor ICAgICAgICBpZiAobV9maXhlZFdpZHRoKSB7CisgICAgICAgICAgICAvKgorICAgICAgICAgICAg ICAgIGxpICBhZGRyVGVtcCwgYWRkcmVzcworICAgICAgICAgICAgICAgIGxodSAgZGVzdCwgMChh ZGRyVGVtcCkKKyAgICAgICAgICAgICovCisgICAgICAgICAgICBtb3ZlKFRydXN0ZWRJbW1QdHIo YWRkcmVzcyksIGFkZHJUZW1wUmVnaXN0ZXIpOworICAgICAgICAgICAgbV9hc3NlbWJsZXIubGh1 KGRlc3QsIGFkZHJUZW1wUmVnaXN0ZXIsIDApOworICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgdWludHB0cl90IGFkciA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihhZGRyZXNzKTsK KyAgICAgICAgICAgIG1fYXNzZW1ibGVyLmx1aShhZGRyVGVtcFJlZ2lzdGVyLCAoYWRyICsgMHg4 MDAwKSA+PiAxNik7CisgICAgICAgICAgICBtX2Fzc2VtYmxlci5saHUoZGVzdCwgYWRkclRlbXBS ZWdpc3RlciwgYWRyICYgMHhmZmZmKTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIC8qIE5lZWQg dG8gdXNlIHplcm8tZXh0ZW5lZCBsb2FkIGhhbGYtd29yZCBmb3IgbG9hZDE2LiAgKi8KICAgICB2 b2lkIGxvYWQxNihJbXBsaWNpdEFkZHJlc3MgYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQogICAg IHsKQEAgLTEzNTksNiArMTM3NSwyMiBAQCBwdWJsaWM6CiAgICAgICAgIH0KICAgICB9CiAKKyAg ICB2b2lkIHN0b3JlMTYoUmVnaXN0ZXJJRCBzcmMsIGNvbnN0IHZvaWQqIGFkZHJlc3MpCisgICAg eworICAgICAgICBpZiAobV9maXhlZFdpZHRoKSB7CisgICAgICAgICAgICAvKgorICAgICAgICAg ICAgICAgIGxpICBhZGRyVGVtcCwgYWRkcmVzcworICAgICAgICAgICAgICAgIHNoICBzcmMsIDAo YWRkclRlbXApCisgICAgICAgICAgICAqLworICAgICAgICAgICAgbW92ZShUcnVzdGVkSW1tUHRy KGFkZHJlc3MpLCBhZGRyVGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNo KHNyYywgYWRkclRlbXBSZWdpc3RlciwgMCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICB1aW50cHRyX3QgYWRyID0gcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGFkZHJlc3MpOwor ICAgICAgICAgICAgbV9hc3NlbWJsZXIubHVpKGFkZHJUZW1wUmVnaXN0ZXIsIChhZHIgKyAweDgw MDApID4+IDE2KTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNoKHNyYywgYWRkclRlbXBSZWdp c3RlciwgYWRyICYgMHhmZmZmKTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIHZvaWQgc3RvcmUx NihSZWdpc3RlcklEIHNyYywgSW1wbGljaXRBZGRyZXNzIGFkZHJlc3MpCiAgICAgewogICAgICAg ICBpZiAoYWRkcmVzcy5vZmZzZXQgPj0gLTMyNzY4ICYmIGFkZHJlc3Mub2Zmc2V0IDw9IDMyNzY3 CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGVmZTU0ZmE2ZGViY2EzMTc1ODVkYTA1ZWEyYzI1MzllMmJlZTg0MGEuLjI1NGVhZWJhZWUwODE4 NGQ3NjlhNGE5ZTUxN2Y1ZjhjM2Q2OTI1YTYgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9n CisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMTEtMTMgIENh aW8gTGltYSAgPHRpY2Fpb2xpbWFAZ21haWwuY29tPgorCisgICAgICAgIFN1cHBvcnQgb3IxNihU cnVzdGVkSW1tMzIsIEFic29sdXRlQWRkcmVzcykgaW4gdGhlIE1JUFMgTWFjcm9Bc3NlbWJsZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDEyNgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlY3JlYXNp bmcgdGhlIG51bWJlciBvZiBpdGVyYXRpb25zIG9mIHRlc3QgdG8gYXZvaWQgdGltZW91dCBpbnRv IHNsb3cKKyAgICAgICAgcG9ydHMuCisKKyAgICAgICAgKiBzdHJlc3MvcmVncmVzcy01NzAyMDMz OC5qczoKKwogMjAxOS0xMS0xMyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUuY29t PgogCiAgICAgICAgIFNwbGl0IEFyaXRoUHJvZmlsZSBpbnRvIGEgVW5hcnkgYW5kIGEgQmluYXJ5 IHZlcnNpb24KZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL3JlZ3Jlc3MtNTcwMjAzMzguanMg Yi9KU1Rlc3RzL3N0cmVzcy9yZWdyZXNzLTU3MDIwMzM4LmpzCmluZGV4IDBiMDc0Y2Q1NDE3OTNl YWJkMmQxMDk4YjgzNWZkMzM3MGU5ZjYyZjguLmI3ZmJhZGQ2N2QzYWM0M2Q1MTE0ZDkxY2M2Mzg1 NmI1Y2MwNjhjZmQgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL3JlZ3Jlc3MtNTcwMjAzMzgu anMKKysrIGIvSlNUZXN0cy9zdHJlc3MvcmVncmVzcy01NzAyMDMzOC5qcwpAQCAtMTMsNiArMTMs NiBAQCBmb3IgKGxldCBpID0gMDsgaSA8IDM7IGkrKykgewogfQogYDsKIAotZm9yIChsZXQgaT0w OyBpPDEwMDsgaSsrKSB7Citmb3IgKGxldCBpPTA7IGk8MzU7IGkrKykgewogICBydW5TdHJpbmco Y29kZSk7CiB9Cg==