219501 2020-12-03 12:03:49 -0800 "done" checkpoint of iterator_next stores the wrong register in the value profile in baseline JIT 2020-12-04 12:45:11 -0800 1 1 1 Unclassified WebKit JavaScriptCore Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin fpizlo ggaren gskachkov guijemont jsc32 keith_miller mark.lam msaboff rmorisset ross.kirsling ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1711750 0 saam 2020-12-03 12:03:49 -0800 ... 1711776 1 415330 saam 2020-12-03 12:57:14 -0800 Created attachment 415330 patch 1711782 2 415330 keith_miller 2020-12-03 13:09:33 -0800 Comment on attachment 415330 patch r=me 1711786 3 415330 mark.lam 2020-12-03 13:19:41 -0800 Comment on attachment 415330 patch View in context: https://bugs.webkit.org/attachment.cgi?id=415330&action=review Looks like this code was always broken for 32-bit. Can you pass a JSValueRegs to emitValueProfilingSite(), and at least add a FIXME for the 32-bit folks to fix JIT::emit_op_iterator_next()? > Source/JavaScriptCore/jit/JITInlines.h:312 > +inline void JIT::emitValueProfilingSite(ValueProfile& valueProfile, GPRReg value) Use JSValueRegs instead of GPRReg. > Source/JavaScriptCore/jit/JITInlines.h:317 > const RegisterID valueTag = regT1; This is going to be a bug because doneGPR above is regT1. I think the right thing to do is to pass value using the JSValueRegs abstraction instead. 1711813 4 saam 2020-12-03 14:15:54 -0800 (In reply to Mark Lam from comment #3) > Comment on attachment 415330 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=415330&action=review > > Looks like this code was always broken for 32-bit. Can you pass a > JSValueRegs to emitValueProfilingSite(), and at least add a FIXME for the > 32-bit folks to fix JIT::emit_op_iterator_next()? > > > Source/JavaScriptCore/jit/JITInlines.h:312 > > +inline void JIT::emitValueProfilingSite(ValueProfile& valueProfile, GPRReg value) > > Use JSValueRegs instead of GPRReg. > > > Source/JavaScriptCore/jit/JITInlines.h:317 > > const RegisterID valueTag = regT1; > > This is going to be a bug because doneGPR above is regT1. I think the right > thing to do is to pass value using the JSValueRegs abstraction instead. I don't care about 32-bits 1711814 5 saam 2020-12-03 14:17:30 -0800 (In reply to Saam Barati from comment #4) > (In reply to Mark Lam from comment #3) > > Comment on attachment 415330 [details] > > patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=415330&action=review > > > > Looks like this code was always broken for 32-bit. Can you pass a > > JSValueRegs to emitValueProfilingSite(), and at least add a FIXME for the > > 32-bit folks to fix JIT::emit_op_iterator_next()? > > > > > Source/JavaScriptCore/jit/JITInlines.h:312 > > > +inline void JIT::emitValueProfilingSite(ValueProfile& valueProfile, GPRReg value) > > > > Use JSValueRegs instead of GPRReg. > > > > > Source/JavaScriptCore/jit/JITInlines.h:317 > > > const RegisterID valueTag = regT1; > > > > This is going to be a bug because doneGPR above is regT1. I think the right > > thing to do is to pass value using the JSValueRegs abstraction instead. > > I don't care about 32-bits I suppose we can use the abstraction anyways 1711828 6 415348 saam 2020-12-03 14:33:25 -0800 Created attachment 415348 patch for landing 1711832 7 415330 saam 2020-12-03 14:41:01 -0800 Comment on attachment 415330 patch View in context: https://bugs.webkit.org/attachment.cgi?id=415330&action=review >> Source/JavaScriptCore/jit/JITInlines.h:317 >> const RegisterID valueTag = regT1; > > This is going to be a bug because doneGPR above is regT1. I think the right thing to do is to pass value using the JSValueRegs abstraction instead. to clarify, this wouldn't have been a bug because the other code you're reading is 64-bit only. However, JSValueRegs is a nicer abstraction, so I went with it as you suggest 1711940 8 ews-feeder 2020-12-03 20:09:12 -0800 Committed r270423: <https://trac.webkit.org/changeset/270423> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415348. 1711941 9 webkit-bug-importer 2020-12-03 20:10:22 -0800 <rdar://problem/71964541> 1711997 10 415348 ticaiolima 2020-12-04 04:40:08 -0800 Comment on attachment 415348 patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=415348&action=review > Source/JavaScriptCore/jit/JIT.h:377 > + void emitValueProfilingSite(ValueProfile&, JSValueRegs value = JSValueRegs { regT0 }); I think it would be better to require an explicit JSValueRegs to avoid future mistakes. I also found the same issue on `JIT::emit_op_get_prototype_of`. If you agree, I can include such change on https://bugs.webkit.org/show_bug.cgi?id=219535. 1712062 11 saam 2020-12-04 10:53:41 -0800 (In reply to Caio Lima from comment #10) > Comment on attachment 415348 [details] > patch for landing > > View in context: > https://bugs.webkit.org/attachment.cgi?id=415348&action=review > > > Source/JavaScriptCore/jit/JIT.h:377 > > + void emitValueProfilingSite(ValueProfile&, JSValueRegs value = JSValueRegs { regT0 }); > > I think it would be better to require an explicit JSValueRegs to avoid > future mistakes. I also found the same issue on > `JIT::emit_op_get_prototype_of`. If you agree, I can include such change on > https://bugs.webkit.org/show_bug.cgi?id=219535. I agree. 1712128 12 ticaiolima 2020-12-04 12:45:11 -0800 (In reply to Saam Barati from comment #11) > (In reply to Caio Lima from comment #10) > > Comment on attachment 415348 [details] > > patch for landing > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=415348&action=review > > > > > Source/JavaScriptCore/jit/JIT.h:377 > > > + void emitValueProfilingSite(ValueProfile&, JSValueRegs value = JSValueRegs { regT0 }); > > > > I think it would be better to require an explicit JSValueRegs to avoid > > future mistakes. I also found the same issue on > > `JIT::emit_op_get_prototype_of`. If you agree, I can include such change on > > https://bugs.webkit.org/show_bug.cgi?id=219535. > > I agree. Since https://bugs.webkit.org/show_bug.cgi?id=219535 already landed, I created https://bugs.webkit.org/show_bug.cgi?id=219550 to handle it. 415330 2020-12-03 12:57:14 -0800 2020-12-03 14:33:25 -0800 patch c-backup.diff text/plain 3982 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjcwNDAxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBA CisyMDIwLTEyLTAzICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg ICJkb25lIiBjaGVja3BvaW50IG9mIGl0ZXJhdG9yX25leHQgc3RvcmVzIHRoZSB3cm9uZyByZWdp c3RlciBpbiB0aGUgdmFsdWUgcHJvZmlsZSBpbiBiYXNlbGluZSBKSVQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTUwMQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaml0L0pJVC5oOgorICAgICAgICAq IGppdC9KSVRDYWxsLmNwcDoKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX2l0ZXJhdG9yX25l eHQpOgorICAgICAgICAqIGppdC9KSVRJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkpJVDo6ZW1p dFZhbHVlUHJvZmlsaW5nU2l0ZSk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdFZhbHVlUHJvZmls aW5nU2l0ZUlmUHJvZmlsZWRPcGNvZGUpOgorCiAyMDIwLTEyLTAzICBMYXVybyBNb3VyYSAgPGxt b3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXVEZdIEF2b2lkIEpTT05WYWx1ZTo6Y3JlYXRl IHdpdGggcmF3IHN0cmluZyBmYWxsaW5nIHRvIGJvb2wgb3ZlcmxvYWQKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9qaXQvSklULmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9KSVQuaAkocmV2aXNpb24gMjcwNDAxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9KSVQuaAkod29ya2luZyBjb3B5KQpAQCAtMzczLDggKzM3Myw4IEBAIG5hbWVzcGFjZSBK U0MgewogCiAgICAgICAgIC8vIFRoaXMgYXNzdW1lcyB0aGF0IHRoZSB2YWx1ZSB0byBwcm9maWxl IGlzIGluIHJlZ1QwIGFuZCB0aGF0IHJlZ1QzIGlzIGF2YWlsYWJsZSBmb3IKICAgICAgICAgLy8g c2NyYXRjaC4KLSAgICAgICAgdm9pZCBlbWl0VmFsdWVQcm9maWxpbmdTaXRlKFZhbHVlUHJvZmls ZSYpOwotICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBNZXRhZGF0YT4gdm9pZCBlbWl0VmFsdWVQ cm9maWxpbmdTaXRlKE1ldGFkYXRhJik7CisgICAgICAgIHZvaWQgZW1pdFZhbHVlUHJvZmlsaW5n U2l0ZShWYWx1ZVByb2ZpbGUmLCBHUFJSZWcgdmFsdWUgPSByZWdUMCk7CisgICAgICAgIHRlbXBs YXRlPHR5cGVuYW1lIE1ldGFkYXRhPiB2b2lkIGVtaXRWYWx1ZVByb2ZpbGluZ1NpdGUoTWV0YWRh dGEmLCBHUFJSZWcgdmFsdWUgPSByZWdUMCk7CiAgICAgICAgIHZvaWQgZW1pdFZhbHVlUHJvZmls aW5nU2l0ZUlmUHJvZmlsZWRPcGNvZGUoLi4uKTsKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUg T3A+CiAgICAgICAgIHN0ZDo6ZW5hYmxlX2lmX3Q8c3RkOjppc19zYW1lPGRlY2x0eXBlKE9wOjpN ZXRhZGF0YTo6bV9wcm9maWxlKSwgVmFsdWVQcm9maWxlPjo6dmFsdWUsIHZvaWQ+CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVENhbGwuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUQ2FsbC5jcHAJKHJldmlzaW9uIDI3MDQwMSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUQ2FsbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4 Nyw3ICs0ODcsNyBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9pdGVyYXRvcl9uZXh0KGNvbnN0IEluCiAg ICAgICAgIGFkZFNsb3dDYXNlKGdlbi5zbG93UGF0aEp1bXAoKSk7CiAgICAgICAgIG1fZ2V0QnlJ ZHMuYXBwZW5kKGdlbik7CiAKLSAgICAgICAgZW1pdFZhbHVlUHJvZmlsaW5nU2l0ZShtZXRhZGF0 YSk7CisgICAgICAgIGVtaXRWYWx1ZVByb2ZpbGluZ1NpdGUobWV0YWRhdGEsIGRvbmVHUFIpOwog ICAgICAgICBlbWl0UHV0VmlydHVhbFJlZ2lzdGVyKGJ5dGVjb2RlLm1fZG9uZSwgZG9uZUdQUik7 CiAgICAgICAgIGFkdmFuY2VUb05leHRDaGVja3BvaW50KCk7CiAgICAgfQpAQCAtNTA2LDcgKzUw Niw3IEBAIHZvaWQgSklUOjplbWl0X29wX2l0ZXJhdG9yX25leHQoY29uc3QgSW4KICAgICAgICAg YWRkU2xvd0Nhc2UoZ2VuLnNsb3dQYXRoSnVtcCgpKTsKICAgICAgICAgbV9nZXRCeUlkcy5hcHBl bmQoZ2VuKTsKIAotICAgICAgICBlbWl0VmFsdWVQcm9maWxpbmdTaXRlKG1ldGFkYXRhKTsKKyAg ICAgICAgZW1pdFZhbHVlUHJvZmlsaW5nU2l0ZShtZXRhZGF0YSwgdmFsdWVHUFIpOwogICAgICAg ICBlbWl0UHV0VmlydHVhbFJlZ2lzdGVyKGJ5dGVjb2RlLm1fdmFsdWUsIHZhbHVlR1BSKTsKIAog ICAgICAgICBpdGVyYXRpb25Eb25lLmxpbmsodGhpcyk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVElubGluZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaml0L0pJVElubGluZXMuaAkocmV2aXNpb24gMjcwNDAxKQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9KSVRJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwOSwxMSArMzA5LDEw IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBKSVQ6OmlzT3BlcmFuZENvbnN0YW4KICAgICByZXR1cm4g c3JjLmlzQ29uc3RhbnQoKSAmJiBnZXRDb25zdGFudE9wZXJhbmQoc3JjKS5pc1N0cmluZygpICYm IGFzU3RyaW5nKGdldENvbnN0YW50T3BlcmFuZChzcmMpLmFzQ2VsbCgpKS0+bGVuZ3RoKCkgPT0g MTsKIH0KIAotaW5saW5lIHZvaWQgSklUOjplbWl0VmFsdWVQcm9maWxpbmdTaXRlKFZhbHVlUHJv ZmlsZSYgdmFsdWVQcm9maWxlKQoraW5saW5lIHZvaWQgSklUOjplbWl0VmFsdWVQcm9maWxpbmdT aXRlKFZhbHVlUHJvZmlsZSYgdmFsdWVQcm9maWxlLCBHUFJSZWcgdmFsdWUpCiB7CiAgICAgQVNT RVJUKHNob3VsZEVtaXRQcm9maWxpbmcoKSk7CiAKLSAgICBjb25zdCBSZWdpc3RlcklEIHZhbHVl ID0gcmVnVDA7CiAjaWYgVVNFKEpTVkFMVUUzMl82NCkKICAgICBjb25zdCBSZWdpc3RlcklEIHZh bHVlVGFnID0gcmVnVDE7CiAjZW5kaWYKQEAgLTMzOCwxMSArMzM3LDExIEBAIGlubGluZSBzdGQ6 OmVuYWJsZV9pZl90PHN0ZDo6aXNfc2FtZTxkZWMKIGlubGluZSB2b2lkIEpJVDo6ZW1pdFZhbHVl UHJvZmlsaW5nU2l0ZUlmUHJvZmlsZWRPcGNvZGUoLi4uKSB7IH0KIAogdGVtcGxhdGU8dHlwZW5h bWUgTWV0YWRhdGE+Ci1pbmxpbmUgdm9pZCBKSVQ6OmVtaXRWYWx1ZVByb2ZpbGluZ1NpdGUoTWV0 YWRhdGEmIG1ldGFkYXRhKQoraW5saW5lIHZvaWQgSklUOjplbWl0VmFsdWVQcm9maWxpbmdTaXRl KE1ldGFkYXRhJiBtZXRhZGF0YSwgR1BSUmVnIHZhbHVlKQogewogICAgIGlmICghc2hvdWxkRW1p dFByb2ZpbGluZygpKQogICAgICAgICByZXR1cm47Ci0gICAgZW1pdFZhbHVlUHJvZmlsaW5nU2l0 ZSh2YWx1ZVByb2ZpbGVGb3IobWV0YWRhdGEsIG1fYnl0ZWNvZGVJbmRleC5jaGVja3BvaW50KCkp KTsKKyAgICBlbWl0VmFsdWVQcm9maWxpbmdTaXRlKHZhbHVlUHJvZmlsZUZvcihtZXRhZGF0YSwg bV9ieXRlY29kZUluZGV4LmNoZWNrcG9pbnQoKSksIHZhbHVlKTsKIH0KIAogaW5saW5lIHZvaWQg SklUOjplbWl0QXJyYXlQcm9maWxpbmdTaXRlV2l0aENlbGwoUmVnaXN0ZXJJRCBjZWxsLCBSZWdp c3RlcklEIGluZGV4aW5nVHlwZSwgQXJyYXlQcm9maWxlKiBhcnJheVByb2ZpbGUpCg== 415348 2020-12-03 14:33:25 -0800 2020-12-03 20:09:12 -0800 patch for landing c-backup.diff text/plain 4896 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjcwNDAxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBA CisyMDIwLTEyLTAzICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg ICJkb25lIiBjaGVja3BvaW50IG9mIGl0ZXJhdG9yX25leHQgc3RvcmVzIHRoZSB3cm9uZyByZWdp c3RlciBpbiB0aGUgdmFsdWUgcHJvZmlsZSBpbiBiYXNlbGluZSBKSVQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTUwMQorCisgICAgICAgIFJldmll d2VkIGJ5IEtlaXRoIE1pbGxlci4KKworICAgICAgICAqIGppdC9KSVQuaDoKKyAgICAgICAgKiBq aXQvSklUQ2FsbC5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9pdGVyYXRvcl9uZXh0 KToKKyAgICAgICAgKiBqaXQvSklUSW5saW5lcy5oOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRW YWx1ZVByb2ZpbGluZ1NpdGUpOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRWYWx1ZVByb2ZpbGlu Z1NpdGVJZlByb2ZpbGVkT3Bjb2RlKToKKwogMjAyMC0xMi0wMyAgTGF1cm8gTW91cmEgIDxsbW91 cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1RGXSBBdm9pZCBKU09OVmFsdWU6OmNyZWF0ZSB3 aXRoIHJhdyBzdHJpbmcgZmFsbGluZyB0byBib29sIG92ZXJsb2FkCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaml0L0pJVC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklULmgJKHJldmlzaW9uIDI3MDQwMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklULmgJKHdvcmtpbmcgY29weSkKQEAgLTM3Myw4ICszNzMsMTQgQEAgbmFtZXNwYWNlIEpT QyB7CiAKICAgICAgICAgLy8gVGhpcyBhc3N1bWVzIHRoYXQgdGhlIHZhbHVlIHRvIHByb2ZpbGUg aXMgaW4gcmVnVDAgYW5kIHRoYXQgcmVnVDMgaXMgYXZhaWxhYmxlIGZvcgogICAgICAgICAvLyBz Y3JhdGNoLgotICAgICAgICB2b2lkIGVtaXRWYWx1ZVByb2ZpbGluZ1NpdGUoVmFsdWVQcm9maWxl Jik7Ci0gICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIE1ldGFkYXRhPiB2b2lkIGVtaXRWYWx1ZVBy b2ZpbGluZ1NpdGUoTWV0YWRhdGEmKTsKKyNpZiBVU0UoSlNWQUxVRTY0KQorICAgICAgICB2b2lk IGVtaXRWYWx1ZVByb2ZpbGluZ1NpdGUoVmFsdWVQcm9maWxlJiwgSlNWYWx1ZVJlZ3MgdmFsdWUg PSBKU1ZhbHVlUmVncyB7IHJlZ1QwIH0pOworICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBNZXRh ZGF0YT4gdm9pZCBlbWl0VmFsdWVQcm9maWxpbmdTaXRlKE1ldGFkYXRhJiwgSlNWYWx1ZVJlZ3Mg dmFsdWUgPSBKU1ZhbHVlUmVncyB7IHJlZ1QwIH0pOworI2Vsc2UKKyAgICAgICAgdm9pZCBlbWl0 VmFsdWVQcm9maWxpbmdTaXRlKFZhbHVlUHJvZmlsZSYsIEpTVmFsdWVSZWdzIHZhbHVlID0gSlNW YWx1ZVJlZ3MgeyByZWdUMSwgcmVnVDAgfSk7CisgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIE1l dGFkYXRhPiB2b2lkIGVtaXRWYWx1ZVByb2ZpbGluZ1NpdGUoTWV0YWRhdGEmLCBKU1ZhbHVlUmVn cyB2YWx1ZSA9IEpTVmFsdWVSZWdzIHsgcmVnVDEsIHJlZ1QwIH0pOworI2VuZGlmCisKICAgICAg ICAgdm9pZCBlbWl0VmFsdWVQcm9maWxpbmdTaXRlSWZQcm9maWxlZE9wY29kZSguLi4pOwogICAg ICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBPcD4KICAgICAgICAgc3RkOjplbmFibGVfaWZfdDxzdGQ6 OmlzX3NhbWU8ZGVjbHR5cGUoT3A6Ok1ldGFkYXRhOjptX3Byb2ZpbGUpLCBWYWx1ZVByb2ZpbGU+ Ojp2YWx1ZSwgdm9pZD4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUQ2FsbC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDYWxsLmNwcAko cmV2aXNpb24gMjcwNDAxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDYWxsLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNDg3LDcgKzQ4Nyw3IEBAIHZvaWQgSklUOjplbWl0X29wX2l0 ZXJhdG9yX25leHQoY29uc3QgSW4KICAgICAgICAgYWRkU2xvd0Nhc2UoZ2VuLnNsb3dQYXRoSnVt cCgpKTsKICAgICAgICAgbV9nZXRCeUlkcy5hcHBlbmQoZ2VuKTsKIAotICAgICAgICBlbWl0VmFs dWVQcm9maWxpbmdTaXRlKG1ldGFkYXRhKTsKKyAgICAgICAgZW1pdFZhbHVlUHJvZmlsaW5nU2l0 ZShtZXRhZGF0YSwgSlNWYWx1ZVJlZ3MgeyBkb25lR1BSIH0pOwogICAgICAgICBlbWl0UHV0Vmly dHVhbFJlZ2lzdGVyKGJ5dGVjb2RlLm1fZG9uZSwgZG9uZUdQUik7CiAgICAgICAgIGFkdmFuY2VU b05leHRDaGVja3BvaW50KCk7CiAgICAgfQpAQCAtNTA2LDcgKzUwNiw3IEBAIHZvaWQgSklUOjpl bWl0X29wX2l0ZXJhdG9yX25leHQoY29uc3QgSW4KICAgICAgICAgYWRkU2xvd0Nhc2UoZ2VuLnNs b3dQYXRoSnVtcCgpKTsKICAgICAgICAgbV9nZXRCeUlkcy5hcHBlbmQoZ2VuKTsKIAotICAgICAg ICBlbWl0VmFsdWVQcm9maWxpbmdTaXRlKG1ldGFkYXRhKTsKKyAgICAgICAgZW1pdFZhbHVlUHJv ZmlsaW5nU2l0ZShtZXRhZGF0YSwgSlNWYWx1ZVJlZ3MgeyB2YWx1ZUdQUiB9KTsKICAgICAgICAg ZW1pdFB1dFZpcnR1YWxSZWdpc3RlcihieXRlY29kZS5tX3ZhbHVlLCB2YWx1ZUdQUik7CiAKICAg ICAgICAgaXRlcmF0aW9uRG9uZS5saW5rKHRoaXMpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9KSVRJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9KSVRJbmxpbmVzLmgJKHJldmlzaW9uIDI3MDQwMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvSklUSW5saW5lcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMDksMjMgKzMwOSwxOCBA QCBBTFdBWVNfSU5MSU5FIGJvb2wgSklUOjppc09wZXJhbmRDb25zdGFuCiAgICAgcmV0dXJuIHNy Yy5pc0NvbnN0YW50KCkgJiYgZ2V0Q29uc3RhbnRPcGVyYW5kKHNyYykuaXNTdHJpbmcoKSAmJiBh c1N0cmluZyhnZXRDb25zdGFudE9wZXJhbmQoc3JjKS5hc0NlbGwoKSktPmxlbmd0aCgpID09IDE7 CiB9CiAKLWlubGluZSB2b2lkIEpJVDo6ZW1pdFZhbHVlUHJvZmlsaW5nU2l0ZShWYWx1ZVByb2Zp bGUmIHZhbHVlUHJvZmlsZSkKK2lubGluZSB2b2lkIEpJVDo6ZW1pdFZhbHVlUHJvZmlsaW5nU2l0 ZShWYWx1ZVByb2ZpbGUmIHZhbHVlUHJvZmlsZSwgSlNWYWx1ZVJlZ3MgdmFsdWUpCiB7CiAgICAg QVNTRVJUKHNob3VsZEVtaXRQcm9maWxpbmcoKSk7CiAKLSAgICBjb25zdCBSZWdpc3RlcklEIHZh bHVlID0gcmVnVDA7Ci0jaWYgVVNFKEpTVkFMVUUzMl82NCkKLSAgICBjb25zdCBSZWdpc3RlcklE IHZhbHVlVGFnID0gcmVnVDE7Ci0jZW5kaWYKLSAgICAKICAgICAvLyBXZSdyZSBpbiBhIHNpbXBs ZSBjb25maWd1cmF0aW9uOiBvbmx5IG9uZSBidWNrZXQsIHNvIHdlIGNhbiBqdXN0IGRvIGEgZGly ZWN0CiAgICAgLy8gc3RvcmUuCiAjaWYgVVNFKEpTVkFMVUU2NCkKLSAgICBzdG9yZTY0KHZhbHVl LCB2YWx1ZVByb2ZpbGUubV9idWNrZXRzKTsKKyAgICBzdG9yZTY0KHZhbHVlLmdwcigpLCB2YWx1 ZVByb2ZpbGUubV9idWNrZXRzKTsKICNlbHNlCiAgICAgRW5jb2RlZFZhbHVlRGVzY3JpcHRvciog ZGVzY3JpcHRvciA9IGJpdHdpc2VfY2FzdDxFbmNvZGVkVmFsdWVEZXNjcmlwdG9yKj4odmFsdWVQ cm9maWxlLm1fYnVja2V0cyk7Ci0gICAgc3RvcmUzMih2YWx1ZSwgJmRlc2NyaXB0b3ItPmFzQml0 cy5wYXlsb2FkKTsKLSAgICBzdG9yZTMyKHZhbHVlVGFnLCAmZGVzY3JpcHRvci0+YXNCaXRzLnRh Zyk7CisgICAgc3RvcmUzMih2YWx1ZS5wYXlsb2FkR1BSKCksICZkZXNjcmlwdG9yLT5hc0JpdHMu cGF5bG9hZCk7CisgICAgc3RvcmUzMih2YWx1ZS50YWdHUFIoKSwgJmRlc2NyaXB0b3ItPmFzQml0 cy50YWcpOwogI2VuZGlmCiB9CiAKQEAgLTMzOCwxMSArMzMzLDExIEBAIGlubGluZSBzdGQ6OmVu YWJsZV9pZl90PHN0ZDo6aXNfc2FtZTxkZWMKIGlubGluZSB2b2lkIEpJVDo6ZW1pdFZhbHVlUHJv ZmlsaW5nU2l0ZUlmUHJvZmlsZWRPcGNvZGUoLi4uKSB7IH0KIAogdGVtcGxhdGU8dHlwZW5hbWUg TWV0YWRhdGE+Ci1pbmxpbmUgdm9pZCBKSVQ6OmVtaXRWYWx1ZVByb2ZpbGluZ1NpdGUoTWV0YWRh dGEmIG1ldGFkYXRhKQoraW5saW5lIHZvaWQgSklUOjplbWl0VmFsdWVQcm9maWxpbmdTaXRlKE1l dGFkYXRhJiBtZXRhZGF0YSwgSlNWYWx1ZVJlZ3MgdmFsdWUpCiB7CiAgICAgaWYgKCFzaG91bGRF bWl0UHJvZmlsaW5nKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBlbWl0VmFsdWVQcm9maWxpbmdT aXRlKHZhbHVlUHJvZmlsZUZvcihtZXRhZGF0YSwgbV9ieXRlY29kZUluZGV4LmNoZWNrcG9pbnQo KSkpOworICAgIGVtaXRWYWx1ZVByb2ZpbGluZ1NpdGUodmFsdWVQcm9maWxlRm9yKG1ldGFkYXRh LCBtX2J5dGVjb2RlSW5kZXguY2hlY2twb2ludCgpKSwgdmFsdWUpOwogfQogCiBpbmxpbmUgdm9p ZCBKSVQ6OmVtaXRBcnJheVByb2ZpbGluZ1NpdGVXaXRoQ2VsbChSZWdpc3RlcklEIGNlbGwsIFJl Z2lzdGVySUQgaW5kZXhpbmdUeXBlLCBBcnJheVByb2ZpbGUqIGFycmF5UHJvZmlsZSkK