212378 2020-05-26 09:14:56 -0700 IteratorClose should suppress GetMethod errors 2020-05-26 15:18:49 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED https://github.com/tc39/ecma262/pull/1408 InRadar P2 Minor --- 1 ashvayka ashvayka ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1656054 0 ashvayka 2020-05-26 09:14:56 -0700 IteratorClose should suppress GetMethod errors 1656058 1 400252 ashvayka 2020-05-26 09:17:57 -0700 Created attachment 400252 Patch 1656186 2 400252 keith_miller 2020-05-26 14:43:09 -0700 Comment on attachment 400252 Patch r=me. RE, Your offline question about whether emitIteratorGenericClose should take the label. I don't think it's too important either way and I could imagine other places where you don't want the label. I'd leave it as is. 1656202 3 ashvayka 2020-05-26 15:16:14 -0700 Committed r262165: <https://trac.webkit.org/changeset/262165> 1656205 4 webkit-bug-importer 2020-05-26 15:17:13 -0700 <rdar://problem/63644865> 1656206 5 ashvayka 2020-05-26 15:18:49 -0700 (In reply to Keith Miller from comment #2) > RE, Your offline question about whether emitIteratorGenericClose should take > the label. I don't think it's too important either way and I could imagine > other places where you don't want the label. I'd leave it as is. Thank you, Keith! 400252 2020-05-26 09:17:57 -0700 2020-05-26 14:43:09 -0700 Patch bug-212378-20200526191756.patch text/plain 9639 ashvayka SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNjIxNDQpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDIwLTA1LTI2ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNo QGdtYWlsLmNvbT4KKworICAgICAgICBJdGVyYXRvckNsb3NlIHNob3VsZCBzdXBwcmVzcyBHZXRN ZXRob2QgZXJyb3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTIzNzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHN0cmVzcy9jdXN0b20taXRlcmF0b3JzLmpzOgorICAgICAgICAqIHN0cmVzcy9pdGVy YXRvci1yZXR1cm4tYWJydXB0LWxvb2t1cC1idWlsdGlucy5qczogQWRkZWQuCisgICAgICAgICog dGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbDogTWFyayA0IHRlc3QgY2FzZXMgYXMgcGFzc2luZy4K KwogMjAyMC0wNS0yMyAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+CiAKICAgICAg ICAgW2JtYWxsb2NdIEZpeCBPT00gZXJyb3JzIG9uIE1JUFMgYWZ0ZXIgcjI2MTY2NwpJbmRleDog SlNUZXN0cy9zdHJlc3MvY3VzdG9tLWl0ZXJhdG9ycy5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKU1Rlc3Rz L3N0cmVzcy9jdXN0b20taXRlcmF0b3JzLmpzCShyZXZpc2lvbiAyNjIxMjcpCisrKyBKU1Rlc3Rz L3N0cmVzcy9jdXN0b20taXRlcmF0b3JzLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xMzUsNyArMTM1 LDcgQEAgdHJ5IHsKICAgICAgICAgdGhyb3cgIkVycm9yOiBUZXJtaW5hdGUgaXRlcmF0aW9uLiI7 CiAgICAgfQogfSBjYXRjaCAoZSkgewotICAgIGlmIChTdHJpbmcoZSkgIT09ICJFcnJvcjogbG9v a2luZyB1cCByZXR1cm4uIikKKyAgICBpZiAoU3RyaW5nKGUpICE9PSAiRXJyb3I6IFRlcm1pbmF0 ZSBpdGVyYXRpb24uIikKICAgICAgICAgdGhyb3cgZTsKIH0KIApJbmRleDogSlNUZXN0cy9zdHJl c3MvaXRlcmF0b3ItcmV0dXJuLWFicnVwdC1sb29rdXAtYnVpbHRpbnMuanMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gSlNUZXN0cy9zdHJlc3MvaXRlcmF0b3ItcmV0dXJuLWFicnVwdC1sb29rdXAtYnVpbHRpbnMu anMJKG5vbmV4aXN0ZW50KQorKysgSlNUZXN0cy9zdHJlc3MvaXRlcmF0b3ItcmV0dXJuLWFicnVw dC1sb29rdXAtYnVpbHRpbnMuanMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwyOCBAQAorZnVu Y3Rpb24gc2hvdWxkVGhyb3coZnVuYywgZXhwZWN0ZWRFcnJvcikgeworICAgIGxldCBhY3R1YWxF cnJvcjsKKyAgICB0cnkgeworICAgICAgICBmdW5jKCk7CisgICAgfSBjYXRjaCAoZXJyb3IpIHsK KyAgICAgICAgYWN0dWFsRXJyb3IgPSBlcnJvcjsKKyAgICB9CisgICAgaWYgKGFjdHVhbEVycm9y ICE9PSBleHBlY3RlZEVycm9yKQorICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYGJhZCBlcnJvcjog JHthY3R1YWxFcnJvcn1gKTsKK30KKworY29uc3QgaXRlciA9IHsKKyAgICBbU3ltYm9sLml0ZXJh dG9yXSgpIHsgcmV0dXJuIHRoaXM7IH0sCisgICAgbmV4dCgpIHsgcmV0dXJuIHsgdmFsdWU6IFtd LCBkb25lOiBmYWxzZSB9OyB9LAorICAgIGdldCByZXR1cm4oKSB7IHRocm93ICdyZXR1cm4nOyB9 LAorfTsKKworTWFwLnByb3RvdHlwZS5zZXQgPSAoKSA9PiB7IHRocm93ICdzZXQnOyB9OworU2V0 LnByb3RvdHlwZS5hZGQgPSAoKSA9PiB7IHRocm93ICdhZGQnOyB9OworV2Vha01hcC5wcm90b3R5 cGUuc2V0ID0gKCkgPT4geyB0aHJvdyAnc2V0JzsgfTsKK1dlYWtTZXQucHJvdG90eXBlLmFkZCA9 ICgpID0+IHsgdGhyb3cgJ2FkZCc7IH07CisKK2ZvciAobGV0IGkgPSAwOyBpIDwgMWU0OyArK2kp IHsKKyAgICBzaG91bGRUaHJvdygoKSA9PiBuZXcgTWFwKGl0ZXIpLCAnc2V0Jyk7CisgICAgc2hv dWxkVGhyb3coKCkgPT4gbmV3IFNldChpdGVyKSwgJ2FkZCcpOworICAgIHNob3VsZFRocm93KCgp ID0+IG5ldyBXZWFrTWFwKGl0ZXIpLCAnc2V0Jyk7CisgICAgc2hvdWxkVGhyb3coKCkgPT4gbmV3 IFdlYWtTZXQoaXRlciksICdhZGQnKTsKK30KSW5kZXg6IEpTVGVzdHMvdGVzdDI2Mi9leHBlY3Rh dGlvbnMueWFtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlh bWwJKHJldmlzaW9uIDI2MjEyNykKKysrIEpTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFt bAkod29ya2luZyBjb3B5KQpAQCAtMzI1OCw5ICszMjU4LDYgQEAgdGVzdC9sYW5ndWFnZS9zdGF0 ZW1lbnRzL2Zvci1hd2FpdC1vZi9hcwogICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjI6IFRoaXMgc3Rh dGVtZW50IHNob3VsZCBub3QgYmUgZXZhbHVhdGVkLicKIHRlc3QvbGFuZ3VhZ2Uvc3RhdGVtZW50 cy9mb3ItYXdhaXQtb2YvYXN5bmMtZnVuYy1kZWNsLWRzdHItYXJyYXktZWxlbS10YXJnZXQtc2lt cGxlLXN0cmljdC5qczoKICAgc3RyaWN0IG1vZGU6ICdUZXN0MjYyOiBUaGlzIHN0YXRlbWVudCBz aG91bGQgbm90IGJlIGV2YWx1YXRlZC4nCi10ZXN0L2xhbmd1YWdlL3N0YXRlbWVudHMvZm9yLWF3 YWl0LW9mL2l0ZXJhdG9yLWNsb3NlLXRocm93LWdldC1tZXRob2QtYWJydXB0LmpzOgotICBkZWZh dWx0OiAnVGVzdDI2MjpBc3luY1Rlc3RGYWlsdXJlOlRlc3QyNjJFcnJvcjogVGVzdDI2MkVycm9y OiBFeHBlY3RlZCBTYW1lVmFsdWUowqtmdW5jdGlvbiBPYmplY3QoKSB7JwotICBzdHJpY3QgbW9k ZTogJ1Rlc3QyNjI6QXN5bmNUZXN0RmFpbHVyZTpUZXN0MjYyRXJyb3I6IFRlc3QyNjJFcnJvcjog RXhwZWN0ZWQgU2FtZVZhbHVlKMKrZnVuY3Rpb24gT2JqZWN0KCkgeycKIHRlc3QvbGFuZ3VhZ2Uv c3RhdGVtZW50cy9mb3ItYXdhaXQtb2YvbGV0LWFycmF5LXdpdGgtbmV3bGluZS5qczoKICAgZGVm YXVsdDogJ1Rlc3QyNjI6IFRoaXMgc3RhdGVtZW50IHNob3VsZCBub3QgYmUgZXZhbHVhdGVkLicK IHRlc3QvbGFuZ3VhZ2Uvc3RhdGVtZW50cy9mb3ItYXdhaXQtb2YvdGlja3Mtd2l0aC1hc3luYy1p dGVyLXJlc29sdmVkLXByb21pc2UtYW5kLWNvbnN0cnVjdG9yLWxvb2t1cC10d28uanM6CkBAIC0z NDc1LDkgKzM0NzIsNiBAQCB0ZXN0L2xhbmd1YWdlL3N0YXRlbWVudHMvZm9yLW9mL2hlYWQtbGhz CiB0ZXN0L2xhbmd1YWdlL3N0YXRlbWVudHMvZm9yLW9mL2hlYWQtdmFyLW5vLWV4cHIuanM6CiAg IGRlZmF1bHQ6ICdUZXN0MjYyOiBUaGlzIHN0YXRlbWVudCBzaG91bGQgbm90IGJlIGV2YWx1YXRl ZC4nCiAgIHN0cmljdCBtb2RlOiAnVGVzdDI2MjogVGhpcyBzdGF0ZW1lbnQgc2hvdWxkIG5vdCBi ZSBldmFsdWF0ZWQuJwotdGVzdC9sYW5ndWFnZS9zdGF0ZW1lbnRzL2Zvci1vZi9pdGVyYXRvci1j bG9zZS10aHJvdy1nZXQtbWV0aG9kLWFicnVwdC5qczoKLSAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJv cjogRXhwZWN0ZWQgYSBUZXN0MjYyRXJyb3IgYnV0IGdvdCBhIE9iamVjdCcKLSAgc3RyaWN0IG1v ZGU6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIGEgVGVzdDI2MkVycm9yIGJ1dCBnb3QgYSBPYmpl Y3QnCiB0ZXN0L2xhbmd1YWdlL3N0YXRlbWVudHMvZm9yLW9mL2xldC1hcnJheS13aXRoLW5ld2xp bmUuanM6CiAgIGRlZmF1bHQ6ICdUZXN0MjYyOiBUaGlzIHN0YXRlbWVudCBzaG91bGQgbm90IGJl IGV2YWx1YXRlZC4nCiB0ZXN0L2xhbmd1YWdlL3N0YXRlbWVudHMvZm9yL2hlYWQtbGhzLWxldC5q czoKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjYyMTI3KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMx IEBACisyMDIwLTA1LTI2ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4K KworICAgICAgICBJdGVyYXRvckNsb3NlIHNob3VsZCBzdXBwcmVzcyBHZXRNZXRob2QgZXJyb3Jz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIzNzgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBh dGNoIGltcGxlbWVudHMgcmVjZW50IHNwZWMgY2hhbmdlIFsxXSB0aGF0IHByZXZlbnRzICJyZXR1 cm4iIG1ldGhvZCBsb29rdXAKKyAgICAgICAgZXJyb3IgZnJvbSBvdmVycmlkaW5nIG91dGVyIGV4 Y2VwdGlvbiwgYWxpZ25pbmcgSlNDIHdpdGggVjggYW5kIFNwaWRlck1vbmtleS4KKworICAgICAg ICBJdCBpcyBhY2NvbXBsaXNoZWQgYnkgbW92aW5nIHB1c2hUcnkoKSBiZWZvcmUgZW1pdEdldEJ5 SWQoKSBpbiBCeXRlY29kZUdlbmVyYXRvci5jcHAKKyAgICAgICAgYW5kIHJlbW92YWwgb2YgUkVU VVJOX0lGX0VYQ0VQVElPTiBpbiBJdGVyYXRvck9wZXJhdGlvbnMuY3BwLiBBbHNvLCB0aGlzIHBh dGNoCisgICAgICAgIHV0aWxpemVzIGVtaXRJdGVyYXRvckdlbmVyaWNDbG9zZSgpIHRvIGF2b2lk IGNvZGUgZHVwbGljYXRpb24uCisKKyAgICAgICAgQmVmb3JlIHRoaXMgcGF0Y2gsIEpTQyBwYXJ0 bHkgaW1wbGVtZW50ZWQgdGhlIHNwZWMgY2hhbmdlIFsxXSBieSBzdXBwcmVzc2luZyBUeXBlRXJy b3IKKyAgICAgICAgaWYgInJldHVybiIgbWV0aG9kIG9mIGl0ZXJhdG9yIHdhcyBub3QgY2FsbGFi bGUuCisKKyAgICAgICAgQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXREZWxlZ2F0ZVlpZWxkKCkgaXMg aW50ZW50aW9uYWxseSBsZWZ0IHVuY2hhbmdlZC4KKyAgICAgICAgZm9yL29mIG1pY3JvYmVuY2ht YXJrcyBhcmUgbmV1dHJhbC4KKworICAgICAgICBbMV06IGh0dHBzOi8vZ2l0aHViLmNvbS90YzM5 L2VjbWEyNjIvcHVsbC8xNDA4CisKKyAgICAgICAgKiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5l cmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdEdlbmVyaWNF bnVtZXJhdGlvbik6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0RW51bWVy YXRpb24pOgorICAgICAgICAqIHJ1bnRpbWUvSXRlcmF0b3JPcGVyYXRpb25zLmNwcDoKKyAgICAg ICAgKEpTQzo6aXRlcmF0b3JDbG9zZSk6CisKIDIwMjAtMDUtMjMgIFBhdWxvIE1hdG9zICA8cG1h dG9zQGlnYWxpYS5jb20+CiAKICAgICAgICAgRml4IG5vbi11bmlmaWVkIGJ1aWxkcyBmb3IgeDg2 XzY0CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2Vu ZXJhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBp bGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcAkocmV2aXNpb24gMjYyMTI3KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQwODIsMjYgKzQwODIsMTIgQEAgdm9pZCBCeXRlY29kZUdlbmVyYXRvcjo6ZW1p dEdlbmVyaWNFbnVtZQogICAgICAgICAgICAgZW1pdExhYmVsKGZpbmFsbHlCb2R5TGFiZWwuZ2V0 KCkpOwogICAgICAgICAgICAgcmVzdG9yZVNjb3BlUmVnaXN0ZXIoKTsKIAotICAgICAgICAgICAg UmVmPExhYmVsPiBmaW5hbGx5RG9uZSA9IG5ld0xhYmVsKCk7Ci0KLSAgICAgICAgICAgIFJlZlB0 cjxSZWdpc3RlcklEPiByZXR1cm5NZXRob2QgPSBlbWl0R2V0QnlJZChuZXdUZW1wb3JhcnkoKSwg aXRlcmF0b3IuZ2V0KCksIHByb3BlcnR5TmFtZXMoKS5yZXR1cm5LZXl3b3JkKTsKLSAgICAgICAg ICAgIGVtaXRKdW1wSWZUcnVlKGVtaXRJc1VuZGVmaW5lZChuZXdUZW1wb3JhcnkoKSwgcmV0dXJu TWV0aG9kLmdldCgpKSwgZmluYWxseURvbmUuZ2V0KCkpOwotCiAgICAgICAgICAgICBSZWY8TGFi ZWw+IHJldHVybkNhbGxUcnlTdGFydCA9IG5ld0xhYmVsKCk7CiAgICAgICAgICAgICBlbWl0TGFi ZWwocmV0dXJuQ2FsbFRyeVN0YXJ0LmdldCgpKTsKICAgICAgICAgICAgIFRyeURhdGEqIHJldHVy bkNhbGxUcnlEYXRhID0gcHVzaFRyeShyZXR1cm5DYWxsVHJ5U3RhcnQuZ2V0KCksIGNhdGNoTGFi ZWwuZ2V0KCksIEhhbmRsZXJUeXBlOjpTeW50aGVzaXplZENhdGNoKTsKIAotICAgICAgICAgICAg Q2FsbEFyZ3VtZW50cyByZXR1cm5Bcmd1bWVudHMoKnRoaXMsIG51bGxwdHIpOwotICAgICAgICAg ICAgbW92ZShyZXR1cm5Bcmd1bWVudHMudGhpc1JlZ2lzdGVyKCksIGl0ZXJhdG9yLmdldCgpKTsK LSAgICAgICAgICAgIGVtaXRDYWxsKHZhbHVlLmdldCgpLCByZXR1cm5NZXRob2QuZ2V0KCksIE5v RXhwZWN0ZWRGdW5jdGlvbiwgcmV0dXJuQXJndW1lbnRzLCBub2RlLT5kaXZvdCgpLCBub2RlLT5k aXZvdFN0YXJ0KCksIG5vZGUtPmRpdm90RW5kKCksIERlYnVnZ2FibGVDYWxsOjpObyk7Ci0KLSAg ICAgICAgICAgIGlmIChpc0ZvckF3YWl0KQotICAgICAgICAgICAgICAgIGVtaXRBd2FpdCh2YWx1 ZS5nZXQoKSk7Ci0KLSAgICAgICAgICAgIGVtaXRKdW1wSWZUcnVlKGVtaXRJc09iamVjdChuZXdU ZW1wb3JhcnkoKSwgdmFsdWUuZ2V0KCkpLCBmaW5hbGx5RG9uZS5nZXQoKSk7Ci0gICAgICAgICAg ICBlbWl0VGhyb3dUeXBlRXJyb3IoIkl0ZXJhdG9yIHJlc3VsdCBpbnRlcmZhY2UgaXMgbm90IGFu IG9iamVjdC4iX3MpOwotCi0gICAgICAgICAgICBlbWl0TGFiZWwoZmluYWxseURvbmUuZ2V0KCkp OworICAgICAgICAgICAgZW1pdEl0ZXJhdG9yR2VuZXJpY0Nsb3NlKGl0ZXJhdG9yLmdldCgpLCBu b2RlLCBzaG91bGRFbWl0QXdhaXQpOworICAgICAgICAgICAgUmVmPExhYmVsPiBmaW5hbGx5RG9u ZSA9IG5ld0VtaXR0ZWRMYWJlbCgpOwogICAgICAgICAgICAgZW1pdEZpbmFsbHlDb21wbGV0aW9u KGZpbmFsbHlDb250ZXh0LCBlbmRDYXRjaExhYmVsLmdldCgpKTsKIAogICAgICAgICAgICAgcG9w VHJ5KHJldHVybkNhbGxUcnlEYXRhLCBmaW5hbGx5RG9uZS5nZXQoKSk7CkBAIC00MjM4LDIzICs0 MjI0LDEyIEBAIHZvaWQgQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRFbnVtZXJhdGlvbigKICAgICAg ICAgICAgIGVtaXRMYWJlbChmaW5hbGx5Qm9keUxhYmVsLmdldCgpKTsKICAgICAgICAgICAgIHJl c3RvcmVTY29wZVJlZ2lzdGVyKCk7CiAKLSAgICAgICAgICAgIFJlZjxMYWJlbD4gZmluYWxseURv bmUgPSBuZXdMYWJlbCgpOwotCi0gICAgICAgICAgICBSZWZQdHI8UmVnaXN0ZXJJRD4gcmV0dXJu TWV0aG9kID0gZW1pdEdldEJ5SWQobmV3VGVtcG9yYXJ5KCksIGl0ZXJhdG9yLmdldCgpLCBwcm9w ZXJ0eU5hbWVzKCkucmV0dXJuS2V5d29yZCk7Ci0gICAgICAgICAgICBlbWl0SnVtcElmVHJ1ZShl bWl0SXNVbmRlZmluZWQobmV3VGVtcG9yYXJ5KCksIHJldHVybk1ldGhvZC5nZXQoKSksIGZpbmFs bHlEb25lLmdldCgpKTsKLQogICAgICAgICAgICAgUmVmPExhYmVsPiByZXR1cm5DYWxsVHJ5U3Rh cnQgPSBuZXdMYWJlbCgpOwogICAgICAgICAgICAgZW1pdExhYmVsKHJldHVybkNhbGxUcnlTdGFy dC5nZXQoKSk7CiAgICAgICAgICAgICBUcnlEYXRhKiByZXR1cm5DYWxsVHJ5RGF0YSA9IHB1c2hU cnkocmV0dXJuQ2FsbFRyeVN0YXJ0LmdldCgpLCBjYXRjaExhYmVsLmdldCgpLCBIYW5kbGVyVHlw ZTo6U3ludGhlc2l6ZWRDYXRjaCk7CiAKLSAgICAgICAgICAgIENhbGxBcmd1bWVudHMgcmV0dXJu QXJndW1lbnRzKCp0aGlzLCBudWxscHRyKTsKLSAgICAgICAgICAgIG1vdmUocmV0dXJuQXJndW1l bnRzLnRoaXNSZWdpc3RlcigpLCBpdGVyYXRvci5nZXQoKSk7Ci0gICAgICAgICAgICBlbWl0Q2Fs bCh2YWx1ZS5nZXQoKSwgcmV0dXJuTWV0aG9kLmdldCgpLCBOb0V4cGVjdGVkRnVuY3Rpb24sIHJl dHVybkFyZ3VtZW50cywgbm9kZS0+ZGl2b3QoKSwgbm9kZS0+ZGl2b3RTdGFydCgpLCBub2RlLT5k aXZvdEVuZCgpLCBEZWJ1Z2dhYmxlQ2FsbDo6Tm8pOwotCi0gICAgICAgICAgICBlbWl0SnVtcElm VHJ1ZShlbWl0SXNPYmplY3QobmV3VGVtcG9yYXJ5KCksIHZhbHVlLmdldCgpKSwgZmluYWxseURv bmUuZ2V0KCkpOwotICAgICAgICAgICAgZW1pdFRocm93VHlwZUVycm9yKCJJdGVyYXRvciByZXN1 bHQgaW50ZXJmYWNlIGlzIG5vdCBhbiBvYmplY3QuIl9zKTsKLQotICAgICAgICAgICAgZW1pdExh YmVsKGZpbmFsbHlEb25lLmdldCgpKTsKKyAgICAgICAgICAgIGVtaXRJdGVyYXRvckdlbmVyaWND bG9zZShpdGVyYXRvci5nZXQoKSwgbm9kZSwgRW1pdEF3YWl0OjpObyk7CisgICAgICAgICAgICBS ZWY8TGFiZWw+IGZpbmFsbHlEb25lID0gbmV3RW1pdHRlZExhYmVsKCk7CiAgICAgICAgICAgICBl bWl0RmluYWxseUNvbXBsZXRpb24oZmluYWxseUNvbnRleHQsIGVuZENhdGNoTGFiZWwuZ2V0KCkp OwogCiAgICAgICAgICAgICBwb3BUcnkocmV0dXJuQ2FsbFRyeURhdGEsIGZpbmFsbHlEb25lLmdl dCgpKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0l0ZXJhdG9yT3BlcmF0 aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSXRl cmF0b3JPcGVyYXRpb25zLmNwcAkocmV2aXNpb24gMjYyMTI3KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSXRlcmF0b3JPcGVyYXRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAt OTMsMTAgKzkzLDkgQEAgdm9pZCBpdGVyYXRvckNsb3NlKEpTR2xvYmFsT2JqZWN0KiBnbG9iYQog ICAgICAgICBleGNlcHRpb24gPSBjYXRjaFNjb3BlLmV4Y2VwdGlvbigpOwogICAgICAgICBjYXRj aFNjb3BlLmNsZWFyRXhjZXB0aW9uKCk7CiAgICAgfQotICAgIEpTVmFsdWUgcmV0dXJuRnVuY3Rp b24gPSBpdGVyYXRpb25SZWNvcmQuaXRlcmF0b3IuZ2V0KGdsb2JhbE9iamVjdCwgdm0ucHJvcGVy dHlOYW1lcy0+cmV0dXJuS2V5d29yZCk7Ci0gICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Nj b3BlLCB2b2lkKCkpOwogCi0gICAgaWYgKHJldHVybkZ1bmN0aW9uLmlzVW5kZWZpbmVkKCkpIHsK KyAgICBKU1ZhbHVlIHJldHVybkZ1bmN0aW9uID0gaXRlcmF0aW9uUmVjb3JkLml0ZXJhdG9yLmdl dChnbG9iYWxPYmplY3QsIHZtLnByb3BlcnR5TmFtZXMtPnJldHVybktleXdvcmQpOworICAgIGlm IChVTkxJS0VMWSh0aHJvd1Njb3BlLmV4Y2VwdGlvbigpKSB8fCByZXR1cm5GdW5jdGlvbi5pc1Vu ZGVmaW5lZCgpKSB7CiAgICAgICAgIGlmIChleGNlcHRpb24pCiAgICAgICAgICAgICB0aHJvd0V4 Y2VwdGlvbihnbG9iYWxPYmplY3QsIHRocm93U2NvcGUsIGV4Y2VwdGlvbik7CiAgICAgICAgIHJl dHVybjsK