156260 2016-04-05 16:37:11 -0700 MIPS: support Signed cond in branchTest32() 2016-04-08 18:20:32 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Other Linux RESOLVED FIXED P2 Normal --- 1 guijemont webkit-unassigned annulen commit-queue jbriance keith_miller mark.lam msaboff saam oldest_to_newest 1181048 0 guijemont 2016-04-05 16:37:11 -0700 This is needed since r197688 makes use of it. 1181049 1 275714 guijemont 2016-04-05 16:42:36 -0700 Created attachment 275714 Patch A proposed patch addressing the issue 1181051 2 commit-queue 2016-04-05 16:43:42 -0700 Attachment 275714 did not pass style-queue: ERROR: Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h:1521: Extra space before ) [whitespace/parens] [2] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1181054 3 275716 guijemont 2016-04-05 16:45:28 -0700 Created attachment 275716 Patch A proposed patch addressing the issue 1181197 4 275716 jbriance 2016-04-06 00:49:15 -0700 Comment on attachment 275716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=275716&action=review > Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h:1505 > + if ((cond != Signed) && m_fixedWidth) > + m_assembler.nop(); To me, these 2 lines are not needed. > Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h:1515 > + ASSERT_NOT_REACHED(); Very good idea to add this, but please use "RELEASE_ASSERT_NOT_REACHED" instead. > Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h:1532 > + ASSERT_NOT_REACHED(); Ditto. 1181272 5 275777 guijemont 2016-04-06 09:45:35 -0700 Created attachment 275777 Patch New version addressing Julien's remarks. Thanks for the quick review! 1181276 6 jbriance 2016-04-06 09:49:17 -0700 Looks good to me :) 1181277 7 275777 mark.lam 2016-04-06 09:53:49 -0700 Comment on attachment 275777 Patch r=me 1182403 8 275777 commit-queue 2016-04-08 18:20:28 -0700 Comment on attachment 275777 Patch Clearing flags on attachment: 275777 Committed r199261: <http://trac.webkit.org/changeset/199261> 1182404 9 commit-queue 2016-04-08 18:20:32 -0700 All reviewed patches have been landed. Closing bug. 275714 2016-04-05 16:42:36 -0700 2016-04-05 16:45:23 -0700 Patch bug-156260-20160405184236.patch text/plain 3042 guijemont U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl ZDEzYzg5OGE2NWRiZGUyOTU5NGUzOWM1NWQxZGUwNjY3MjZiMzI2Li5mMjM1MzY5NWYzMzhkMDhj Yzg3ZmJjMjRkYTllNThjNzEyYzZlYzk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNi0wNC0wNSAgR3VpbGxhdW1lIEVtb250ICA8Z3VpamVtb250QGlnYWxp YS5jb20+CisKKyAgICAgICAgTUlQUzogc3VwcG9ydCBTaWduZWQgY29uZCBpbiBicmFuY2hUZXN0 MzIoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2 MjYwCisKKyAgICAgICAgVGhpcyBpcyBuZWVkZWQgc2luY2UgcjE5NzY4OCBtYWtlcyB1c2Ugb2Yg aXQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBh c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1i bGVyTUlQUzo6YnJhbmNoVGVzdDMyKToKKwogMjAxNi0wNC0wNSAgU2FhbSBiYXJhdGkgIDxzYmFy YXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBqc2MtbGF5b3V0LXRlc3RzLnlhbWwvanMvc2NyaXB0 LXRlc3RzL3JlZ3Jlc3MtMTQxMDk4LmpzIGZhaWxpbmcgb24gWW9zZW1pdGUgRGVidWcgYWZ0ZXIg cjE5ODk4OQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNy b0Fzc2VtYmxlck1JUFMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9B c3NlbWJsZXJNSVBTLmgKaW5kZXggMjdhMTg0MmYyMWY5ZWVmNjFhZWMwNzU1ZmI0ZGM3M2M1OWY2 YjFlMC4uZTEwM2QzOGFmZjkxOWU2OTM2MDQ4Y2IyMjQ1ODY5MzA5MjcyOGNmNyAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5o CkBAIC0xNDk5LDIwICsxNDk5LDM4IEBAIHB1YmxpYzoKIAogICAgIEp1bXAgYnJhbmNoVGVzdDMy KFJlc3VsdENvbmRpdGlvbiBjb25kLCBSZWdpc3RlcklEIHJlZywgUmVnaXN0ZXJJRCBtYXNrKQog ICAgIHsKLSAgICAgICAgQVNTRVJUKChjb25kID09IFplcm8pIHx8IChjb25kID09IE5vblplcm8p KTsKKyAgICAgICAgQVNTRVJUKChjb25kID09IFplcm8pIHx8IChjb25kID09IE5vblplcm8pIHx8 IChjb25kID09IFNpZ25lZCkpOwogICAgICAgICBtX2Fzc2VtYmxlci5hbmRJbnNuKGNtcFRlbXBS ZWdpc3RlciwgcmVnLCBtYXNrKTsKLSAgICAgICAgaWYgKGNvbmQgPT0gWmVybykKKyAgICAgICAg aWYgKChjb25kICE9IFNpZ25lZCkgJiYgbV9maXhlZFdpZHRoKQorICAgICAgICAgICAgbV9hc3Nl bWJsZXIubm9wKCk7CisgICAgICAgIHN3aXRjaCAoY29uZCkgeworICAgICAgICBjYXNlIFplcm86 CiAgICAgICAgICAgICByZXR1cm4gYnJhbmNoRXF1YWwoY21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVn aXN0ZXJzOjp6ZXJvKTsKLSAgICAgICAgcmV0dXJuIGJyYW5jaE5vdEVxdWFsKGNtcFRlbXBSZWdp c3RlciwgTUlQU1JlZ2lzdGVyczo6emVybyk7CisgICAgICAgIGNhc2UgTm9uWmVybzoKKyAgICAg ICAgICAgIHJldHVybiBicmFuY2hOb3RFcXVhbChjbXBUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3Rl cnM6Onplcm8pOworICAgICAgICBjYXNlIFNpZ25lZDoKKyAgICAgICAgICAgIG1fYXNzZW1ibGVy LnNsdChjbXBUZW1wUmVnaXN0ZXIsIGNtcFRlbXBSZWdpc3RlciwgTUlQU1JlZ2lzdGVyczo6emVy byk7CisgICAgICAgICAgICByZXR1cm4gYnJhbmNoTm90RXF1YWwoY21wVGVtcFJlZ2lzdGVyLCBN SVBTUmVnaXN0ZXJzOjp6ZXJvKTsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOworICAgICAgICB9CiAgICAgfQogCiAgICAgSnVtcCBicmFuY2hUZXN0 MzIoUmVzdWx0Q29uZGl0aW9uIGNvbmQsIFJlZ2lzdGVySUQgcmVnLCBUcnVzdGVkSW1tMzIgbWFz ayA9IFRydXN0ZWRJbW0zMigtMSkpCiAgICAgewotICAgICAgICBBU1NFUlQoKGNvbmQgPT0gWmVy bykgfHwgKGNvbmQgPT0gTm9uWmVybykpOworICAgICAgICBBU1NFUlQoKGNvbmQgPT0gWmVybykg fHwgKGNvbmQgPT0gTm9uWmVybykgfHwgKGNvbmQgPT0gU2lnbmVkICkpOwogICAgICAgICBpZiAo bWFzay5tX3ZhbHVlID09IC0xICYmICFtX2ZpeGVkV2lkdGgpIHsKLSAgICAgICAgICAgIGlmIChj b25kID09IFplcm8pCisgICAgICAgICAgICBzd2l0Y2ggKGNvbmQpIHsKKyAgICAgICAgICAgIGNh c2UgWmVybzoKICAgICAgICAgICAgICAgICByZXR1cm4gYnJhbmNoRXF1YWwocmVnLCBNSVBTUmVn aXN0ZXJzOjp6ZXJvKTsKLSAgICAgICAgICAgIHJldHVybiBicmFuY2hOb3RFcXVhbChyZWcsIE1J UFNSZWdpc3RlcnM6Onplcm8pOworICAgICAgICAgICAgY2FzZSBOb25aZXJvOgorICAgICAgICAg ICAgICAgIHJldHVybiBicmFuY2hOb3RFcXVhbChyZWcsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwor ICAgICAgICAgICAgY2FzZSBTaWduZWQ6CisgICAgICAgICAgICAgICAgbV9hc3NlbWJsZXIuc2x0 KGNtcFRlbXBSZWdpc3RlciwgcmVnLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKKyAgICAgICAgICAg ICAgICByZXR1cm4gYnJhbmNoTm90RXF1YWwoY21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVnaXN0ZXJz Ojp6ZXJvKTsKKyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgbW92ZShtYXNr LCBpbW1UZW1wUmVnaXN0ZXIpOwogICAgICAgICByZXR1cm4gYnJhbmNoVGVzdDMyKGNvbmQsIHJl ZywgaW1tVGVtcFJlZ2lzdGVyKTsK 275716 2016-04-05 16:45:28 -0700 2016-04-06 09:45:30 -0700 Patch bug-156260-20160405184529.patch text/plain 3041 guijemont U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl ZDEzYzg5OGE2NWRiZGUyOTU5NGUzOWM1NWQxZGUwNjY3MjZiMzI2Li5mMjM1MzY5NWYzMzhkMDhj Yzg3ZmJjMjRkYTllNThjNzEyYzZlYzk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNi0wNC0wNSAgR3VpbGxhdW1lIEVtb250ICA8Z3VpamVtb250QGlnYWxp YS5jb20+CisKKyAgICAgICAgTUlQUzogc3VwcG9ydCBTaWduZWQgY29uZCBpbiBicmFuY2hUZXN0 MzIoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2 MjYwCisKKyAgICAgICAgVGhpcyBpcyBuZWVkZWQgc2luY2UgcjE5NzY4OCBtYWtlcyB1c2Ugb2Yg aXQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBh c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1i bGVyTUlQUzo6YnJhbmNoVGVzdDMyKToKKwogMjAxNi0wNC0wNSAgU2FhbSBiYXJhdGkgIDxzYmFy YXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBqc2MtbGF5b3V0LXRlc3RzLnlhbWwvanMvc2NyaXB0 LXRlc3RzL3JlZ3Jlc3MtMTQxMDk4LmpzIGZhaWxpbmcgb24gWW9zZW1pdGUgRGVidWcgYWZ0ZXIg cjE5ODk4OQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNy b0Fzc2VtYmxlck1JUFMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9B c3NlbWJsZXJNSVBTLmgKaW5kZXggMjdhMTg0MmYyMWY5ZWVmNjFhZWMwNzU1ZmI0ZGM3M2M1OWY2 YjFlMC4uYzYwNWUzNzA5NjhiNTZiYWFhZjY2YzU4Y2M4Y2ViNjFmYjZiZTJjMiAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5o CkBAIC0xNDk5LDIwICsxNDk5LDM4IEBAIHB1YmxpYzoKIAogICAgIEp1bXAgYnJhbmNoVGVzdDMy KFJlc3VsdENvbmRpdGlvbiBjb25kLCBSZWdpc3RlcklEIHJlZywgUmVnaXN0ZXJJRCBtYXNrKQog ICAgIHsKLSAgICAgICAgQVNTRVJUKChjb25kID09IFplcm8pIHx8IChjb25kID09IE5vblplcm8p KTsKKyAgICAgICAgQVNTRVJUKChjb25kID09IFplcm8pIHx8IChjb25kID09IE5vblplcm8pIHx8 IChjb25kID09IFNpZ25lZCkpOwogICAgICAgICBtX2Fzc2VtYmxlci5hbmRJbnNuKGNtcFRlbXBS ZWdpc3RlciwgcmVnLCBtYXNrKTsKLSAgICAgICAgaWYgKGNvbmQgPT0gWmVybykKKyAgICAgICAg aWYgKChjb25kICE9IFNpZ25lZCkgJiYgbV9maXhlZFdpZHRoKQorICAgICAgICAgICAgbV9hc3Nl bWJsZXIubm9wKCk7CisgICAgICAgIHN3aXRjaCAoY29uZCkgeworICAgICAgICBjYXNlIFplcm86 CiAgICAgICAgICAgICByZXR1cm4gYnJhbmNoRXF1YWwoY21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVn aXN0ZXJzOjp6ZXJvKTsKLSAgICAgICAgcmV0dXJuIGJyYW5jaE5vdEVxdWFsKGNtcFRlbXBSZWdp c3RlciwgTUlQU1JlZ2lzdGVyczo6emVybyk7CisgICAgICAgIGNhc2UgTm9uWmVybzoKKyAgICAg ICAgICAgIHJldHVybiBicmFuY2hOb3RFcXVhbChjbXBUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3Rl cnM6Onplcm8pOworICAgICAgICBjYXNlIFNpZ25lZDoKKyAgICAgICAgICAgIG1fYXNzZW1ibGVy LnNsdChjbXBUZW1wUmVnaXN0ZXIsIGNtcFRlbXBSZWdpc3RlciwgTUlQU1JlZ2lzdGVyczo6emVy byk7CisgICAgICAgICAgICByZXR1cm4gYnJhbmNoTm90RXF1YWwoY21wVGVtcFJlZ2lzdGVyLCBN SVBTUmVnaXN0ZXJzOjp6ZXJvKTsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOworICAgICAgICB9CiAgICAgfQogCiAgICAgSnVtcCBicmFuY2hUZXN0 MzIoUmVzdWx0Q29uZGl0aW9uIGNvbmQsIFJlZ2lzdGVySUQgcmVnLCBUcnVzdGVkSW1tMzIgbWFz ayA9IFRydXN0ZWRJbW0zMigtMSkpCiAgICAgewotICAgICAgICBBU1NFUlQoKGNvbmQgPT0gWmVy bykgfHwgKGNvbmQgPT0gTm9uWmVybykpOworICAgICAgICBBU1NFUlQoKGNvbmQgPT0gWmVybykg fHwgKGNvbmQgPT0gTm9uWmVybykgfHwgKGNvbmQgPT0gU2lnbmVkKSk7CiAgICAgICAgIGlmICht YXNrLm1fdmFsdWUgPT0gLTEgJiYgIW1fZml4ZWRXaWR0aCkgewotICAgICAgICAgICAgaWYgKGNv bmQgPT0gWmVybykKKyAgICAgICAgICAgIHN3aXRjaCAoY29uZCkgeworICAgICAgICAgICAgY2Fz ZSBaZXJvOgogICAgICAgICAgICAgICAgIHJldHVybiBicmFuY2hFcXVhbChyZWcsIE1JUFNSZWdp c3RlcnM6Onplcm8pOwotICAgICAgICAgICAgcmV0dXJuIGJyYW5jaE5vdEVxdWFsKHJlZywgTUlQ U1JlZ2lzdGVyczo6emVybyk7CisgICAgICAgICAgICBjYXNlIE5vblplcm86CisgICAgICAgICAg ICAgICAgcmV0dXJuIGJyYW5jaE5vdEVxdWFsKHJlZywgTUlQU1JlZ2lzdGVyczo6emVybyk7Cisg ICAgICAgICAgICBjYXNlIFNpZ25lZDoKKyAgICAgICAgICAgICAgICBtX2Fzc2VtYmxlci5zbHQo Y21wVGVtcFJlZ2lzdGVyLCByZWcsIE1JUFNSZWdpc3RlcnM6Onplcm8pOworICAgICAgICAgICAg ICAgIHJldHVybiBicmFuY2hOb3RFcXVhbChjbXBUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3RlcnM6 Onplcm8pOworICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBtb3ZlKG1hc2ss IGltbVRlbXBSZWdpc3Rlcik7CiAgICAgICAgIHJldHVybiBicmFuY2hUZXN0MzIoY29uZCwgcmVn LCBpbW1UZW1wUmVnaXN0ZXIpOwo= 275777 2016-04-06 09:45:35 -0700 2016-04-08 18:20:28 -0700 Patch bug-156260-20160406114536.patch text/plain 2978 guijemont U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl ZDEzYzg5OGE2NWRiZGUyOTU5NGUzOWM1NWQxZGUwNjY3MjZiMzI2Li5mMjM1MzY5NWYzMzhkMDhj Yzg3ZmJjMjRkYTllNThjNzEyYzZlYzk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNi0wNC0wNSAgR3VpbGxhdW1lIEVtb250ICA8Z3VpamVtb250QGlnYWxp YS5jb20+CisKKyAgICAgICAgTUlQUzogc3VwcG9ydCBTaWduZWQgY29uZCBpbiBicmFuY2hUZXN0 MzIoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2 MjYwCisKKyAgICAgICAgVGhpcyBpcyBuZWVkZWQgc2luY2UgcjE5NzY4OCBtYWtlcyB1c2Ugb2Yg aXQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBh c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1i bGVyTUlQUzo6YnJhbmNoVGVzdDMyKToKKwogMjAxNi0wNC0wNSAgU2FhbSBiYXJhdGkgIDxzYmFy YXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBqc2MtbGF5b3V0LXRlc3RzLnlhbWwvanMvc2NyaXB0 LXRlc3RzL3JlZ3Jlc3MtMTQxMDk4LmpzIGZhaWxpbmcgb24gWW9zZW1pdGUgRGVidWcgYWZ0ZXIg cjE5ODk4OQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNy b0Fzc2VtYmxlck1JUFMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9B c3NlbWJsZXJNSVBTLmgKaW5kZXggMjdhMTg0MmYyMWY5ZWVmNjFhZWMwNzU1ZmI0ZGM3M2M1OWY2 YjFlMC4uMWFiYWIyMzcxZTZhODA5NDYxMmY4ZTk5MjE1ZGZjMDFmNjk1ZmQ0MSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5o CkBAIC0xNDk5LDIwICsxNDk5LDM2IEBAIHB1YmxpYzoKIAogICAgIEp1bXAgYnJhbmNoVGVzdDMy KFJlc3VsdENvbmRpdGlvbiBjb25kLCBSZWdpc3RlcklEIHJlZywgUmVnaXN0ZXJJRCBtYXNrKQog ICAgIHsKLSAgICAgICAgQVNTRVJUKChjb25kID09IFplcm8pIHx8IChjb25kID09IE5vblplcm8p KTsKKyAgICAgICAgQVNTRVJUKChjb25kID09IFplcm8pIHx8IChjb25kID09IE5vblplcm8pIHx8 IChjb25kID09IFNpZ25lZCkpOwogICAgICAgICBtX2Fzc2VtYmxlci5hbmRJbnNuKGNtcFRlbXBS ZWdpc3RlciwgcmVnLCBtYXNrKTsKLSAgICAgICAgaWYgKGNvbmQgPT0gWmVybykKKyAgICAgICAg c3dpdGNoIChjb25kKSB7CisgICAgICAgIGNhc2UgWmVybzoKICAgICAgICAgICAgIHJldHVybiBi cmFuY2hFcXVhbChjbXBUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwotICAgICAg ICByZXR1cm4gYnJhbmNoTm90RXF1YWwoY21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVnaXN0ZXJzOjp6 ZXJvKTsKKyAgICAgICAgY2FzZSBOb25aZXJvOgorICAgICAgICAgICAgcmV0dXJuIGJyYW5jaE5v dEVxdWFsKGNtcFRlbXBSZWdpc3RlciwgTUlQU1JlZ2lzdGVyczo6emVybyk7CisgICAgICAgIGNh c2UgU2lnbmVkOgorICAgICAgICAgICAgbV9hc3NlbWJsZXIuc2x0KGNtcFRlbXBSZWdpc3Rlciwg Y21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKKyAgICAgICAgICAgIHJldHVy biBicmFuY2hOb3RFcXVhbChjbXBUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwor ICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIEp1bXAgYnJhbmNoVGVzdDMyKFJlc3VsdENvbmRp dGlvbiBjb25kLCBSZWdpc3RlcklEIHJlZywgVHJ1c3RlZEltbTMyIG1hc2sgPSBUcnVzdGVkSW1t MzIoLTEpKQogICAgIHsKLSAgICAgICAgQVNTRVJUKChjb25kID09IFplcm8pIHx8IChjb25kID09 IE5vblplcm8pKTsKKyAgICAgICAgQVNTRVJUKChjb25kID09IFplcm8pIHx8IChjb25kID09IE5v blplcm8pIHx8IChjb25kID09IFNpZ25lZCkpOwogICAgICAgICBpZiAobWFzay5tX3ZhbHVlID09 IC0xICYmICFtX2ZpeGVkV2lkdGgpIHsKLSAgICAgICAgICAgIGlmIChjb25kID09IFplcm8pCisg ICAgICAgICAgICBzd2l0Y2ggKGNvbmQpIHsKKyAgICAgICAgICAgIGNhc2UgWmVybzoKICAgICAg ICAgICAgICAgICByZXR1cm4gYnJhbmNoRXF1YWwocmVnLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsK LSAgICAgICAgICAgIHJldHVybiBicmFuY2hOb3RFcXVhbChyZWcsIE1JUFNSZWdpc3RlcnM6Onpl cm8pOworICAgICAgICAgICAgY2FzZSBOb25aZXJvOgorICAgICAgICAgICAgICAgIHJldHVybiBi cmFuY2hOb3RFcXVhbChyZWcsIE1JUFNSZWdpc3RlcnM6Onplcm8pOworICAgICAgICAgICAgY2Fz ZSBTaWduZWQ6CisgICAgICAgICAgICAgICAgbV9hc3NlbWJsZXIuc2x0KGNtcFRlbXBSZWdpc3Rl ciwgcmVnLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gYnJh bmNoTm90RXF1YWwoY21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKKyAgICAg ICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNI RUQoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBtb3ZlKG1hc2ssIGltbVRl bXBSZWdpc3Rlcik7CiAgICAgICAgIHJldHVybiBicmFuY2hUZXN0MzIoY29uZCwgcmVnLCBpbW1U ZW1wUmVnaXN0ZXIpOwo=