116552 2013-05-21 09:43:41 -0700 JSC Assertion tests failures on MIPS. 2013-06-05 10:16:27 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 108664 0 kilvadyb webkit-unassigned barraclough benjamin commit-queue fpizlo fu gergely oliver ossy palfia oldest_to_newest 891846 0 kilvadyb 2013-05-21 09:43:41 -0700 Many tests fails with ASSERTION FAILED: (cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero) webkit/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h(1626) 891848 1 ossy 2013-05-21 09:46:06 -0700 ARM traditional had a similar bug: https://bugs.webkit.org/show_bug.cgi?id=116538 891888 2 202450 kilvadyb 2013-05-21 10:43:49 -0700 Created attachment 202450 Fix branchAdd32 functions. 891977 3 kilvadyb 2013-05-21 13:20:38 -0700 mozilla, SunSpider and v8 tests succeeded with this patch. 893021 4 202450 darin 2013-05-23 13:20:34 -0700 Comment on attachment 202450 Fix branchAdd32 functions. View in context: https://bugs.webkit.org/attachment.cgi?id=202450&action=review > Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h:1633 > + // ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); Why leave in this other assertion commented out? Please just delete it. 893738 5 202913 kilvadyb 2013-05-26 04:47:25 -0700 Created attachment 202913 Fix branchAdd32 functions. Wrong comment removed; rebased on r150711. 897223 6 203782 kilvadyb 2013-06-05 03:11:54 -0700 Created attachment 203782 Fix branchAdd32 functions. Rebased on r151202. 897452 7 203782 ggaren 2013-06-05 09:54:34 -0700 Comment on attachment 203782 Fix branchAdd32 functions. r=me 897458 8 203782 commit-queue 2013-06-05 10:16:25 -0700 Comment on attachment 203782 Fix branchAdd32 functions. Clearing flags on attachment: 203782 Committed r151228: <http://trac.webkit.org/changeset/151228> 897459 9 commit-queue 2013-06-05 10:16:27 -0700 All reviewed patches have been landed. Closing bug. 202450 2013-05-21 10:43:49 -0700 2013-05-26 04:47:25 -0700 Fix branchAdd32 functions. add32.diff text/plain 3628 kilvadyb ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDJiOTUzYWUuLjAxMmI0OWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA1LTIxICBCYWxhenMgS2lsdmFk eSAgPGtpbHZhZHliQGhvbWVqaW5uaS5jb20+CisKKyAgICAgICAgSlNDIEFzc2VydGlvbiB0ZXN0 cyBmYWlsdXJlcyBvbiBNSVBTLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE2NTUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRml4IGNvbmRpdGlvbiBoYW5kbGlnIGluIGJyYW5jaEFkZDMyIGltcGxlbWV0 YXRpb25zLgorCisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oOgorICAg ICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlck1JUFM6OmJyYW5jaEFkZDMyKToKKwogMjAxMy0wNS0y MCAgTWFyayBIYWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAgIERp c2FibGUgU3VwZXJSZWdpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oCmluZGV4IDkwNWNiYjEuLjk2YThkNmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMu aApAQCAtMTU0NSw5ICsxNTQ1LDkgQEAgcHVibGljOgogICAgICAgICB9CiAgICAgICAgIGlmIChj b25kID09IFBvc2l0aXZlT3JaZXJvKSB7CiAgICAgICAgICAgICBhZGQzMihzcmMsIGRlc3QpOwot ICAgICAgICAgICAgLy8gQ2hlY2sgaWYgZGVzdCBpcyBuZWdhdGl2ZS4KLSAgICAgICAgICAgIG1f YXNzZW1ibGVyLnNsdChjbXBUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3RlcnM6Onplcm8sIGRlc3Qp OwotICAgICAgICAgICAgcmV0dXJuIGJyYW5jaE5vdEVxdWFsKGNtcFRlbXBSZWdpc3RlciwgTUlQ U1JlZ2lzdGVyczo6emVybyk7CisgICAgICAgICAgICAvLyBDaGVjayBpZiBkZXN0IGlzIG5vdCBu ZWdhdGl2ZS4KKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNsdChjbXBUZW1wUmVnaXN0ZXIsIGRl c3QsIE1JUFNSZWdpc3RlcnM6Onplcm8pOworICAgICAgICAgICAgcmV0dXJuIGJyYW5jaEVxdWFs KGNtcFRlbXBSZWdpc3RlciwgTUlQU1JlZ2lzdGVyczo6emVybyk7CiAgICAgICAgIH0KICAgICAg ICAgaWYgKGNvbmQgPT0gWmVybykgewogICAgICAgICAgICAgYWRkMzIoc3JjLCBkZXN0KTsKQEAg LTE1NjMsNyArMTU2Myw3IEBAIHB1YmxpYzoKIAogICAgIEp1bXAgYnJhbmNoQWRkMzIoUmVzdWx0 Q29uZGl0aW9uIGNvbmQsIFJlZ2lzdGVySUQgb3AxLCBSZWdpc3RlcklEIG9wMiwgUmVnaXN0ZXJJ RCBkZXN0KQogICAgIHsKLSAgICAgICAgQVNTRVJUKChjb25kID09IE92ZXJmbG93KSB8fCAoY29u ZCA9PSBTaWduZWQpIHx8IChjb25kID09IFplcm8pIHx8IChjb25kID09IE5vblplcm8pKTsKKyAg ICAgICAgQVNTRVJUKChjb25kID09IE92ZXJmbG93KSB8fCAoY29uZCA9PSBTaWduZWQpIHx8IChj b25kID09IFBvc2l0aXZlT3JaZXJvKSB8fCAoY29uZCA9PSBaZXJvKSB8fCAoY29uZCA9PSBOb25a ZXJvKSk7CiAgICAgICAgIGlmIChjb25kID09IE92ZXJmbG93KSB7CiAgICAgICAgICAgICAvKgog ICAgICAgICAgICAgICAgIG1vdmUgICAgZGF0YVRlbXAsIG9wMQpAQCAtMTU5Niw2ICsxNTk2LDEy IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNsdChjbXBUZW1wUmVnaXN0ZXIs IGRlc3QsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwogICAgICAgICAgICAgcmV0dXJuIGJyYW5jaE5v dEVxdWFsKGNtcFRlbXBSZWdpc3RlciwgTUlQU1JlZ2lzdGVyczo6emVybyk7CiAgICAgICAgIH0K KyAgICAgICAgaWYgKGNvbmQgPT0gUG9zaXRpdmVPclplcm8pIHsKKyAgICAgICAgICAgIGFkZDMy KG9wMSwgb3AyLCBkZXN0KTsKKyAgICAgICAgICAgIC8vIENoZWNrIGlmIGRlc3QgaXMgbm90IG5l Z2F0aXZlLgorICAgICAgICAgICAgbV9hc3NlbWJsZXIuc2x0KGNtcFRlbXBSZWdpc3RlciwgZGVz dCwgTUlQU1JlZ2lzdGVyczo6emVybyk7CisgICAgICAgICAgICByZXR1cm4gYnJhbmNoRXF1YWwo Y21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKKyAgICAgICAgfQogICAgICAg ICBpZiAoY29uZCA9PSBaZXJvKSB7CiAgICAgICAgICAgICBhZGQzMihvcDEsIG9wMiwgZGVzdCk7 CiAgICAgICAgICAgICByZXR1cm4gYnJhbmNoRXF1YWwoZGVzdCwgTUlQU1JlZ2lzdGVyczo6emVy byk7CkBAIC0xNjIzLDcgKzE2MjksOCBAQCBwdWJsaWM6CiAKICAgICBKdW1wIGJyYW5jaEFkZDMy KFJlc3VsdENvbmRpdGlvbiBjb25kLCBUcnVzdGVkSW1tMzIgaW1tLCBBYnNvbHV0ZUFkZHJlc3Mg ZGVzdCkKICAgICB7Ci0gICAgICAgIEFTU0VSVCgoY29uZCA9PSBPdmVyZmxvdykgfHwgKGNvbmQg PT0gU2lnbmVkKSB8fCAoY29uZCA9PSBaZXJvKSB8fCAoY29uZCA9PSBOb25aZXJvKSk7CisgICAg ICAgIEFTU0VSVCgoY29uZCA9PSBPdmVyZmxvdykgfHwgKGNvbmQgPT0gU2lnbmVkKSB8fCAoY29u ZCA9PSBQb3NpdGl2ZU9yWmVybykgfHwgKGNvbmQgPT0gWmVybykgfHwgKGNvbmQgPT0gTm9uWmVy bykpOworICAgICAgICAvLyBBU1NFUlQoKGNvbmQgPT0gT3ZlcmZsb3cpIHx8IChjb25kID09IFNp Z25lZCkgfHwgKGNvbmQgPT0gWmVybykgfHwgKGNvbmQgPT0gTm9uWmVybykpOwogICAgICAgICBp ZiAoY29uZCA9PSBPdmVyZmxvdykgewogICAgICAgICAgICAgLyoKICAgICAgICAgICAgICAgICBt b3ZlICAgIGRhdGFUZW1wLCBkZXN0CkBAIC0xNjczLDYgKzE2ODAsMTEgQEAgcHVibGljOgogICAg ICAgICAgICAgbV9hc3NlbWJsZXIuc2x0KGNtcFRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3Rl ciwgTUlQU1JlZ2lzdGVyczo6emVybyk7CiAgICAgICAgICAgICByZXR1cm4gYnJhbmNoTm90RXF1 YWwoY21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKICAgICAgICAgfQorICAg ICAgICBpZiAoY29uZCA9PSBQb3NpdGl2ZU9yWmVybykgeworICAgICAgICAgICAgLy8gQ2hlY2sg aWYgZGVzdCBpcyBub3QgbmVnYXRpdmUuCisgICAgICAgICAgICBtX2Fzc2VtYmxlci5zbHQoY21w VGVtcFJlZ2lzdGVyLCBkYXRhVGVtcFJlZ2lzdGVyLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKKyAg ICAgICAgICAgIHJldHVybiBicmFuY2hFcXVhbChjbXBUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3Rl cnM6Onplcm8pOworICAgICAgICB9CiAgICAgICAgIGlmIChjb25kID09IFplcm8pCiAgICAgICAg ICAgICByZXR1cm4gYnJhbmNoRXF1YWwoZGF0YVRlbXBSZWdpc3RlciwgTUlQU1JlZ2lzdGVyczo6 emVybyk7CiAgICAgICAgIGlmIChjb25kID09IE5vblplcm8pCg== 202913 2013-05-26 04:47:25 -0700 2013-06-05 03:11:54 -0700 Fix branchAdd32 functions. add32.diff text/plain 3533 kilvadyb ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDUzN2E1YzkuLjkxZGYwOGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA1LTI2ICBCYWxhenMgS2lsdmFk eSAgPGtpbHZhZHliQGhvbWVqaW5uaS5jb20+CisKKyAgICAgICAgSlNDIEFzc2VydGlvbiB0ZXN0 cyBmYWlsdXJlcyBvbiBNSVBTLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE2NTUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRml4IGNvbmRpdGlvbiBoYW5kbGlnIGluIGJyYW5jaEFkZDMyIGltcGxlbWV0 YXRpb25zLgorCisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oOgorICAg ICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlck1JUFM6OmJyYW5jaEFkZDMyKToKKwogMjAxMy0wNS0y NSAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlIGJyb2tlICgt Ml4zMS8tMSl8MCBpbiB0aGUgREZHCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAppbmRleCA5MDVjYmIxLi4yOThhMjVjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQ Uy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJN SVBTLmgKQEAgLTE1NDUsOSArMTU0NSw5IEBAIHB1YmxpYzoKICAgICAgICAgfQogICAgICAgICBp ZiAoY29uZCA9PSBQb3NpdGl2ZU9yWmVybykgewogICAgICAgICAgICAgYWRkMzIoc3JjLCBkZXN0 KTsKLSAgICAgICAgICAgIC8vIENoZWNrIGlmIGRlc3QgaXMgbmVnYXRpdmUuCi0gICAgICAgICAg ICBtX2Fzc2VtYmxlci5zbHQoY21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvLCBk ZXN0KTsKLSAgICAgICAgICAgIHJldHVybiBicmFuY2hOb3RFcXVhbChjbXBUZW1wUmVnaXN0ZXIs IE1JUFNSZWdpc3RlcnM6Onplcm8pOworICAgICAgICAgICAgLy8gQ2hlY2sgaWYgZGVzdCBpcyBu b3QgbmVnYXRpdmUuCisgICAgICAgICAgICBtX2Fzc2VtYmxlci5zbHQoY21wVGVtcFJlZ2lzdGVy LCBkZXN0LCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKKyAgICAgICAgICAgIHJldHVybiBicmFuY2hF cXVhbChjbXBUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwogICAgICAgICB9CiAg ICAgICAgIGlmIChjb25kID09IFplcm8pIHsKICAgICAgICAgICAgIGFkZDMyKHNyYywgZGVzdCk7 CkBAIC0xNTYzLDcgKzE1NjMsNyBAQCBwdWJsaWM6CiAKICAgICBKdW1wIGJyYW5jaEFkZDMyKFJl c3VsdENvbmRpdGlvbiBjb25kLCBSZWdpc3RlcklEIG9wMSwgUmVnaXN0ZXJJRCBvcDIsIFJlZ2lz dGVySUQgZGVzdCkKICAgICB7Ci0gICAgICAgIEFTU0VSVCgoY29uZCA9PSBPdmVyZmxvdykgfHwg KGNvbmQgPT0gU2lnbmVkKSB8fCAoY29uZCA9PSBaZXJvKSB8fCAoY29uZCA9PSBOb25aZXJvKSk7 CisgICAgICAgIEFTU0VSVCgoY29uZCA9PSBPdmVyZmxvdykgfHwgKGNvbmQgPT0gU2lnbmVkKSB8 fCAoY29uZCA9PSBQb3NpdGl2ZU9yWmVybykgfHwgKGNvbmQgPT0gWmVybykgfHwgKGNvbmQgPT0g Tm9uWmVybykpOwogICAgICAgICBpZiAoY29uZCA9PSBPdmVyZmxvdykgewogICAgICAgICAgICAg LyoKICAgICAgICAgICAgICAgICBtb3ZlICAgIGRhdGFUZW1wLCBvcDEKQEAgLTE1OTYsNiArMTU5 NiwxMiBAQCBwdWJsaWM6CiAgICAgICAgICAgICBtX2Fzc2VtYmxlci5zbHQoY21wVGVtcFJlZ2lz dGVyLCBkZXN0LCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKICAgICAgICAgICAgIHJldHVybiBicmFu Y2hOb3RFcXVhbChjbXBUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwogICAgICAg ICB9CisgICAgICAgIGlmIChjb25kID09IFBvc2l0aXZlT3JaZXJvKSB7CisgICAgICAgICAgICBh ZGQzMihvcDEsIG9wMiwgZGVzdCk7CisgICAgICAgICAgICAvLyBDaGVjayBpZiBkZXN0IGlzIG5v dCBuZWdhdGl2ZS4KKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNsdChjbXBUZW1wUmVnaXN0ZXIs IGRlc3QsIE1JUFNSZWdpc3RlcnM6Onplcm8pOworICAgICAgICAgICAgcmV0dXJuIGJyYW5jaEVx dWFsKGNtcFRlbXBSZWdpc3RlciwgTUlQU1JlZ2lzdGVyczo6emVybyk7CisgICAgICAgIH0KICAg ICAgICAgaWYgKGNvbmQgPT0gWmVybykgewogICAgICAgICAgICAgYWRkMzIob3AxLCBvcDIsIGRl c3QpOwogICAgICAgICAgICAgcmV0dXJuIGJyYW5jaEVxdWFsKGRlc3QsIE1JUFNSZWdpc3RlcnM6 Onplcm8pOwpAQCAtMTYyMyw3ICsxNjI5LDcgQEAgcHVibGljOgogCiAgICAgSnVtcCBicmFuY2hB ZGQzMihSZXN1bHRDb25kaXRpb24gY29uZCwgVHJ1c3RlZEltbTMyIGltbSwgQWJzb2x1dGVBZGRy ZXNzIGRlc3QpCiAgICAgewotICAgICAgICBBU1NFUlQoKGNvbmQgPT0gT3ZlcmZsb3cpIHx8IChj b25kID09IFNpZ25lZCkgfHwgKGNvbmQgPT0gWmVybykgfHwgKGNvbmQgPT0gTm9uWmVybykpOwor ICAgICAgICBBU1NFUlQoKGNvbmQgPT0gT3ZlcmZsb3cpIHx8IChjb25kID09IFNpZ25lZCkgfHwg KGNvbmQgPT0gUG9zaXRpdmVPclplcm8pIHx8IChjb25kID09IFplcm8pIHx8IChjb25kID09IE5v blplcm8pKTsKICAgICAgICAgaWYgKGNvbmQgPT0gT3ZlcmZsb3cpIHsKICAgICAgICAgICAgIC8q CiAgICAgICAgICAgICAgICAgbW92ZSAgICBkYXRhVGVtcCwgZGVzdApAQCAtMTY3Myw2ICsxNjc5 LDExIEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNsdChjbXBUZW1wUmVnaXN0 ZXIsIGRhdGFUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwogICAgICAgICAgICAg cmV0dXJuIGJyYW5jaE5vdEVxdWFsKGNtcFRlbXBSZWdpc3RlciwgTUlQU1JlZ2lzdGVyczo6emVy byk7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKGNvbmQgPT0gUG9zaXRpdmVPclplcm8pIHsKKyAg ICAgICAgICAgIC8vIENoZWNrIGlmIGRlc3QgaXMgbm90IG5lZ2F0aXZlLgorICAgICAgICAgICAg bV9hc3NlbWJsZXIuc2x0KGNtcFRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3RlciwgTUlQU1Jl Z2lzdGVyczo6emVybyk7CisgICAgICAgICAgICByZXR1cm4gYnJhbmNoRXF1YWwoY21wVGVtcFJl Z2lzdGVyLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKKyAgICAgICAgfQogICAgICAgICBpZiAoY29u ZCA9PSBaZXJvKQogICAgICAgICAgICAgcmV0dXJuIGJyYW5jaEVxdWFsKGRhdGFUZW1wUmVnaXN0 ZXIsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwogICAgICAgICBpZiAoY29uZCA9PSBOb25aZXJvKQo= 203782 2013-06-05 03:11:54 -0700 2013-06-05 10:16:25 -0700 Fix branchAdd32 functions. add32.diff text/plain 3575 kilvadyb ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDA5ZGRmOTEuLjg5MDg1ODIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA2LTA1ICBCYWxhenMgS2lsdmFk eSAgPGtpbHZhZHliQGhvbWVqaW5uaS5jb20+CisKKyAgICAgICAgSlNDIEFzc2VydGlvbiB0ZXN0 cyBmYWlsdXJlcyBvbiBNSVBTLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE2NTUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRml4IGNvbmRpdGlvbiBoYW5kbGlnIGluIGJyYW5jaEFkZDMyIGltcGxlbWV0 YXRpb25zLgorCisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oOgorICAg ICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlck1JUFM6OmJyYW5jaEFkZDMyKToKKwogMjAxMy0wNi0w NCAgSnVsaWVuIEJyaWFuY2VhdSAgPGpicmlhbmNlYXVAbmRzLmNvbT4KIAogICAgICAgICBbc2g0 XSBBZGQgZmxvYXRpbmcgcG9pbnQgYWJzb2x1dGUgZnVuY3Rpb24gc3VwcG9ydCBpbiBiYXNlbGlu ZSBKSVQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyTUlQUy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fz c2VtYmxlck1JUFMuaAppbmRleCA5MDVjYmIxLi4yOThhMjVjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgKQEAgLTE1NDUs OSArMTU0NSw5IEBAIHB1YmxpYzoKICAgICAgICAgfQogICAgICAgICBpZiAoY29uZCA9PSBQb3Np dGl2ZU9yWmVybykgewogICAgICAgICAgICAgYWRkMzIoc3JjLCBkZXN0KTsKLSAgICAgICAgICAg IC8vIENoZWNrIGlmIGRlc3QgaXMgbmVnYXRpdmUuCi0gICAgICAgICAgICBtX2Fzc2VtYmxlci5z bHQoY21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVnaXN0ZXJzOjp6ZXJvLCBkZXN0KTsKLSAgICAgICAg ICAgIHJldHVybiBicmFuY2hOb3RFcXVhbChjbXBUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3RlcnM6 Onplcm8pOworICAgICAgICAgICAgLy8gQ2hlY2sgaWYgZGVzdCBpcyBub3QgbmVnYXRpdmUuCisg ICAgICAgICAgICBtX2Fzc2VtYmxlci5zbHQoY21wVGVtcFJlZ2lzdGVyLCBkZXN0LCBNSVBTUmVn aXN0ZXJzOjp6ZXJvKTsKKyAgICAgICAgICAgIHJldHVybiBicmFuY2hFcXVhbChjbXBUZW1wUmVn aXN0ZXIsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwogICAgICAgICB9CiAgICAgICAgIGlmIChjb25k ID09IFplcm8pIHsKICAgICAgICAgICAgIGFkZDMyKHNyYywgZGVzdCk7CkBAIC0xNTYzLDcgKzE1 NjMsNyBAQCBwdWJsaWM6CiAKICAgICBKdW1wIGJyYW5jaEFkZDMyKFJlc3VsdENvbmRpdGlvbiBj b25kLCBSZWdpc3RlcklEIG9wMSwgUmVnaXN0ZXJJRCBvcDIsIFJlZ2lzdGVySUQgZGVzdCkKICAg ICB7Ci0gICAgICAgIEFTU0VSVCgoY29uZCA9PSBPdmVyZmxvdykgfHwgKGNvbmQgPT0gU2lnbmVk KSB8fCAoY29uZCA9PSBaZXJvKSB8fCAoY29uZCA9PSBOb25aZXJvKSk7CisgICAgICAgIEFTU0VS VCgoY29uZCA9PSBPdmVyZmxvdykgfHwgKGNvbmQgPT0gU2lnbmVkKSB8fCAoY29uZCA9PSBQb3Np dGl2ZU9yWmVybykgfHwgKGNvbmQgPT0gWmVybykgfHwgKGNvbmQgPT0gTm9uWmVybykpOwogICAg ICAgICBpZiAoY29uZCA9PSBPdmVyZmxvdykgewogICAgICAgICAgICAgLyoKICAgICAgICAgICAg ICAgICBtb3ZlICAgIGRhdGFUZW1wLCBvcDEKQEAgLTE1OTYsNiArMTU5NiwxMiBAQCBwdWJsaWM6 CiAgICAgICAgICAgICBtX2Fzc2VtYmxlci5zbHQoY21wVGVtcFJlZ2lzdGVyLCBkZXN0LCBNSVBT UmVnaXN0ZXJzOjp6ZXJvKTsKICAgICAgICAgICAgIHJldHVybiBicmFuY2hOb3RFcXVhbChjbXBU ZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwogICAgICAgICB9CisgICAgICAgIGlm IChjb25kID09IFBvc2l0aXZlT3JaZXJvKSB7CisgICAgICAgICAgICBhZGQzMihvcDEsIG9wMiwg ZGVzdCk7CisgICAgICAgICAgICAvLyBDaGVjayBpZiBkZXN0IGlzIG5vdCBuZWdhdGl2ZS4KKyAg ICAgICAgICAgIG1fYXNzZW1ibGVyLnNsdChjbXBUZW1wUmVnaXN0ZXIsIGRlc3QsIE1JUFNSZWdp c3RlcnM6Onplcm8pOworICAgICAgICAgICAgcmV0dXJuIGJyYW5jaEVxdWFsKGNtcFRlbXBSZWdp c3RlciwgTUlQU1JlZ2lzdGVyczo6emVybyk7CisgICAgICAgIH0KICAgICAgICAgaWYgKGNvbmQg PT0gWmVybykgewogICAgICAgICAgICAgYWRkMzIob3AxLCBvcDIsIGRlc3QpOwogICAgICAgICAg ICAgcmV0dXJuIGJyYW5jaEVxdWFsKGRlc3QsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwpAQCAtMTYy Myw3ICsxNjI5LDcgQEAgcHVibGljOgogCiAgICAgSnVtcCBicmFuY2hBZGQzMihSZXN1bHRDb25k aXRpb24gY29uZCwgVHJ1c3RlZEltbTMyIGltbSwgQWJzb2x1dGVBZGRyZXNzIGRlc3QpCiAgICAg ewotICAgICAgICBBU1NFUlQoKGNvbmQgPT0gT3ZlcmZsb3cpIHx8IChjb25kID09IFNpZ25lZCkg fHwgKGNvbmQgPT0gWmVybykgfHwgKGNvbmQgPT0gTm9uWmVybykpOworICAgICAgICBBU1NFUlQo KGNvbmQgPT0gT3ZlcmZsb3cpIHx8IChjb25kID09IFNpZ25lZCkgfHwgKGNvbmQgPT0gUG9zaXRp dmVPclplcm8pIHx8IChjb25kID09IFplcm8pIHx8IChjb25kID09IE5vblplcm8pKTsKICAgICAg ICAgaWYgKGNvbmQgPT0gT3ZlcmZsb3cpIHsKICAgICAgICAgICAgIC8qCiAgICAgICAgICAgICAg ICAgbW92ZSAgICBkYXRhVGVtcCwgZGVzdApAQCAtMTY3Myw2ICsxNjc5LDExIEBAIHB1YmxpYzoK ICAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNsdChjbXBUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVn aXN0ZXIsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwogICAgICAgICAgICAgcmV0dXJuIGJyYW5jaE5v dEVxdWFsKGNtcFRlbXBSZWdpc3RlciwgTUlQU1JlZ2lzdGVyczo6emVybyk7CiAgICAgICAgIH0K KyAgICAgICAgaWYgKGNvbmQgPT0gUG9zaXRpdmVPclplcm8pIHsKKyAgICAgICAgICAgIC8vIENo ZWNrIGlmIGRlc3QgaXMgbm90IG5lZ2F0aXZlLgorICAgICAgICAgICAgbV9hc3NlbWJsZXIuc2x0 KGNtcFRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdpc3RlciwgTUlQU1JlZ2lzdGVyczo6emVybyk7 CisgICAgICAgICAgICByZXR1cm4gYnJhbmNoRXF1YWwoY21wVGVtcFJlZ2lzdGVyLCBNSVBTUmVn aXN0ZXJzOjp6ZXJvKTsKKyAgICAgICAgfQogICAgICAgICBpZiAoY29uZCA9PSBaZXJvKQogICAg ICAgICAgICAgcmV0dXJuIGJyYW5jaEVxdWFsKGRhdGFUZW1wUmVnaXN0ZXIsIE1JUFNSZWdpc3Rl cnM6Onplcm8pOwogICAgICAgICBpZiAoY29uZCA9PSBOb25aZXJvKQo=