215720 2020-08-20 17:35:43 -0700 Replace IC on Proxy must write barrier Proxy's target 2020-08-20 20:51:15 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam ews-watchlist keith_miller mark.lam msaboff tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1681882 0 saam 2020-08-20 17:35:43 -0700 ... 1681889 1 406986 saam 2020-08-20 17:44:57 -0700 Created attachment 406986 patch I'm going to keep trying to write a test, but I've spent an hour on it with no success. 1681898 2 406986 ysuzuki 2020-08-20 18:03:04 -0700 Comment on attachment 406986 patch View in context: https://bugs.webkit.org/attachment.cgi?id=406986&action=review Nice, r=me > Source/JavaScriptCore/bytecode/AccessCase.cpp:1798 > + jit.loadPtr(CCallHelpers::Address(baseGPR, JSProxy::targetOffset()), scratchGPR); > + auto spillState = state.preserveLiveRegistersToStackForCallWithoutExceptions(); > + jit.setupArguments<decltype(operationWriteBarrierSlowPath)>(CCallHelpers::TrustedImmPtr(&vm), scratchGPR); > + jit.prepareCallOperation(vm); > + auto operationCall = jit.call(OperationPtrTag); > + jit.addLinkTask([=] (LinkBuffer& linkBuffer) { > + linkBuffer.link(operationCall, FunctionPtr<OperationPtrTag>(operationWriteBarrierSlowPath)); > + }); > + state.restoreLiveRegistersFromStackForCall(spillState); > + Can you check whether AccessCase::doesCalls change is necessary? 1681910 3 406996 saam 2020-08-20 18:41:42 -0700 Created attachment 406996 patch for landing 1681924 4 ews-feeder 2020-08-20 20:50:43 -0700 Committed r265997: <https://trac.webkit.org/changeset/265997> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406996. 1681925 5 webkit-bug-importer 2020-08-20 20:51:15 -0700 <rdar://problem/67527868> 406986 2020-08-20 17:44:57 -0700 2020-08-20 18:41:42 -0700 patch b-backup.diff text/plain 5087 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjY1OTg2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDIwLTA4LTIwICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFJlcGxhY2UgSUMgb24gUHJveHkgbXVzdCB3cml0ZSBiYXJyaWVyIFByb3h5J3MgdGFyZ2V0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU3MjAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcHV0X2J5 X2lkIG9wY29kZSBpbiB0aGUgYmFzZWxpbmUgYW5kIHRoZSBERkcvRlRsIHdpbGwgZW1pdCBhIHdy aXRlQmFycmllcgorICAgICAgICBhZnRlciB0aGUgb3BlcmF0aW9uIGlzIGNvbXBsZXRlLiBCdXQg aXQgZG9lcyB0aGlzIHRvIHRoZSBiYXNlIG9iamVjdC4gSW4gdGhlCisgICAgICAgIGNhc2Ugb2Yg YW4gSUMgd2l0aCB0aGUgYmFzZSBhcyBhIFByb3h5LCB3ZSdyZSBub3QgYWN0dWFsbHkgc3Rvcmlu ZyB0byB0aGUgUHJveHksIGJ1dAorICAgICAgICBpbnN0ZWFkLCB0aGUgUHJveHkncyB0YXJnZXQu IFRoaXMgcGF0Y2ggbWFrZXMgaXQgc28gb3VyIElDIGNvZGUgd3JpdGVCYXJyaWVycworICAgICAg ICB0aGUgUHJveHkncyB0YXJnZXQuIFRoaXMgZml4ZWQgYSBjcmFzaCB3aGVuIHJ1bm5pbmcgU3Bl ZWRvbWV0ZXIyLgorCisgICAgICAgICogYnl0ZWNvZGUvQWNjZXNzQ2FzZS5jcHA6CisgICAgICAg IChKU0M6OkFjY2Vzc0Nhc2U6OmNhblJlcGxhY2UgY29uc3QpOgorICAgICAgICAoSlNDOjpBY2Nl c3NDYXNlOjpnZW5lcmF0ZUltcGwpOgorICAgICAgICAqIGJ5dGVjb2RlL1BvbHltb3JwaGljQWNj ZXNzLmNwcDoKKyAgICAgICAgKEpTQzo6QWNjZXNzR2VuZXJhdGlvblN0YXRlOjpwcmVzZXJ2ZUxp dmVSZWdpc3RlcnNUb1N0YWNrRm9yQ2FsbFdpdGhvdXRFeGNlcHRpb25zKToKKyAgICAgICAgKiBi eXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oOgorCiAyMDIwLTA4LTIwICBBbGV4ZXkgU2h2YXlr YSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAgICBJbnZhbGlkIGVhcmx5IGVycm9y cyBmb3IgY2xhc3MgbWV0aG9kcyBuYW1lZCAiY29uc3RydWN0b3IiIGFuZCAicHJvdG90eXBlIgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0FjY2Vzc0Nhc2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9BY2Nlc3NDYXNlLmNwcAko cmV2aXNpb24gMjY1OTU3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0FjY2Vz c0Nhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01ODAsNiArNTgwLDkgQEAgYm9vbCBBY2Nlc3ND YXNlOjpjYW5SZXBsYWNlKGNvbnN0IEFjY2VzcwogICAgIGlmIChtX2lkZW50aWZpZXIgIT0gb3Ro ZXIubV9pZGVudGlmaWVyKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAodmlhUHJv eHkoKSAhPSBvdGhlci52aWFQcm94eSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBh dXRvIGNoZWNrUG9seVByb3RvQW5kU3RydWN0dXJlID0gWyZdIHsKICAgICAgICAgaWYgKG1fcG9s eVByb3RvQWNjZXNzQ2hhaW4pIHsKICAgICAgICAgICAgIGlmICghb3RoZXIubV9wb2x5UHJvdG9B Y2Nlc3NDaGFpbikKQEAgLTE3NzUsNiArMTc3OCwyNyBAQCB2b2lkIEFjY2Vzc0Nhc2U6OmdlbmVy YXRlSW1wbChBY2Nlc3NHZW5lCiAgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpBZGRyZXNz KAogICAgICAgICAgICAgICAgICAgICBzY3JhdGNoR1BSLCBvZmZzZXRJbkJ1dHRlcmZseShtX29m ZnNldCkgKiBzaXplb2YoSlNWYWx1ZSkpKTsKICAgICAgICAgfQorCisgICAgICAgIGlmICh2aWFQ cm94eSgpKSB7CisgICAgICAgICAgICBDQ2FsbEhlbHBlcnM6Okp1bXBMaXN0IHNraXBCYXJyaWVy OworICAgICAgICAgICAgc2tpcEJhcnJpZXIuYXBwZW5kKGppdC5icmFuY2hJZk5vdENlbGwodmFs dWVSZWdzKSk7CisgICAgICAgICAgICBpZiAoIWlzSW5saW5lT2Zmc2V0KG1fb2Zmc2V0KSkKKyAg ICAgICAgICAgICAgICBqaXQubG9hZFB0cihDQ2FsbEhlbHBlcnM6OkFkZHJlc3MoYmFzZUdQUiwg SlNQcm94eTo6dGFyZ2V0T2Zmc2V0KCkpLCBzY3JhdGNoR1BSKTsKKyAgICAgICAgICAgIHNraXBC YXJyaWVyLmFwcGVuZChqaXQuYmFycmllckJyYW5jaCh2bSwgc2NyYXRjaEdQUiwgc2NyYXRjaEdQ UikpOworCisgICAgICAgICAgICBqaXQubG9hZFB0cihDQ2FsbEhlbHBlcnM6OkFkZHJlc3MoYmFz ZUdQUiwgSlNQcm94eTo6dGFyZ2V0T2Zmc2V0KCkpLCBzY3JhdGNoR1BSKTsKKyAgICAgICAgICAg IGF1dG8gc3BpbGxTdGF0ZSA9IHN0YXRlLnByZXNlcnZlTGl2ZVJlZ2lzdGVyc1RvU3RhY2tGb3JD YWxsV2l0aG91dEV4Y2VwdGlvbnMoKTsKKyAgICAgICAgICAgIGppdC5zZXR1cEFyZ3VtZW50czxk ZWNsdHlwZShvcGVyYXRpb25Xcml0ZUJhcnJpZXJTbG93UGF0aCk+KENDYWxsSGVscGVyczo6VHJ1 c3RlZEltbVB0cigmdm0pLCBzY3JhdGNoR1BSKTsKKyAgICAgICAgICAgIGppdC5wcmVwYXJlQ2Fs bE9wZXJhdGlvbih2bSk7CisgICAgICAgICAgICBhdXRvIG9wZXJhdGlvbkNhbGwgPSBqaXQuY2Fs bChPcGVyYXRpb25QdHJUYWcpOworICAgICAgICAgICAgaml0LmFkZExpbmtUYXNrKFs9XSAoTGlu a0J1ZmZlciYgbGlua0J1ZmZlcikgeworICAgICAgICAgICAgICAgIGxpbmtCdWZmZXIubGluayhv cGVyYXRpb25DYWxsLCBGdW5jdGlvblB0cjxPcGVyYXRpb25QdHJUYWc+KG9wZXJhdGlvbldyaXRl QmFycmllclNsb3dQYXRoKSk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIHN0YXRlLnJl c3RvcmVMaXZlUmVnaXN0ZXJzRnJvbVN0YWNrRm9yQ2FsbChzcGlsbFN0YXRlKTsKKworICAgICAg ICAgICAgc2tpcEJhcnJpZXIubGluaygmaml0KTsKKyAgICAgICAgfQorCiAgICAgICAgIHN0YXRl LnN1Y2NlZWQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNjZXNzLmNwcAkocmV2aXNp b24gMjY1OTU3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGlj QWNjZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI1LDYgKzEyNSwxOSBAQCBhdXRvIEFjY2Vz c0dlbmVyYXRpb25TdGF0ZTo6cHJlc2VydmVMaXZlCiAgICAgfTsKIH0KIAorYXV0byBBY2Nlc3NH ZW5lcmF0aW9uU3RhdGU6OnByZXNlcnZlTGl2ZVJlZ2lzdGVyc1RvU3RhY2tGb3JDYWxsV2l0aG91 dEV4Y2VwdGlvbnMoKSAtPiBTcGlsbFN0YXRlCit7CisgICAgUmVnaXN0ZXJTZXQgbGl2ZVJlZ2lz dGVycyA9IGFsbG9jYXRvci0+dXNlZFJlZ2lzdGVycygpOworICAgIGxpdmVSZWdpc3RlcnMuZXhj bHVkZShjYWxsZWVTYXZlUmVnaXN0ZXJzKCkpOworCisgICAgY29uc3RleHByIHVuc2lnbmVkIGV4 dHJhU3RhY2tQYWRkaW5nID0gMDsKKyAgICB1bnNpZ25lZCBudW1iZXJPZlN0YWNrQnl0ZXNVc2Vk Rm9yUmVnaXN0ZXJQcmVzZXJ2YXRpb24gPSBTY3JhdGNoUmVnaXN0ZXJBbGxvY2F0b3I6OnByZXNl cnZlUmVnaXN0ZXJzVG9TdGFja0ZvckNhbGwoKmppdCwgbGl2ZVJlZ2lzdGVycywgZXh0cmFTdGFj a1BhZGRpbmcpOworICAgIHJldHVybiBTcGlsbFN0YXRlIHsKKyAgICAgICAgV1RGTW92ZShsaXZl UmVnaXN0ZXJzKSwKKyAgICAgICAgbnVtYmVyT2ZTdGFja0J5dGVzVXNlZEZvclJlZ2lzdGVyUHJl c2VydmF0aW9uCisgICAgfTsKK30KKwogdm9pZCBBY2Nlc3NHZW5lcmF0aW9uU3RhdGU6OnJlc3Rv cmVMaXZlUmVnaXN0ZXJzRnJvbVN0YWNrRm9yQ2FsbFdpdGhUaHJvd25FeGNlcHRpb24oY29uc3Qg U3BpbGxTdGF0ZSYgc3BpbGxTdGF0ZSkKIHsKICAgICAvLyBFdmVuIGlmIHdlJ3JlIGEgZ2V0dGVy LCB3ZSBkb24ndCB3YW50IHRvIGlnbm9yZSB0aGUgcmVzdWx0IHZhbHVlIGxpa2Ugd2Ugbm9ybWFs bHkgZG8KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0Fj Y2Vzcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5 bW9ycGhpY0FjY2Vzcy5oCShyZXZpc2lvbiAyNjU5NTcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMjQ3LDYg KzI0Nyw3IEBAIHN0cnVjdCBBY2Nlc3NHZW5lcmF0aW9uU3RhdGUgewogICAgIGNvbnN0IFJlZ2lz dGVyU2V0JiBjYWxjdWxhdGVMaXZlUmVnaXN0ZXJzRm9yQ2FsbEFuZEV4Y2VwdGlvbkhhbmRsaW5n KCk7CiAKICAgICBTcGlsbFN0YXRlIHByZXNlcnZlTGl2ZVJlZ2lzdGVyc1RvU3RhY2tGb3JDYWxs KGNvbnN0IFJlZ2lzdGVyU2V0JiBleHRyYSA9IHsgfSk7CisgICAgU3BpbGxTdGF0ZSBwcmVzZXJ2 ZUxpdmVSZWdpc3RlcnNUb1N0YWNrRm9yQ2FsbFdpdGhvdXRFeGNlcHRpb25zKCk7CiAKICAgICB2 b2lkIHJlc3RvcmVMaXZlUmVnaXN0ZXJzRnJvbVN0YWNrRm9yQ2FsbFdpdGhUaHJvd25FeGNlcHRp b24oY29uc3QgU3BpbGxTdGF0ZSYpOwogICAgIHZvaWQgcmVzdG9yZUxpdmVSZWdpc3RlcnNGcm9t U3RhY2tGb3JDYWxsKGNvbnN0IFNwaWxsU3RhdGUmLCBjb25zdCBSZWdpc3RlclNldCYgZG9udFJl c3RvcmUgPSB7IH0pOwo= 406996 2020-08-20 18:41:42 -0700 2020-08-20 20:50:43 -0700 patch for landing c-backup.diff text/plain 5560 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjY1OTkyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDIwLTA4LTIwICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFJlcGxhY2UgSUMgb24gUHJveHkgbXVzdCB3cml0ZSBiYXJyaWVyIFByb3h5J3MgdGFyZ2V0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU3MjAKKwor ICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAgICAgIFRoZSBwdXRfYnlf aWQgb3Bjb2RlIGluIHRoZSBiYXNlbGluZSBhbmQgdGhlIERGRy9GVGwgd2lsbCBlbWl0IGEgd3Jp dGVCYXJyaWVyCisgICAgICAgIGFmdGVyIHRoZSBvcGVyYXRpb24gaXMgY29tcGxldGUuIEJ1dCBp dCBkb2VzIHRoaXMgdG8gdGhlIGJhc2Ugb2JqZWN0LiBJbiB0aGUKKyAgICAgICAgY2FzZSBvZiBh biBJQyB3aXRoIHRoZSBiYXNlIGFzIGEgUHJveHksIHdlJ3JlIG5vdCBhY3R1YWxseSBzdG9yaW5n IHRvIHRoZSBQcm94eSwgYnV0CisgICAgICAgIGluc3RlYWQsIHRoZSBQcm94eSdzIHRhcmdldC4g VGhpcyBwYXRjaCBtYWtlcyBpdCBzbyBvdXIgSUMgY29kZSB3cml0ZUJhcnJpZXJzCisgICAgICAg IHRoZSBQcm94eSdzIHRhcmdldC4gVGhpcyBmaXhlZCBhIGNyYXNoIHdoZW4gcnVubmluZyBTcGVl ZG9tZXRlcjIuCisKKyAgICAgICAgKiBieXRlY29kZS9BY2Nlc3NDYXNlLmNwcDoKKyAgICAgICAg KEpTQzo6QWNjZXNzQ2FzZTo6Y2FuUmVwbGFjZSBjb25zdCk6CisgICAgICAgIChKU0M6OkFjY2Vz c0Nhc2U6OmdlbmVyYXRlSW1wbCk6CisgICAgICAgICogYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nl c3MuY3BwOgorICAgICAgICAoSlNDOjpBY2Nlc3NHZW5lcmF0aW9uU3RhdGU6OnByZXNlcnZlTGl2 ZVJlZ2lzdGVyc1RvU3RhY2tGb3JDYWxsV2l0aG91dEV4Y2VwdGlvbnMpOgorICAgICAgICAqIGJ5 dGVjb2RlL1BvbHltb3JwaGljQWNjZXNzLmg6CisKIDIwMjAtMDgtMjAgIEFsZXhleSBTaHZheWth ICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAgICAgICAgIEludmFsaWQgZWFybHkgZXJyb3Jz IGZvciBjbGFzcyBtZXRob2RzIG5hbWVkICJjb25zdHJ1Y3RvciIgYW5kICJwcm90b3R5cGUiCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQWNjZXNzQ2FzZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0FjY2Vzc0Nhc2UuY3BwCShy ZXZpc2lvbiAyNjU5OTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQWNjZXNz Q2FzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxMyw3ICs1MTMsNiBAQCBib29sIEFjY2Vzc0Nh c2U6OmRvZXNDYWxscyhWTSYgdm0sIFZlY3RvCiAgICAgY2FzZSBEZWxldGVOb25Db25maWd1cmFi bGU6CiAgICAgY2FzZSBEZWxldGVNaXNzOgogICAgIGNhc2UgTG9hZDoKLSAgICBjYXNlIFJlcGxh Y2U6CiAgICAgY2FzZSBNaXNzOgogICAgIGNhc2UgR2V0R2V0dGVyOgogICAgIGNhc2UgSW50cmlu c2ljR2V0dGVyOgpAQCAtNTQ1LDYgKzU0NCw5IEBAIGJvb2wgQWNjZXNzQ2FzZTo6ZG9lc0NhbGxz KFZNJiB2bSwgVmVjdG8KICAgICBjYXNlIEluZGV4ZWRTdHJpbmdMb2FkOgogICAgICAgICBkb2Vz Q2FsbHMgPSBmYWxzZTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBSZXBsYWNlOgorICAgICAg ICBkb2VzQ2FsbHMgPSB2aWFQcm94eSgpOworICAgICAgICBicmVhazsKICAgICB9CiAKICAgICBp ZiAoZG9lc0NhbGxzICYmIGNlbGxzVG9NYXJrSWZEb2VzQ2FsbHMpIHsKQEAgLTU4MCw2ICs1ODIs OSBAQCBib29sIEFjY2Vzc0Nhc2U6OmNhblJlcGxhY2UoY29uc3QgQWNjZXNzCiAgICAgaWYgKG1f aWRlbnRpZmllciAhPSBvdGhlci5tX2lkZW50aWZpZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAorICAgIGlmICh2aWFQcm94eSgpICE9IG90aGVyLnZpYVByb3h5KCkpCisgICAgICAgIHJldHVy biBmYWxzZTsKKwogICAgIGF1dG8gY2hlY2tQb2x5UHJvdG9BbmRTdHJ1Y3R1cmUgPSBbJl0gewog ICAgICAgICBpZiAobV9wb2x5UHJvdG9BY2Nlc3NDaGFpbikgewogICAgICAgICAgICAgaWYgKCFv dGhlci5tX3BvbHlQcm90b0FjY2Vzc0NoYWluKQpAQCAtMTc3NSw2ICsxNzgwLDI3IEBAIHZvaWQg QWNjZXNzQ2FzZTo6Z2VuZXJhdGVJbXBsKEFjY2Vzc0dlbmUKICAgICAgICAgICAgICAgICBDQ2Fs bEhlbHBlcnM6OkFkZHJlc3MoCiAgICAgICAgICAgICAgICAgICAgIHNjcmF0Y2hHUFIsIG9mZnNl dEluQnV0dGVyZmx5KG1fb2Zmc2V0KSAqIHNpemVvZihKU1ZhbHVlKSkpOwogICAgICAgICB9CisK KyAgICAgICAgaWYgKHZpYVByb3h5KCkpIHsKKyAgICAgICAgICAgIENDYWxsSGVscGVyczo6SnVt cExpc3Qgc2tpcEJhcnJpZXI7CisgICAgICAgICAgICBza2lwQmFycmllci5hcHBlbmQoaml0LmJy YW5jaElmTm90Q2VsbCh2YWx1ZVJlZ3MpKTsKKyAgICAgICAgICAgIGlmICghaXNJbmxpbmVPZmZz ZXQobV9vZmZzZXQpKQorICAgICAgICAgICAgICAgIGppdC5sb2FkUHRyKENDYWxsSGVscGVyczo6 QWRkcmVzcyhiYXNlR1BSLCBKU1Byb3h5Ojp0YXJnZXRPZmZzZXQoKSksIHNjcmF0Y2hHUFIpOwor ICAgICAgICAgICAgc2tpcEJhcnJpZXIuYXBwZW5kKGppdC5iYXJyaWVyQnJhbmNoKHZtLCBzY3Jh dGNoR1BSLCBzY3JhdGNoR1BSKSk7CisKKyAgICAgICAgICAgIGppdC5sb2FkUHRyKENDYWxsSGVs cGVyczo6QWRkcmVzcyhiYXNlR1BSLCBKU1Byb3h5Ojp0YXJnZXRPZmZzZXQoKSksIHNjcmF0Y2hH UFIpOworICAgICAgICAgICAgYXV0byBzcGlsbFN0YXRlID0gc3RhdGUucHJlc2VydmVMaXZlUmVn aXN0ZXJzVG9TdGFja0ZvckNhbGxXaXRob3V0RXhjZXB0aW9ucygpOworICAgICAgICAgICAgaml0 LnNldHVwQXJndW1lbnRzPGRlY2x0eXBlKG9wZXJhdGlvbldyaXRlQmFycmllclNsb3dQYXRoKT4o Q0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tUHRyKCZ2bSksIHNjcmF0Y2hHUFIpOworICAgICAgICAg ICAgaml0LnByZXBhcmVDYWxsT3BlcmF0aW9uKHZtKTsKKyAgICAgICAgICAgIGF1dG8gb3BlcmF0 aW9uQ2FsbCA9IGppdC5jYWxsKE9wZXJhdGlvblB0clRhZyk7CisgICAgICAgICAgICBqaXQuYWRk TGlua1Rhc2soWz1dIChMaW5rQnVmZmVyJiBsaW5rQnVmZmVyKSB7CisgICAgICAgICAgICAgICAg bGlua0J1ZmZlci5saW5rKG9wZXJhdGlvbkNhbGwsIEZ1bmN0aW9uUHRyPE9wZXJhdGlvblB0clRh Zz4ob3BlcmF0aW9uV3JpdGVCYXJyaWVyU2xvd1BhdGgpKTsKKyAgICAgICAgICAgIH0pOworICAg ICAgICAgICAgc3RhdGUucmVzdG9yZUxpdmVSZWdpc3RlcnNGcm9tU3RhY2tGb3JDYWxsKHNwaWxs U3RhdGUpOworCisgICAgICAgICAgICBza2lwQmFycmllci5saW5rKCZqaXQpOworICAgICAgICB9 CisKICAgICAgICAgc3RhdGUuc3VjY2VlZCgpOwogICAgICAgICByZXR1cm47CiAgICAgfQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNjZXNzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBoaWNB Y2Nlc3MuY3BwCShyZXZpc2lvbiAyNjU5OTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjUsNiArMTI1 LDE5IEBAIGF1dG8gQWNjZXNzR2VuZXJhdGlvblN0YXRlOjpwcmVzZXJ2ZUxpdmUKICAgICB9Owog fQogCithdXRvIEFjY2Vzc0dlbmVyYXRpb25TdGF0ZTo6cHJlc2VydmVMaXZlUmVnaXN0ZXJzVG9T dGFja0ZvckNhbGxXaXRob3V0RXhjZXB0aW9ucygpIC0+IFNwaWxsU3RhdGUKK3sKKyAgICBSZWdp c3RlclNldCBsaXZlUmVnaXN0ZXJzID0gYWxsb2NhdG9yLT51c2VkUmVnaXN0ZXJzKCk7CisgICAg bGl2ZVJlZ2lzdGVycy5leGNsdWRlKGNhbGxlZVNhdmVSZWdpc3RlcnMoKSk7CisKKyAgICBjb25z dGV4cHIgdW5zaWduZWQgZXh0cmFTdGFja1BhZGRpbmcgPSAwOworICAgIHVuc2lnbmVkIG51bWJl ck9mU3RhY2tCeXRlc1VzZWRGb3JSZWdpc3RlclByZXNlcnZhdGlvbiA9IFNjcmF0Y2hSZWdpc3Rl ckFsbG9jYXRvcjo6cHJlc2VydmVSZWdpc3RlcnNUb1N0YWNrRm9yQ2FsbCgqaml0LCBsaXZlUmVn aXN0ZXJzLCBleHRyYVN0YWNrUGFkZGluZyk7CisgICAgcmV0dXJuIFNwaWxsU3RhdGUgeworICAg ICAgICBXVEZNb3ZlKGxpdmVSZWdpc3RlcnMpLAorICAgICAgICBudW1iZXJPZlN0YWNrQnl0ZXNV c2VkRm9yUmVnaXN0ZXJQcmVzZXJ2YXRpb24KKyAgICB9OworfQorCiB2b2lkIEFjY2Vzc0dlbmVy YXRpb25TdGF0ZTo6cmVzdG9yZUxpdmVSZWdpc3RlcnNGcm9tU3RhY2tGb3JDYWxsV2l0aFRocm93 bkV4Y2VwdGlvbihjb25zdCBTcGlsbFN0YXRlJiBzcGlsbFN0YXRlKQogewogICAgIC8vIEV2ZW4g aWYgd2UncmUgYSBnZXR0ZXIsIHdlIGRvbid0IHdhbnQgdG8gaWdub3JlIHRoZSByZXN1bHQgdmFs dWUgbGlrZSB3ZSBub3JtYWxseSBkbwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL1BvbHltb3JwaGljQWNjZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNjZXNzLmgJKHJldmlzaW9uIDI2NTk5MikKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNDcsNiArMjQ3LDcgQEAgc3RydWN0IEFjY2Vzc0dlbmVyYXRpb25TdGF0ZSB7 CiAgICAgY29uc3QgUmVnaXN0ZXJTZXQmIGNhbGN1bGF0ZUxpdmVSZWdpc3RlcnNGb3JDYWxsQW5k RXhjZXB0aW9uSGFuZGxpbmcoKTsKIAogICAgIFNwaWxsU3RhdGUgcHJlc2VydmVMaXZlUmVnaXN0 ZXJzVG9TdGFja0ZvckNhbGwoY29uc3QgUmVnaXN0ZXJTZXQmIGV4dHJhID0geyB9KTsKKyAgICBT cGlsbFN0YXRlIHByZXNlcnZlTGl2ZVJlZ2lzdGVyc1RvU3RhY2tGb3JDYWxsV2l0aG91dEV4Y2Vw dGlvbnMoKTsKIAogICAgIHZvaWQgcmVzdG9yZUxpdmVSZWdpc3RlcnNGcm9tU3RhY2tGb3JDYWxs V2l0aFRocm93bkV4Y2VwdGlvbihjb25zdCBTcGlsbFN0YXRlJik7CiAgICAgdm9pZCByZXN0b3Jl TGl2ZVJlZ2lzdGVyc0Zyb21TdGFja0ZvckNhbGwoY29uc3QgU3BpbGxTdGF0ZSYsIGNvbnN0IFJl Z2lzdGVyU2V0JiBkb250UmVzdG9yZSA9IHsgfSk7Cg==