230582 2021-09-21 16:11:01 -0700 [JSC] CompareStrictEq is omitting String check incorrectly 2022-08-16 23:13:10 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff msalgado-cedillo618 saam tzagallo webkit-bug-importer oldest_to_newest 1795838 0 ysuzuki 2021-09-21 16:11:01 -0700 [JSC] CompareStrictEq is omitting String check incorrectly 1795839 1 438879 ysuzuki 2021-09-21 16:14:04 -0700 Created attachment 438879 Patch 1795840 2 ysuzuki 2021-09-21 16:14:07 -0700 <rdar://problem/83237121> 1795874 3 438879 mark.lam 2021-09-21 17:25:11 -0700 Comment on attachment 438879 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438879&action=review r=me > Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp:383 > JITCompiler::JumpList trueCase; Not due to your patch, but the comment above is incorrect: `if (left == true) {` ==> `if (left == right) {` 1795897 4 438879 ysuzuki 2021-09-21 18:13:03 -0700 Comment on attachment 438879 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438879&action=review >> Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp:383 >> JITCompiler::JumpList trueCase; > > Not due to your patch, but the comment above is incorrect: `if (left == true) {` ==> `if (left == right) {` Thanks, fixed. 1795898 5 ysuzuki 2021-09-21 18:14:14 -0700 Committed r282857 (241988@main): <https://commits.webkit.org/241988@main> 438879 2021-09-21 16:14:04 -0700 2021-09-21 17:25:11 -0700 Patch bug-230582-20210921161404.patch text/plain 13135 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YjNjOThhMWZjZWQ2NTViMDExYTE1MWI4M2Y5NjZiNzcxZjhjYzVhLi5mYTkyMzk1MTIxOWI1MzRm YTRjMjg1MWZkMmMxZDM4MzliYjM0YTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAyMS0wOS0yMSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIENvbXBhcmVTdHJpY3RFcSBpcyBvbWl0dGluZyBTdHJpbmcgY2hl Y2sgaW5jb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzMDU4MgorICAgICAgICByZGFyOi8vODMyMzcxMjEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAxLiBBZGQgbGVmdCBhbmQgcmlnaHQgcHJl Zml4ZXMgdG8gbmVpdGhlckRvdWJsZU5vckhlYXBCaWdJbnRDaGlsZCBhbmQgbm90RG91YmxlQ2hp bGQgZWRnZXMgc2luY2UKKyAgICAgICAgICAgcmVnaXN0ZXJzIGFyZSBuYW1lZCB3aXRoIGxlZnQg YW5kIHJpZ2h0LiBXaXRob3V0IHRoaXMgcHJlZml4LCBpdCBpcyBoYXJkIHRvIGZvbGxvdyBpbiB0 aGUgY29kZS4KKyAgICAgICAgMi4gUmVtb3ZlIGxlZnRHUFIgYW5kIHJpZ2h0R1BSIGFuZCB1c2Ug bGVmdFJlZ3MucGF5bG9hZEdQUigpIGFuZCByaWdodFJlZ3MucGF5bG9hZEdQUigpIHRvIGF2b2lk CisgICAgICAgICAgIGhhdmluZyBkaWZmZXJlbnQgdmFyaWFibGVzIHBvaW50aW5nIHRvIHRoZSBz YW1lIHJlZ2lzdGVycy4KKyAgICAgICAgMy4gREZHIG5lZWRzVHlwZUNoZWNrIGlzIGRvbmUgd2l0 aCB3cm9uZyB0eXBlIGZpbHRlcnMuIEFzIGEgcmVzdWx0LCBuZWNlc3NhcnkgY2hlY2tzIGFyZSBv bWl0dGVkLgorICAgICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIHRoYXQuIEZUTCBkb2VzIG5vdCBo YXZlIHRoZSBzYW1lIHByb2JsZW0uCisKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQ2 NC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVOZWl0aGVy RG91YmxlTm9ySGVhcEJpZ0ludFRvTm90RG91YmxlU3RyaWN0RXF1YWxpdHkpOgorICAgICAgICAq IGZ0bC9GVExMb3dlckRGR1RvQjMuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJE RkdUb0IzOjpjb21waWxlQ29tcGFyZVN0cmljdEVxKToKKwogMjAyMS0wOS0yMSAgTWFyayBMYW0g IDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVwbGFjZSBhIGZldyBBU1NFUlRzIHdp dGggc3RhdGljX2Fzc2VydHMgaW4gdGhlIEFSTTY0IE1hY3JvQXNzZW1ibGVycy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCmluZGV4IDI1 NjliMjk5YTExZmU0ZmI2ZjM3MzY2OTg5NDY3ZGU0OGIwZWI3MjguLjQ1MzdiMjdiMjRhOGQwYTdh MDQxMzQ2Y2NlZGZhZWFiY2VmMzEyMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcApAQCAtMzM2LDEzICszMzYsMTMgQEAgdm9pZCBT cGVjdWxhdGl2ZUpJVDo6bm9uU3BlY3VsYXRpdmVQZWVwaG9sZUJyYW5jaE51bGxPclVuZGVmaW5l ZChFZGdlIG9wZXJhbmQsIE4KICAgICB9CiB9CiAKLXZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBp bGVOZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludFRvTm90RG91YmxlU3RyaWN0RXF1YWxpdHkoTm9k ZSogbm9kZSwgRWRnZSBuZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludENoaWxkLCBFZGdlIG5vdERv dWJsZUNoaWxkKQordm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZU5laXRoZXJEb3VibGVOb3JI ZWFwQmlnSW50VG9Ob3REb3VibGVTdHJpY3RFcXVhbGl0eShOb2RlKiBub2RlLCBFZGdlIGxlZnRO ZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludENoaWxkLCBFZGdlIHJpZ2h0Tm90RG91YmxlQ2hpbGQp CiB7Ci0gICAgQVNTRVJUKG5laXRoZXJEb3VibGVOb3JIZWFwQmlnSW50Q2hpbGQudXNlS2luZCgp ID09IE5laXRoZXJEb3VibGVOb3JIZWFwQmlnSW50VXNlKTsKLSAgICBBU1NFUlQobm90RG91Ymxl Q2hpbGQudXNlS2luZCgpID09IE5vdERvdWJsZVVzZSk7CisgICAgQVNTRVJUKGxlZnROZWl0aGVy RG91YmxlTm9ySGVhcEJpZ0ludENoaWxkLnVzZUtpbmQoKSA9PSBOZWl0aGVyRG91YmxlTm9ySGVh cEJpZ0ludFVzZSk7CisgICAgQVNTRVJUKHJpZ2h0Tm90RG91YmxlQ2hpbGQudXNlS2luZCgpID09 IE5vdERvdWJsZVVzZSk7CiAKLSAgICBKU1ZhbHVlT3BlcmFuZCBsZWZ0KHRoaXMsIG5laXRoZXJE b3VibGVOb3JIZWFwQmlnSW50Q2hpbGQsIE1hbnVhbE9wZXJhbmRTcGVjdWxhdGlvbik7Ci0gICAg SlNWYWx1ZU9wZXJhbmQgcmlnaHQodGhpcywgbm90RG91YmxlQ2hpbGQsIE1hbnVhbE9wZXJhbmRT cGVjdWxhdGlvbik7CisgICAgSlNWYWx1ZU9wZXJhbmQgbGVmdCh0aGlzLCBsZWZ0TmVpdGhlckRv dWJsZU5vckhlYXBCaWdJbnRDaGlsZCwgTWFudWFsT3BlcmFuZFNwZWN1bGF0aW9uKTsKKyAgICBK U1ZhbHVlT3BlcmFuZCByaWdodCh0aGlzLCByaWdodE5vdERvdWJsZUNoaWxkLCBNYW51YWxPcGVy YW5kU3BlY3VsYXRpb24pOwogCiAgICAgR1BSVGVtcG9yYXJ5IHRlbXAodGhpcyk7CiAgICAgR1BS VGVtcG9yYXJ5IGxlZnRUZW1wKHRoaXMpOwpAQCAtMzUyLDggKzM1Miw2IEBAIHZvaWQgU3BlY3Vs YXRpdmVKSVQ6OmNvbXBpbGVOZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludFRvTm90RG91YmxlU3Ry aWN0RXF1YWxpdHkoCiAgICAgSlNWYWx1ZVJlZ3MgbGVmdFJlZ3MgPSBsZWZ0LmpzVmFsdWVSZWdz KCk7CiAgICAgSlNWYWx1ZVJlZ3MgcmlnaHRSZWdzID0gcmlnaHQuanNWYWx1ZVJlZ3MoKTsKIAot ICAgIEdQUlJlZyBsZWZ0R1BSID0gbGVmdFJlZ3MucGF5bG9hZEdQUigpOwotICAgIEdQUlJlZyBy aWdodEdQUiA9IHJpZ2h0UmVncy5wYXlsb2FkR1BSKCk7CiAgICAgR1BSUmVnIHRlbXBHUFIgPSB0 ZW1wLmdwcigpOwogICAgIEdQUlJlZyBsZWZ0VGVtcEdQUiA9IGxlZnRUZW1wLmdwcigpOwogICAg IEdQUlJlZyByaWdodFRlbXBHUFIgPSByaWdodFRlbXAuZ3ByKCk7CkBAIC0zODUsNDQgKzM4Myw0 MCBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlTmVpdGhlckRvdWJsZU5vckhlYXBCaWdJ bnRUb05vdERvdWJsZVN0cmljdEVxdWFsaXR5KAogICAgIEpJVENvbXBpbGVyOjpKdW1wTGlzdCB0 cnVlQ2FzZTsKICAgICBKSVRDb21waWxlcjo6SnVtcExpc3QgZmFsc2VDYXNlOwogCi0gICAgSklU Q29tcGlsZXI6Okp1bXAgbm90RXF1YWwgPSBtX2ppdC5icmFuY2g2NChKSVRDb21waWxlcjo6Tm90 RXF1YWwsIGxlZnRHUFIsIHJpZ2h0R1BSKTsKKyAgICBKSVRDb21waWxlcjo6SnVtcCBub3RFcXVh bCA9IG1faml0LmJyYW5jaDY0KEpJVENvbXBpbGVyOjpOb3RFcXVhbCwgbGVmdFJlZ3MucGF5bG9h ZEdQUigpLCByaWdodFJlZ3MucGF5bG9hZEdQUigpKTsKICAgICAvLyBXZSBjYW5ub3QgdXNlIHNw ZWN1bGF0ZU5laXRoZXJEb3VibGVOb3JIZWFwQmlnSW50IGhlcmUsIGJlY2F1c2UgaXQgdXBkYXRl cyB0aGUgaW50ZXJwcmV0ZXIgc3RhdGUsIGFuZCB3ZSBjYW4gc2tpcCBvdmVyIGl0LgogICAgIC8v IFNvIHdlIHdvdWxkIGFsd2F5cyBza2lwIHRoZSBzcGVjdWxhdGVOb3REb3VibGUgdGhhdCBmb2xs b3dzLgotICAgIGlmIChuZWVkc1R5cGVDaGVjayhuZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludENo aWxkLCB+U3BlY0Z1bGxEb3VibGUpKSB7Ci0gICAgICAgIGlmIChuZWVkc1R5cGVDaGVjayhuZWl0 aGVyRG91YmxlTm9ySGVhcEJpZ0ludENoaWxkLCB+U3BlY0ludDMyT25seSkpCisgICAgaWYgKG5l ZWRzVHlwZUNoZWNrKGxlZnROZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludENoaWxkLCB+U3BlY0Z1 bGxEb3VibGUpKSB7CisgICAgICAgIGlmIChuZWVkc1R5cGVDaGVjayhsZWZ0TmVpdGhlckRvdWJs ZU5vckhlYXBCaWdJbnRDaGlsZCwgflNwZWNJbnQzMk9ubHkpKQogICAgICAgICAgICAgdHJ1ZUNh c2UuYXBwZW5kKG1faml0LmJyYW5jaElmSW50MzIobGVmdFJlZ3MpKTsKLSAgICAgICAgc3BlY3Vs YXRpb25DaGVjayhCYWRUeXBlLCBsZWZ0UmVncywgbmVpdGhlckRvdWJsZU5vckhlYXBCaWdJbnRD aGlsZC5ub2RlKCksIG1faml0LmJyYW5jaElmTnVtYmVyKGxlZnRSZWdzLCB0ZW1wR1BSKSk7Cisg ICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soQmFkVHlwZSwgbGVmdFJlZ3MsIGxlZnROZWl0aGVyRG91 YmxlTm9ySGVhcEJpZ0ludENoaWxkLm5vZGUoKSwgbV9qaXQuYnJhbmNoSWZOdW1iZXIobGVmdFJl Z3MsIHRlbXBHUFIpKTsKICAgICB9Ci0gICAgaWYgKG5lZWRzVHlwZUNoZWNrKG5laXRoZXJEb3Vi bGVOb3JIZWFwQmlnSW50Q2hpbGQsIH5TcGVjSGVhcEJpZ0ludCkpIHsKLSAgICAgICAgaWYgKG5l ZWRzVHlwZUNoZWNrKG5laXRoZXJEb3VibGVOb3JIZWFwQmlnSW50Q2hpbGQsIFNwZWNDZWxsKSkK KyAgICBpZiAobmVlZHNUeXBlQ2hlY2sobGVmdE5laXRoZXJEb3VibGVOb3JIZWFwQmlnSW50Q2hp bGQsIH5TcGVjSGVhcEJpZ0ludCkpIHsKKyAgICAgICAgaWYgKG5lZWRzVHlwZUNoZWNrKGxlZnRO ZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludENoaWxkLCBTcGVjQ2VsbCkpCiAgICAgICAgICAgICB0 cnVlQ2FzZS5hcHBlbmQobV9qaXQuYnJhbmNoSWZOb3RDZWxsKGxlZnRSZWdzKSk7Ci0gICAgICAg IHNwZWN1bGF0aW9uQ2hlY2soQmFkVHlwZSwgbGVmdFJlZ3MsIG5laXRoZXJEb3VibGVOb3JIZWFw QmlnSW50Q2hpbGQubm9kZSgpLCBtX2ppdC5icmFuY2hJZkhlYXBCaWdJbnQobGVmdEdQUikpOwor ICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKEJhZFR5cGUsIGxlZnRSZWdzLCBsZWZ0TmVpdGhlckRv dWJsZU5vckhlYXBCaWdJbnRDaGlsZC5ub2RlKCksIG1faml0LmJyYW5jaElmSGVhcEJpZ0ludChs ZWZ0UmVncy5wYXlsb2FkR1BSKCkpKTsKICAgICB9CiAgICAgdHJ1ZUNhc2UuYXBwZW5kKG1faml0 Lmp1bXAoKSk7CiAgICAgbm90RXF1YWwubGluaygmbV9qaXQpOwogCi0gICAgc3BlY3VsYXRlTm90 RG91YmxlKG5vdERvdWJsZUNoaWxkLCByaWdodFJlZ3MsIHRlbXBHUFIpOwotICAgIHNwZWN1bGF0 ZU5vdERvdWJsZShuZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludENoaWxkLCBsZWZ0UmVncywgdGVt cEdQUik7CisgICAgc3BlY3VsYXRlTm90RG91YmxlKHJpZ2h0Tm90RG91YmxlQ2hpbGQsIHJpZ2h0 UmVncywgdGVtcEdQUik7CisgICAgc3BlY3VsYXRlTm90RG91YmxlKGxlZnROZWl0aGVyRG91Ymxl Tm9ySGVhcEJpZ0ludENoaWxkLCBsZWZ0UmVncywgdGVtcEdQUik7CiAKLSAgICBib29sIGxlZnRN YXlCZU5vdENlbGwgPSBuZWVkc1R5cGVDaGVjayhuZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludENo aWxkLCBTcGVjQ2VsbENoZWNrKTsKLSAgICBpZiAobGVmdE1heUJlTm90Q2VsbCkKKyAgICBpZiAo bmVlZHNUeXBlQ2hlY2sobGVmdE5laXRoZXJEb3VibGVOb3JIZWFwQmlnSW50Q2hpbGQsIFNwZWND ZWxsQ2hlY2spKQogICAgICAgICBmYWxzZUNhc2UuYXBwZW5kKG1faml0LmJyYW5jaElmTm90Q2Vs bChsZWZ0UmVncykpOwogCi0gICAgREZHX1RZUEVfQ0hFQ0sobGVmdFJlZ3MsIG5laXRoZXJEb3Vi bGVOb3JIZWFwQmlnSW50Q2hpbGQsIH5TcGVjSGVhcEJpZ0ludCwgbV9qaXQuYnJhbmNoSWZIZWFw QmlnSW50KGxlZnRHUFIpKTsKKyAgICBERkdfVFlQRV9DSEVDSyhsZWZ0UmVncywgbGVmdE5laXRo ZXJEb3VibGVOb3JIZWFwQmlnSW50Q2hpbGQsIH5TcGVjSGVhcEJpZ0ludCwgbV9qaXQuYnJhbmNo SWZIZWFwQmlnSW50KGxlZnRSZWdzLnBheWxvYWRHUFIoKSkpOwogCi0gICAgYm9vbCBsZWZ0TWF5 QmVOb3RTdHJpbmdLbm93aW5nQ2VsbCA9IG5lZWRzVHlwZUNoZWNrKG5laXRoZXJEb3VibGVOb3JI ZWFwQmlnSW50Q2hpbGQsICh+U3BlY1N0cmluZykgJiBTcGVjQ2VsbENoZWNrKTsKLSAgICBpZiAo bGVmdE1heUJlTm90U3RyaW5nS25vd2luZ0NlbGwpCi0gICAgICAgIGZhbHNlQ2FzZS5hcHBlbmQo bV9qaXQuYnJhbmNoSWZOb3RTdHJpbmcobGVmdEdQUikpOworICAgIGlmIChuZWVkc1R5cGVDaGVj ayhsZWZ0TmVpdGhlckRvdWJsZU5vckhlYXBCaWdJbnRDaGlsZCwgU3BlY1N0cmluZykpCisgICAg ICAgIGZhbHNlQ2FzZS5hcHBlbmQobV9qaXQuYnJhbmNoSWZOb3RTdHJpbmcobGVmdFJlZ3MucGF5 bG9hZEdQUigpKSk7CiAKLSAgICBib29sIHJpZ2h0TWF5QmVOb3RDZWxsID0gbmVlZHNUeXBlQ2hl Y2sobm90RG91YmxlQ2hpbGQsIFNwZWNDZWxsQ2hlY2spOwotICAgIGlmIChyaWdodE1heUJlTm90 Q2VsbCkKKyAgICBpZiAobmVlZHNUeXBlQ2hlY2socmlnaHROb3REb3VibGVDaGlsZCwgU3BlY0Nl bGxDaGVjaykpCiAgICAgICAgIGZhbHNlQ2FzZS5hcHBlbmQobV9qaXQuYnJhbmNoSWZOb3RDZWxs KHJpZ2h0UmVncykpOwogCi0gICAgYm9vbCByaWdodE1heUJlTm90U3RyaW5nS25vd2luZ0NlbGwg PSBuZWVkc1R5cGVDaGVjayhub3REb3VibGVDaGlsZCwgKH5TcGVjU3RyaW5nKSAmIFNwZWNDZWxs Q2hlY2spOwotICAgIGlmIChyaWdodE1heUJlTm90U3RyaW5nS25vd2luZ0NlbGwpCi0gICAgICAg IGZhbHNlQ2FzZS5hcHBlbmQobV9qaXQuYnJhbmNoSWZOb3RTdHJpbmcocmlnaHRHUFIpKTsKKyAg ICBpZiAobmVlZHNUeXBlQ2hlY2socmlnaHROb3REb3VibGVDaGlsZCwgU3BlY1N0cmluZykpCisg ICAgICAgIGZhbHNlQ2FzZS5hcHBlbmQobV9qaXQuYnJhbmNoSWZOb3RTdHJpbmcocmlnaHRSZWdz LnBheWxvYWRHUFIoKSkpOwogCi0gICAgY29tcGlsZVN0cmluZ0VxdWFsaXR5KG5vZGUsIGxlZnRH UFIsIHJpZ2h0R1BSLCB0ZW1wR1BSLCBsZWZ0VGVtcEdQUiwgcmlnaHRUZW1wR1BSLCBsZWZ0VGVt cDJHUFIsIHJpZ2h0VGVtcDJHUFIsIHRydWVDYXNlLCBmYWxzZUNhc2UpOworICAgIGNvbXBpbGVT dHJpbmdFcXVhbGl0eShub2RlLCBsZWZ0UmVncy5wYXlsb2FkR1BSKCksIHJpZ2h0UmVncy5wYXls b2FkR1BSKCksIHRlbXBHUFIsIGxlZnRUZW1wR1BSLCByaWdodFRlbXBHUFIsIGxlZnRUZW1wMkdQ UiwgcmlnaHRUZW1wMkdQUiwgdHJ1ZUNhc2UsIGZhbHNlQ2FzZSk7CiB9CiAKIHZvaWQgU3BlY3Vs YXRpdmVKSVQ6Om5vblNwZWN1bGF0aXZlUGVlcGhvbGVTdHJpY3RFcShOb2RlKiBub2RlLCBOb2Rl KiBicmFuY2hOb2RlLCBib29sIGludmVydCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwv RlRMTG93ZXJERkdUb0IzLmNwcAppbmRleCBlMGIwMTBmZDI0ZDRiMmQyY2ZiNGVmZTE4MDdjOWI4 ZGU1YzEwY2JiLi42NzdhY2E0NGJkN2U5NWQ4N2MxMzljNThjMDg3OWRiYjJhOTUzMWU5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCkBAIC05ODc4 LDE1ICs5ODc4LDE1IEBAIGNsYXNzIExvd2VyREZHVG9CMyB7CiAgICAgICAgIHNldEJvb2xlYW4o bV9vdXQucGhpKEludDMyLCBmYXN0VHJ1ZSwgZmFzdEZhbHNlLCBzbG93UmVzdWx0KSk7CiAgICAg fQogCi0gICAgdm9pZCBjb21waWxlTmVpdGhlckRvdWJsZU5vckhlYXBCaWdJbnRUb05vdERvdWJs ZVN0cmljdEVxdWFsaXR5KEVkZ2UgbmVpdGhlckRvdWJsZU5vckhlYXBCaWdJbnRFZGdlLCBFZGdl IG5vdERvdWJsZUVkZ2UpCisgICAgdm9pZCBjb21waWxlTmVpdGhlckRvdWJsZU5vckhlYXBCaWdJ bnRUb05vdERvdWJsZVN0cmljdEVxdWFsaXR5KEVkZ2UgbGVmdE5laXRoZXJEb3VibGVOb3JIZWFw QmlnSW50RWRnZSwgRWRnZSByaWdodE5vdERvdWJsZUVkZ2UpCiAgICAgewotICAgICAgICBBU1NF UlQobmVpdGhlckRvdWJsZU5vckhlYXBCaWdJbnRFZGdlLnVzZUtpbmQoKSA9PSBOZWl0aGVyRG91 YmxlTm9ySGVhcEJpZ0ludFVzZSk7Ci0gICAgICAgIEFTU0VSVChub3REb3VibGVFZGdlLnVzZUtp bmQoKSA9PSBOb3REb3VibGVVc2UpOworICAgICAgICBBU1NFUlQobGVmdE5laXRoZXJEb3VibGVO b3JIZWFwQmlnSW50RWRnZS51c2VLaW5kKCkgPT0gTmVpdGhlckRvdWJsZU5vckhlYXBCaWdJbnRV c2UpOworICAgICAgICBBU1NFUlQocmlnaHROb3REb3VibGVFZGdlLnVzZUtpbmQoKSA9PSBOb3RE b3VibGVVc2UpOwogCi0gICAgICAgIExWYWx1ZSBsZWZ0VmFsdWUgPSBsb3dKU1ZhbHVlKG5laXRo ZXJEb3VibGVOb3JIZWFwQmlnSW50RWRnZSwgTWFudWFsT3BlcmFuZFNwZWN1bGF0aW9uKTsKLSAg ICAgICAgTFZhbHVlIHJpZ2h0VmFsdWUgPSBsb3dKU1ZhbHVlKG5vdERvdWJsZUVkZ2UsIE1hbnVh bE9wZXJhbmRTcGVjdWxhdGlvbik7Ci0gICAgICAgIFNwZWN1bGF0ZWRUeXBlIGxlZnRWYWx1ZVR5 cGUgPSBwcm92ZW5UeXBlKG5laXRoZXJEb3VibGVOb3JIZWFwQmlnSW50RWRnZSk7Ci0gICAgICAg IFNwZWN1bGF0ZWRUeXBlIHJpZ2h0VmFsdWVUeXBlID0gcHJvdmVuVHlwZShub3REb3VibGVFZGdl KTsKKyAgICAgICAgTFZhbHVlIGxlZnRWYWx1ZSA9IGxvd0pTVmFsdWUobGVmdE5laXRoZXJEb3Vi bGVOb3JIZWFwQmlnSW50RWRnZSwgTWFudWFsT3BlcmFuZFNwZWN1bGF0aW9uKTsKKyAgICAgICAg TFZhbHVlIHJpZ2h0VmFsdWUgPSBsb3dKU1ZhbHVlKHJpZ2h0Tm90RG91YmxlRWRnZSwgTWFudWFs T3BlcmFuZFNwZWN1bGF0aW9uKTsKKyAgICAgICAgU3BlY3VsYXRlZFR5cGUgbGVmdFZhbHVlVHlw ZSA9IHByb3ZlblR5cGUobGVmdE5laXRoZXJEb3VibGVOb3JIZWFwQmlnSW50RWRnZSk7CisgICAg ICAgIFNwZWN1bGF0ZWRUeXBlIHJpZ2h0VmFsdWVUeXBlID0gcHJvdmVuVHlwZShyaWdodE5vdERv dWJsZUVkZ2UpOwogCiAgICAgICAgIExCYXNpY0Jsb2NrIHRyaXZpYWxseUVxdWFsQ2FzZSA9IG1f b3V0Lm5ld0Jsb2NrKCk7CiAgICAgICAgIExCYXNpY0Jsb2NrIGxlZnRJc05vdEludDMyRXF1YWxD YXNlID0gbV9vdXQubmV3QmxvY2soKTsKQEAgLTk5MjgsMTEgKzk5MjgsMTEgQEAgY2xhc3MgTG93 ZXJERkdUb0IzIHsKICAgICAgICAgbV9vdXQuYnJhbmNoKGlzSW50MzIobGVmdFZhbHVlLCBsZWZ0 VmFsdWVUeXBlKSwgdW5zdXJlKHJldHVyblRydWVCbG9jayksIHVuc3VyZShsZWZ0SXNOb3RJbnQz MkVxdWFsQ2FzZSkpOwogCiAgICAgICAgIG1fb3V0LmFwcGVuZFRvKGxlZnRJc05vdEludDMyRXF1 YWxDYXNlLCBsZWZ0SXNDZWxsRXF1YWxDYXNlKTsKLSAgICAgICAgdHlwZUNoZWNrV2l0aG91dFVw ZGF0aW5nSW50ZXJwcmV0ZXIoanNWYWx1ZVZhbHVlKGxlZnRWYWx1ZSksIG5laXRoZXJEb3VibGVO b3JIZWFwQmlnSW50RWRnZSwgflNwZWNGdWxsRG91YmxlLCBpc051bWJlcihsZWZ0VmFsdWUpKTsK KyAgICAgICAgdHlwZUNoZWNrV2l0aG91dFVwZGF0aW5nSW50ZXJwcmV0ZXIoanNWYWx1ZVZhbHVl KGxlZnRWYWx1ZSksIGxlZnROZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludEVkZ2UsIH5TcGVjRnVs bERvdWJsZSwgaXNOdW1iZXIobGVmdFZhbHVlKSk7CiAgICAgICAgIG1fb3V0LmJyYW5jaChpc0Nl bGwobGVmdFZhbHVlLCBsZWZ0VmFsdWVUeXBlICYgflNwZWNGdWxsTnVtYmVyKSwgdW5zdXJlKGxl ZnRJc0NlbGxFcXVhbENhc2UpLCB1bnN1cmUocmV0dXJuVHJ1ZUJsb2NrKSk7CiAKICAgICAgICAg bV9vdXQuYXBwZW5kVG8obGVmdElzQ2VsbEVxdWFsQ2FzZSwgcmV0dXJuVHJ1ZUJsb2NrKTsKLSAg ICAgICAgdHlwZUNoZWNrV2l0aG91dFVwZGF0aW5nSW50ZXJwcmV0ZXIoanNWYWx1ZVZhbHVlKGxl ZnRWYWx1ZSksIG5laXRoZXJEb3VibGVOb3JIZWFwQmlnSW50RWRnZSwgflNwZWNIZWFwQmlnSW50 LCBpc0hlYXBCaWdJbnQobGVmdFZhbHVlKSk7CisgICAgICAgIHR5cGVDaGVja1dpdGhvdXRVcGRh dGluZ0ludGVycHJldGVyKGpzVmFsdWVWYWx1ZShsZWZ0VmFsdWUpLCBsZWZ0TmVpdGhlckRvdWJs ZU5vckhlYXBCaWdJbnRFZGdlLCB+U3BlY0hlYXBCaWdJbnQsIGlzSGVhcEJpZ0ludChsZWZ0VmFs dWUpKTsKICAgICAgICAgbV9vdXQuanVtcChyZXR1cm5UcnVlQmxvY2spOwogCiAgICAgICAgIG1f b3V0LmFwcGVuZFRvKHJldHVyblRydWVCbG9jaywgbm90VHJpdmlhbGx5RXF1YWxDYXNlKTsKQEAg LTk5NDAsMTMgKzk5NDAsMTMgQEAgY2xhc3MgTG93ZXJERkdUb0IzIHsKICAgICAgICAgbV9vdXQu anVtcChjb250aW51YXRpb24pOwogCiAgICAgICAgIG1fb3V0LmFwcGVuZFRvKG5vdFRyaXZpYWxs eUVxdWFsQ2FzZSwgbGVmdElzQ2VsbCk7Ci0gICAgICAgIHNwZWN1bGF0ZU5vdERvdWJsZShuZWl0 aGVyRG91YmxlTm9ySGVhcEJpZ0ludEVkZ2UpOwotICAgICAgICBzcGVjdWxhdGVOb3REb3VibGUo bm90RG91YmxlRWRnZSk7CisgICAgICAgIHNwZWN1bGF0ZU5vdERvdWJsZShsZWZ0TmVpdGhlckRv dWJsZU5vckhlYXBCaWdJbnRFZGdlKTsKKyAgICAgICAgc3BlY3VsYXRlTm90RG91YmxlKHJpZ2h0 Tm90RG91YmxlRWRnZSk7CiAgICAgICAgIFZhbHVlRnJvbUJsb2NrIGZhc3RGYWxzZSA9IG1fb3V0 LmFuY2hvcihtX291dC5ib29sZWFuRmFsc2UpOwogICAgICAgICBtX291dC5icmFuY2goaXNOb3RD ZWxsKGxlZnRWYWx1ZSwgbGVmdFZhbHVlVHlwZSAmIH5TcGVjRnVsbERvdWJsZSksIHVuc3VyZShj b250aW51YXRpb24pLCB1bnN1cmUobGVmdElzQ2VsbCkpOwogCiAgICAgICAgIG1fb3V0LmFwcGVu ZFRvKGxlZnRJc0NlbGwsIGxlZnRJc1N0cmluZyk7Ci0gICAgICAgIEZUTF9UWVBFX0NIRUNLKGpz VmFsdWVWYWx1ZShsZWZ0VmFsdWUpLCBuZWl0aGVyRG91YmxlTm9ySGVhcEJpZ0ludEVkZ2UsIH5T cGVjSGVhcEJpZ0ludCwgaXNIZWFwQmlnSW50KGxlZnRWYWx1ZSkpOworICAgICAgICBGVExfVFlQ RV9DSEVDSyhqc1ZhbHVlVmFsdWUobGVmdFZhbHVlKSwgbGVmdE5laXRoZXJEb3VibGVOb3JIZWFw QmlnSW50RWRnZSwgflNwZWNIZWFwQmlnSW50LCBpc0hlYXBCaWdJbnQobGVmdFZhbHVlKSk7CiAg ICAgICAgIG1fb3V0LmJyYW5jaChpc05vdFN0cmluZyhsZWZ0VmFsdWUsIGxlZnRWYWx1ZVR5cGUg JiBTcGVjQ2VsbCAmIH5TcGVjSGVhcEJpZ0ludCksIHVuc3VyZShjb250aW51YXRpb24pLCB1bnN1 cmUobGVmdElzU3RyaW5nKSk7CiAKICAgICAgICAgbV9vdXQuYXBwZW5kVG8obGVmdElzU3RyaW5n LCByaWdodElzQ2VsbCk7CkBAIC05OTU2LDcgKzk5NTYsNyBAQCBjbGFzcyBMb3dlckRGR1RvQjMg ewogICAgICAgICBtX291dC5icmFuY2goaXNOb3RTdHJpbmcocmlnaHRWYWx1ZSwgcmlnaHRWYWx1 ZVR5cGUgJiBTcGVjQ2VsbCAmIH5TcGVjRnVsbERvdWJsZSksIHVuc3VyZShjb250aW51YXRpb24p LCB1bnN1cmUocmlnaHRJc1N0cmluZykpOwogCiAgICAgICAgIG1fb3V0LmFwcGVuZFRvKHJpZ2h0 SXNTdHJpbmcsIGNvbnRpbnVhdGlvbik7Ci0gICAgICAgIFZhbHVlRnJvbUJsb2NrIHNsb3dSZXN1 bHQgPSBtX291dC5hbmNob3Ioc3RyaW5nc0VxdWFsKGxlZnRWYWx1ZSwgcmlnaHRWYWx1ZSwgbmVp dGhlckRvdWJsZU5vckhlYXBCaWdJbnRFZGdlLCBub3REb3VibGVFZGdlKSk7CisgICAgICAgIFZh bHVlRnJvbUJsb2NrIHNsb3dSZXN1bHQgPSBtX291dC5hbmNob3Ioc3RyaW5nc0VxdWFsKGxlZnRW YWx1ZSwgcmlnaHRWYWx1ZSwgbGVmdE5laXRoZXJEb3VibGVOb3JIZWFwQmlnSW50RWRnZSwgcmln aHROb3REb3VibGVFZGdlKSk7CiAgICAgICAgIG1fb3V0Lmp1bXAoY29udGludWF0aW9uKTsKIAog ICAgICAgICBtX291dC5hcHBlbmRUbyhjb250aW51YXRpb24sIGxhc3ROZXh0KTsKZGlmZiAtLWdp dCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOWVlYTEyNWNm N2RkYWEzOTViZTk0MGMyNTVmYmE3OTI0MDdlYTBkOS4uYTFlNzgyODdkOGY1MGRhMTlmZjMwZDE2 MGJmMjNlMzU3MDIyMzYyZiAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0wOS0yMSAgWXVzdWtlIFN1enVr aSAgPHlzdXp1a2lAYXBwbGUuY29tPgorCisgICAgICAgIFtKU0NdIENvbXBhcmVTdHJpY3RFcSBp cyBvbWl0dGluZyBTdHJpbmcgY2hlY2sgaW5jb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDU4MgorICAgICAgICByZGFyOi8vODMyMzcx MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0 cmVzcy9jb21wYXJlLXN0cmljdC1lcS1zdHJpbmctY2hlY2suanM6IEFkZGVkLgorICAgICAgICAo Zm9vKToKKyAgICAgICAgKGJhcik6CisKIDIwMjEtMDktMjEgIEp1c3RpbiBNaWNoYXVkICA8anVz dGluX21pY2hhdWRAYXBwbGUuY29tPgogCiAgICAgICAgIERpZmZlcmVudGlhbCB0ZXN0aW5nOiBs aXZlIHN0YXRlbWVudCBkb24ndCBleGVjdXRlCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9j b21wYXJlLXN0cmljdC1lcS1zdHJpbmctY2hlY2suanMgYi9KU1Rlc3RzL3N0cmVzcy9jb21wYXJl LXN0cmljdC1lcS1zdHJpbmctY2hlY2suanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjlhNGRkM2ZhZjYwYTA0YjE0 YTdjYjk4MmJkYzI2NjY1MWExY2VmOQotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNz L2NvbXBhcmUtc3RyaWN0LWVxLXN0cmluZy1jaGVjay5qcwpAQCAtMCwwICsxLDkgQEAKK2Z1bmN0 aW9uIGZvbygpIHt9CitmdW5jdGlvbiBiYXIoYTAsIGExKSB7CisgIGEwIGluc3RhbmNlb2YgZm9v OworICBhMCA9PT0gYTE7Cit9Citmb3IgKGxldCBpPTA7IGk8MTAwMDAwOyBpKyspIHsKKyAgYmFy KHt9KTsKKyAgYmFyKDFuLCAnJyk7Cit9Cg==