223432 2021-03-18 03:02:59 -0700 [JSC] Use helper method when possible to store data in the callframe header 2021-03-29 16:21:59 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 221260 1 xan.lopez webkit-unassigned ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer xan.lopez ysuzuki oldest_to_newest 1741120 0 xan.lopez 2021-03-18 03:02:59 -0700 A few places in wasm/ where this can be done, which will make the 32bit support patch a tiny bit smaller. 1741123 1 423578 xan.lopez 2021-03-18 03:11:41 -0700 Created attachment 423578 Use helper method to store data in callframe header, v1 1743708 2 webkit-bug-importer 2021-03-25 03:03:13 -0700 <rdar://problem/75829344> 1744977 3 ews-feeder 2021-03-29 16:21:57 -0700 Committed r275190: <https://commits.webkit.org/r275190> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423578. 423578 2021-03-18 03:11:41 -0700 2021-03-29 16:21:58 -0700 Use helper method to store data in callframe header, v1 0001-JSC-Use-helper-method-when-possible-to-store-data-in.patch text/plain 10529 xan.lopez RnJvbSA4NDYzM2IwMjRhMmNjYzRjNjRiMjJmMDZmNDhiMTk2ODZiZTIwNWJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/WGFuPTIwTD1DMz1CM3Blej89IDx4YW5AaWdh bGlhLmNvbT4KRGF0ZTogVGh1LCAxOCBNYXIgMjAyMSAwOTo1NjoxNCArMDEwMApTdWJqZWN0OiBb UEFUQ0hdIFtKU0NdIFVzZSBoZWxwZXIgbWV0aG9kIHdoZW4gcG9zc2libGUgdG8gc3RvcmUgZGF0 YSBpbiB0aGUKIGNhbGxmcmFtZSBoZWFkZXIgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyMzQzMgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpBIGJ1bmNoIG9m IHRoZSBkaXJlY3Qgc3RvcmVzIHRvIHRoZSBjYWxsZnJhbWUgaGVhZGVyIGFyZSB6ZXJvaW5nCm91 dCB0aGUgY29kZWJsb2NrIHNsb3QuIENyZWF0ZSBhIGhlbHBlciBtZXRob2QgdG8gZG8gdGhhdCBh bmQgdXNlCml0IGFjY29yZGluZ2x5LiBGb3IgdGhlIHJlc3QsIHVzZSBlbWl0UHV0VG9DYWxsRnJh bWVIZWFkZXIsIHdoaWNoCmFscmVhZHkgZG9lcyB0aGUgcmlnaHQgdGhpbmcuIEFsc28sIHJlbW92 ZSBhIGxvdCBvZiB1bnVzZWQgaGVscGVyCm1ldGhvZHMgaW4gQXNzZW1ibHlIZWxwZXJzICh3aGlj aCBoYXZlIGJlZW4gdXBkYXRlZCBmb3Igbm8gcmVhc29uCnRocm91Z2hvdXQgdGhlIHllYXJzKS4K Ciogaml0L0Fzc2VtYmx5SGVscGVycy5oOgooSlNDOjpBc3NlbWJseUhlbHBlcnM6OmVtaXRQdXRU b0NhbGxGcmFtZUhlYWRlckJlZm9yZVByb2xvZ3VlKTogRGVsZXRlZC4KKEpTQzo6QXNzZW1ibHlI ZWxwZXJzOjplbWl0UHV0UGF5bG9hZFRvQ2FsbEZyYW1lSGVhZGVyQmVmb3JlUHJvbG9ndWUpOiBE ZWxldGVkLgooSlNDOjpBc3NlbWJseUhlbHBlcnM6OmVtaXRQdXRUYWdUb0NhbGxGcmFtZUhlYWRl ckJlZm9yZVByb2xvZ3VlKTogRGVsZXRlZC4KKiB3YXNtL2pzL0pTVG9XYXNtLmNwcDoKKEpTQzo6 V2FzbTo6Y3JlYXRlSlNUb1dhc21XcmFwcGVyKToKKiB3YXNtL2pzL1dhc21Ub0pTLmNwcDoKKEpT Qzo6V2FzbTo6d2FzbVRvSlMpOgoqIHdhc20vanMvV2ViQXNzZW1ibHlGdW5jdGlvbi5jcHA6CihK U0M6OldlYkFzc2VtYmx5RnVuY3Rpb246OmpzQ2FsbEVudHJ5cG9pbnRTbG93KToKLS0tCiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgfCAyNSArKysrKysrKysK IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQXNzZW1ibHlIZWxwZXJzLmggICB8IDU0ICsrLS0t LS0tLS0tLS0tLS0tLS0KIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTVG9XYXNtLmNw cCAgICB8ICA0ICstCiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XYXNtVG9KUy5jcHAg ICAgfCAgNCArLQogLi4uL3dhc20vanMvV2ViQXNzZW1ibHlGdW5jdGlvbi5jcHAgICAgICAgICAg IHwgIDIgKy0KIDUgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgNTUgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggODZiNmQ0YTRkOTRjLi5mMTNmYjVlZDQw MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAzLTE4 ICBYYW4gTMOzcGV6ICA8eGFuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0pTQ10gVXNlIGhlbHBl ciBtZXRob2Qgd2hlbiBwb3NzaWJsZSB0byBzdG9yZSBkYXRhIGluIHRoZSBjYWxsZnJhbWUgaGVh ZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM0 MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBIGJ1 bmNoIG9mIHRoZSBkaXJlY3Qgc3RvcmVzIHRvIHRoZSBjYWxsZnJhbWUgaGVhZGVyIGFyZSB6ZXJv aW5nCisgICAgICAgIG91dCB0aGUgY29kZWJsb2NrIHNsb3QuIENyZWF0ZSBhIGhlbHBlciBtZXRo b2QgdG8gZG8gdGhhdCBhbmQgdXNlCisgICAgICAgIGl0IGFjY29yZGluZ2x5LiBGb3IgdGhlIHJl c3QsIHVzZSBlbWl0UHV0VG9DYWxsRnJhbWVIZWFkZXIsIHdoaWNoCisgICAgICAgIGFscmVhZHkg ZG9lcyB0aGUgcmlnaHQgdGhpbmcuIEFsc28sIHJlbW92ZSBhIGxvdCBvZiB1bnVzZWQgaGVscGVy CisgICAgICAgIG1ldGhvZHMgaW4gQXNzZW1ibHlIZWxwZXJzICh3aGljaCBoYXZlIGJlZW4gdXBk YXRlZCBmb3Igbm8gcmVhc29uCisgICAgICAgIHRocm91Z2hvdXQgdGhlIHllYXJzKS4KKworICAg ICAgICAqIGppdC9Bc3NlbWJseUhlbHBlcnMuaDoKKyAgICAgICAgKEpTQzo6QXNzZW1ibHlIZWxw ZXJzOjplbWl0UHV0VG9DYWxsRnJhbWVIZWFkZXJCZWZvcmVQcm9sb2d1ZSk6IERlbGV0ZWQuCisg ICAgICAgIChKU0M6OkFzc2VtYmx5SGVscGVyczo6ZW1pdFB1dFBheWxvYWRUb0NhbGxGcmFtZUhl YWRlckJlZm9yZVByb2xvZ3VlKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6QXNzZW1ibHlIZWxw ZXJzOjplbWl0UHV0VGFnVG9DYWxsRnJhbWVIZWFkZXJCZWZvcmVQcm9sb2d1ZSk6IERlbGV0ZWQu CisgICAgICAgICogd2FzbS9qcy9KU1RvV2FzbS5jcHA6CisgICAgICAgIChKU0M6Oldhc206OmNy ZWF0ZUpTVG9XYXNtV3JhcHBlcik6CisgICAgICAgICogd2FzbS9qcy9XYXNtVG9KUy5jcHA6Cisg ICAgICAgIChKU0M6Oldhc206Ondhc21Ub0pTKToKKyAgICAgICAgKiB3YXNtL2pzL1dlYkFzc2Vt Ymx5RnVuY3Rpb24uY3BwOgorICAgICAgICAoSlNDOjpXZWJBc3NlbWJseUZ1bmN0aW9uOjpqc0Nh bGxFbnRyeXBvaW50U2xvdyk6CisKIDIwMjEtMDMtMTcgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtp cnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAgIFtKU0NdIEVycm9yI2NhdXNlIHNob3VsZCBhcHBs eSB0byBXZWJBc3NlbWJseSBlcnJvciBjb25zdHJ1Y3RvcnMgdG9vCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0Fzc2VtYmx5SGVscGVycy5oIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9Bc3NlbWJseUhlbHBlcnMuaAppbmRleCBmMjFmNmVkNTNjYjUuLmIyZjA1OWJh MjA1YiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9Bc3NlbWJseUhlbHBl cnMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0Fzc2VtYmx5SGVscGVycy5oCkBA IC02ODcsMTggKzY4Nyw3IEBAIHB1YmxpYzoKICAgICAgICAgQVNTRVJUKGVudHJ5LmlzSGVhZGVy KCkpOwogICAgICAgICBsb2FkUHRyKEFkZHJlc3MoZnJvbSwgZW50cnkub2Zmc2V0KCkgKiBzaXpl b2YoUmVnaXN0ZXIpKSwgdG8pOwogICAgIH0KLSAgICB2b2lkIGVtaXRHZXRGcm9tQ2FsbEZyYW1l SGVhZGVyMzIoVmlydHVhbFJlZ2lzdGVyIGVudHJ5LCBHUFJSZWcgdG8sIEdQUlJlZyBmcm9tID0g R1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIpCi0gICAgewotICAgICAgICBBU1NFUlQoZW50cnku aXNIZWFkZXIoKSk7Ci0gICAgICAgIGxvYWQzMihBZGRyZXNzKGZyb20sIGVudHJ5Lm9mZnNldCgp ICogc2l6ZW9mKFJlZ2lzdGVyKSksIHRvKTsKLSAgICB9Ci0jaWYgVVNFKEpTVkFMVUU2NCkKLSAg ICB2b2lkIGVtaXRHZXRGcm9tQ2FsbEZyYW1lSGVhZGVyNjQoVmlydHVhbFJlZ2lzdGVyIGVudHJ5 LCBHUFJSZWcgdG8sIEdQUlJlZyBmcm9tID0gR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIpCi0g ICAgewotICAgICAgICBBU1NFUlQoZW50cnkuaXNIZWFkZXIoKSk7Ci0gICAgICAgIGxvYWQ2NChB ZGRyZXNzKGZyb20sIGVudHJ5Lm9mZnNldCgpICogc2l6ZW9mKFJlZ2lzdGVyKSksIHRvKTsKLSAg ICB9Ci0jZW5kaWYgLy8gVVNFKEpTVkFMVUU2NCkKKwogICAgIHZvaWQgZW1pdFB1dFRvQ2FsbEZy YW1lSGVhZGVyKEdQUlJlZyBmcm9tLCBWaXJ0dWFsUmVnaXN0ZXIgZW50cnkpCiAgICAgewogICAg ICAgICBBU1NFUlQoZW50cnkuaXNIZWFkZXIoKSk7CkBAIC03MTEsNDcgKzcwMCwxMiBAQCBwdWJs aWM6CiAgICAgICAgIHN0b3JlUHRyKFRydXN0ZWRJbW1QdHIodmFsdWUpLCBBZGRyZXNzKEdQUklu Zm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBlbnRyeS5vZmZzZXQoKSAqIHNpemVvZihSZWdpc3Rlcikp KTsKICAgICB9CiAKLSAgICB2b2lkIGVtaXRHZXRDYWxsZXJGcmFtZUZyb21DYWxsRnJhbWVIZWFk ZXJQdHIoUmVnaXN0ZXJJRCB0bykKLSAgICB7Ci0gICAgICAgIGxvYWRQdHIoQWRkcmVzcyhHUFJJ bmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgQ2FsbEZyYW1lOjpjYWxsZXJGcmFtZU9mZnNldCgpKSwg dG8pOwotICAgIH0KLSAgICB2b2lkIGVtaXRQdXRDYWxsZXJGcmFtZVRvQ2FsbEZyYW1lSGVhZGVy KFJlZ2lzdGVySUQgZnJvbSkKLSAgICB7Ci0gICAgICAgIHN0b3JlUHRyKGZyb20sIEFkZHJlc3Mo R1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIENhbGxGcmFtZTo6Y2FsbGVyRnJhbWVPZmZzZXQo KSkpOwotICAgIH0KLQotICAgIHZvaWQgZW1pdFB1dFJldHVyblBDVG9DYWxsRnJhbWVIZWFkZXIo UmVnaXN0ZXJJRCBmcm9tKQorICAgIHZvaWQgZW1pdFplcm9Ub0NhbGxGcmFtZUhlYWRlcihWaXJ0 dWFsUmVnaXN0ZXIgZW50cnkpCiAgICAgewotICAgICAgICBzdG9yZVB0cihmcm9tLCBBZGRyZXNz KEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBDYWxsRnJhbWU6OnJldHVyblBDT2Zmc2V0KCkp KTsKLSAgICB9Ci0gICAgdm9pZCBlbWl0UHV0UmV0dXJuUENUb0NhbGxGcmFtZUhlYWRlcihUcnVz dGVkSW1tUHRyIGZyb20pCi0gICAgewotICAgICAgICBzdG9yZVB0cihmcm9tLCBBZGRyZXNzKEdQ UkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBDYWxsRnJhbWU6OnJldHVyblBDT2Zmc2V0KCkpKTsK LSAgICB9Ci0KLSAgICAvLyBlbWl0UHV0VG9DYWxsRnJhbWVIZWFkZXJCZWZvcmVQcm9sb2d1ZSgp IGFuZCByZWxhdGVkIGFyZSB1c2VkIHRvIGFjY2VzcyBjYWxsZWUgZnJhbWUgaGVhZGVyCi0gICAg Ly8gZmllbGRzIGJlZm9yZSB0aGUgY29kZSBmcm9tIGVtaXRGdW5jdGlvblByb2xvZ3VlKCkgaGFz IGV4ZWN1dGVkLgotICAgIC8vIEZpcnN0LCB0aGUgYWNjZXNzIGlzIHZpYSB0aGUgc3RhY2sgcG9p bnRlci4gU2Vjb25kLCB0aGUgYWRkcmVzcyBjYWxjdWxhdGlvbiBtdXN0IGFsc28gdGFrZQotICAg IC8vIGludG8gYWNjb3VudCB0aGF0IHRoZSBzdGFjayBwb2ludGVyIG1heSBub3QgaGF2ZSBiZWVu IGFkanVzdGVkIGRvd24gZm9yIHRoZSByZXR1cm4gUEMgYW5kL29yCi0gICAgLy8gY2FsbGVyJ3Mg ZnJhbWUgcG9pbnRlci4gT24gc29tZSBwbGF0Zm9ybXMsIHRoZSBjYWxsZWUgaXMgcmVzcG9uc2li bGUgZm9yIHB1c2hpbmcgdGhlCi0gICAgLy8gImxpbmsgcmVnaXN0ZXIiIGNvbnRhaW5pbmcgdGhl IHJldHVybiBhZGRyZXNzIGluIHRoZSBmdW5jdGlvbiBwcm9sb2d1ZS4KLSNpZiBVU0UoSlNWQUxV RTY0KQotICAgIHZvaWQgZW1pdFB1dFRvQ2FsbEZyYW1lSGVhZGVyQmVmb3JlUHJvbG9ndWUoR1BS UmVnIGZyb20sIFZpcnR1YWxSZWdpc3RlciBlbnRyeSkKLSAgICB7Ci0gICAgICAgIHN0b3JlUHRy KGZyb20sIEFkZHJlc3Moc3RhY2tQb2ludGVyUmVnaXN0ZXIsIGVudHJ5Lm9mZnNldCgpICogc3Rh dGljX2Nhc3Q8cHRyZGlmZl90PihzaXplb2YoUmVnaXN0ZXIpKSAtIHByb2xvZ3VlU3RhY2tQb2lu dGVyRGVsdGEoKSkpOwotICAgIH0KLSNlbHNlCi0gICAgdm9pZCBlbWl0UHV0UGF5bG9hZFRvQ2Fs bEZyYW1lSGVhZGVyQmVmb3JlUHJvbG9ndWUoR1BSUmVnIGZyb20sIFZpcnR1YWxSZWdpc3RlciBl bnRyeSkKLSAgICB7Ci0gICAgICAgIHN0b3JlUHRyKGZyb20sIEFkZHJlc3Moc3RhY2tQb2ludGVy UmVnaXN0ZXIsIGVudHJ5Lm9mZnNldCgpICogc3RhdGljX2Nhc3Q8cHRyZGlmZl90PihzaXplb2Yo UmVnaXN0ZXIpKSAtIHByb2xvZ3VlU3RhY2tQb2ludGVyRGVsdGEoKSArIE9CSkVDVF9PRkZTRVRP RihFbmNvZGVkVmFsdWVEZXNjcmlwdG9yLCBhc0JpdHMucGF5bG9hZCkpKTsKKyAgICAgICAgQVNT RVJUKGVudHJ5LmlzSGVhZGVyKCkpOworICAgICAgICBzdG9yZVB0cihUcnVzdGVkSW1tUHRyKG51 bGxwdHIpLCBBZGRyZXNzKEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBlbnRyeS5vZmZzZXQo KSAqIHNpemVvZihSZWdpc3RlcikpKTsKICAgICB9CiAKLSAgICB2b2lkIGVtaXRQdXRUYWdUb0Nh bGxGcmFtZUhlYWRlckJlZm9yZVByb2xvZ3VlKFRydXN0ZWRJbW0zMiB0YWcsIFZpcnR1YWxSZWdp c3RlciBlbnRyeSkKLSAgICB7Ci0gICAgICAgIHN0b3JlUHRyKHRhZywgQWRkcmVzcyhzdGFja1Bv aW50ZXJSZWdpc3RlciwgZW50cnkub2Zmc2V0KCkgKiBzdGF0aWNfY2FzdDxwdHJkaWZmX3Q+KHNp emVvZihSZWdpc3RlcikpIC0gcHJvbG9ndWVTdGFja1BvaW50ZXJEZWx0YSgpICsgT0JKRUNUX09G RlNFVE9GKEVuY29kZWRWYWx1ZURlc2NyaXB0b3IsIGFzQml0cy50YWcpKSk7Ci0gICAgfQotI2Vu ZGlmCi0gICAgCiAgICAgSnVtcExpc3QgYnJhbmNoSWZOb3RFcXVhbChKU1ZhbHVlUmVncyByZWdz LCBKU1ZhbHVlIHZhbHVlKQogICAgIHsKICNpZiBVU0UoSlNWQUxVRTY0KQpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNUb1dhc20uY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3dhc20vanMvSlNUb1dhc20uY3BwCmluZGV4IDUxNjk2MmI1OWEyOC4uODRkMDIy NWRjYzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9KU1RvV2Fz bS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNUb1dhc20uY3BwCkBA IC0xNzYsOSArMTc2LDkgQEAgc3RkOjp1bmlxdWVfcHRyPEludGVybmFsRnVuY3Rpb24+IGNyZWF0 ZUpTVG9XYXNtV3JhcHBlcihDQ2FsbEhlbHBlcnMmIGppdCwgY29uc3QKICAgICBqaXQuZW1pdEZ1 bmN0aW9uUHJvbG9ndWUoKTsKIAogICAgIC8vIEZJWE1FIFN0b3AgdXNpbmcgMCBhcyBjb2RlQmxv Y2tzLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1MzIxCi0gICAg aml0LnN0b3JlNjQoQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tNjQoMCksIENDYWxsSGVscGVyczo6 QWRkcmVzcyhHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgQ2FsbEZyYW1lU2xvdDo6Y29kZUJs b2NrICogc3RhdGljX2Nhc3Q8aW50PihzaXplb2YoUmVnaXN0ZXIpKSkpOworICAgIGppdC5lbWl0 WmVyb1RvQ2FsbEZyYW1lSGVhZGVyKENhbGxGcmFtZVNsb3Q6OmNvZGVCbG9jayk7CiAgICAgTWFj cm9Bc3NlbWJsZXI6OkRhdGFMYWJlbFB0ciBjYWxsZWVNb3ZlTG9jYXRpb24gPSBqaXQubW92ZVdp dGhQYXRjaChNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cihudWxscHRyKSwgR1BSSW5mbzo6 bm9uUHJlc2VydmVkTm9uUmV0dXJuR1BSKTsKLSAgICBqaXQuc3RvcmVQdHIoR1BSSW5mbzo6bm9u UHJlc2VydmVkTm9uUmV0dXJuR1BSLCBDQ2FsbEhlbHBlcnM6OkFkZHJlc3MoR1BSSW5mbzo6Y2Fs bEZyYW1lUmVnaXN0ZXIsIENhbGxGcmFtZVNsb3Q6OmNhbGxlZSAqIHN0YXRpY19jYXN0PGludD4o c2l6ZW9mKFJlZ2lzdGVyKSkpKTsKKyAgICBqaXQuZW1pdFB1dFRvQ2FsbEZyYW1lSGVhZGVyKEdQ UkluZm86Om5vblByZXNlcnZlZE5vblJldHVybkdQUiwgQ2FsbEZyYW1lU2xvdDo6Y2FsbGVlKTsK ICAgICBDb2RlTG9jYXRpb25EYXRhTGFiZWxQdHI8V2FzbUVudHJ5UHRyVGFnPiogbGlua2VkQ2Fs bGVlTW92ZSA9ICZyZXN1bHQtPmNhbGxlZU1vdmVMb2NhdGlvbjsKICAgICBqaXQuYWRkTGlua1Rh c2soWz1dIChMaW5rQnVmZmVyJiBsaW5rQnVmZmVyKSB7CiAgICAgICAgICpsaW5rZWRDYWxsZWVN b3ZlID0gbGlua0J1ZmZlci5sb2NhdGlvbk9mPFdhc21FbnRyeVB0clRhZz4oY2FsbGVlTW92ZUxv Y2F0aW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dhc21U b0pTLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dhc21Ub0pTLmNwcAppbmRl eCA3NWI1MWRhYjU1ZGEuLjdmYWMxMTZlMDA4ZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3dhc20vanMvV2FzbVRvSlMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93 YXNtL2pzL1dhc21Ub0pTLmNwcApAQCAtNzIsNyArNzIsNyBAQCBFeHBlY3RlZDxNYWNyb0Fzc2Vt YmxlckNvZGVSZWY8V2FzbUVudHJ5UHRyVGFnPiwgQmluZGluZ0ZhaWx1cmU+IHdhc21Ub0pTKFZN JiB2bQogICAgIEFTU0VSVCghanNDQy5mcHJBcmdzLnNpemUoKSk7CiAKICAgICBqaXQuZW1pdEZ1 bmN0aW9uUHJvbG9ndWUoKTsKLSAgICBqaXQuc3RvcmU2NChKSVQ6OlRydXN0ZWRJbW0zMigwKSwg SklUOjpBZGRyZXNzKEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBDYWxsRnJhbWVTbG90Ojpj b2RlQmxvY2sgKiBzdGF0aWNfY2FzdDxpbnQ+KHNpemVvZihSZWdpc3RlcikpKSk7IC8vIEZJWE1F IFN0b3AgdXNpbmcgMCBhcyBjb2RlQmxvY2tzLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTY1MzIxCisgICAgaml0LmVtaXRaZXJvVG9DYWxsRnJhbWVIZWFkZXIoQ2Fs bEZyYW1lU2xvdDo6Y29kZUJsb2NrKTsgLy8gRklYTUUgU3RvcCB1c2luZyAwIGFzIGNvZGVCbG9j a3MuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjUzMjEKIAogICAg IC8vIEhlcmUgd2UgYXNzdW1lIHRoYXQgdGhlIEpTIGNhbGxpbmcgY29udmVudGlvbiBzYXZlcyBh dCBsZWFzdCBhbGwgdGhlIHdhc20gY2FsbGVlIHNhdmVkLiBXZSB0aGVyZWZvcmUgZG9uJ3QgbmVl ZCB0byBzYXZlIGFuZCByZXN0b3JlIG1vcmUgcmVnaXN0ZXJzIHNpbmNlIHRoZSB3YXNtIGNhbGxl ZSBhbHJlYWR5IHRvb2sgY2FyZSBvZiB0aGlzLgogICAgIFJlZ2lzdGVyU2V0IG1pc3NpbmdDYWxs ZWVTYXZlcyA9IHdhc21DQy5jYWxsZWVTYXZlUmVnaXN0ZXJzOwpAQCAtMjQ2LDcgKzI0Niw3IEBA IEV4cGVjdGVkPE1hY3JvQXNzZW1ibGVyQ29kZVJlZjxXYXNtRW50cnlQdHJUYWc+LCBCaW5kaW5n RmFpbHVyZT4gd2FzbVRvSlMoVk0mIHZtCiAgICAgaml0LmxvYWRXYXNtQ29udGV4dEluc3RhbmNl KEdQUkluZm86OmFyZ3VtZW50R1BSMCk7CiAgICAgaml0LmxvYWRQdHIoQ0NhbGxIZWxwZXJzOjpB ZGRyZXNzKEdQUkluZm86OmFyZ3VtZW50R1BSMCwgSW5zdGFuY2U6Om9mZnNldE9mT3duZXIoKSks IEdQUkluZm86OmFyZ3VtZW50R1BSMCk7CiAgICAgaml0LmxvYWRQdHIoQ0NhbGxIZWxwZXJzOjpB ZGRyZXNzKEdQUkluZm86OmFyZ3VtZW50R1BSMCwgSlNXZWJBc3NlbWJseUluc3RhbmNlOjpvZmZz ZXRPZk1vZHVsZSgpKSwgR1BSSW5mbzo6YXJndW1lbnRHUFIwKTsKLSAgICBqaXQuc3RvcmVQdHIo R1BSSW5mbzo6YXJndW1lbnRHUFIwLCBKSVQ6OkFkZHJlc3MoR1BSSW5mbzo6Y2FsbEZyYW1lUmVn aXN0ZXIsIENhbGxGcmFtZVNsb3Q6OmNhbGxlZSAqIHN0YXRpY19jYXN0PGludD4oc2l6ZW9mKFJl Z2lzdGVyKSkpKTsKKyAgICBqaXQuZW1pdFB1dFRvQ2FsbEZyYW1lSGVhZGVyKEdQUkluZm86OmFy Z3VtZW50R1BSMCwgQ2FsbEZyYW1lU2xvdDo6Y2FsbGVlKTsKIAogICAgIEdQUlJlZyBpbXBvcnRK U0NlbGxHUFJSZWcgPSBHUFJJbmZvOjpyZWdUMDsgLy8gQ2FsbGVlIG5lZWRzIHRvIGJlIGluIHJl Z1QwIGZvciBzbG93IHBhdGggYmVsb3cuCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3dhc20vanMvV2ViQXNzZW1ibHlGdW5jdGlvbi5jcHAKaW5kZXggNDM1ZTVlNGJjYmY4Li4z MGExNGJiNzVmOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dl YkFzc2VtYmx5RnVuY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pz L1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwCkBAIC0yMjUsNyArMjI1LDcgQEAgTWFjcm9Bc3NlbWJs ZXJDb2RlUHRyPEpTRW50cnlQdHJUYWc+IFdlYkFzc2VtYmx5RnVuY3Rpb246OmpzQ2FsbEVudHJ5 cG9pbnRTbG93KCkKIAogICAgIGppdC5lbWl0RnVuY3Rpb25Qcm9sb2d1ZSgpOwogICAgIGppdC5z dWJQdHIoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW0zMih0b3RhbEZyYW1lU2l6ZSksIE1hY3Jv QXNzZW1ibGVyOjpzdGFja1BvaW50ZXJSZWdpc3Rlcik7Ci0gICAgaml0LnN0b3JlNjQoQ0NhbGxI ZWxwZXJzOjpUcnVzdGVkSW1tNjQoMCksIENDYWxsSGVscGVyczo6YWRkcmVzc0ZvcihDYWxsRnJh bWVTbG90Ojpjb2RlQmxvY2spKTsKKyAgICBqaXQuZW1pdFplcm9Ub0NhbGxGcmFtZUhlYWRlcihD YWxsRnJhbWVTbG90Ojpjb2RlQmxvY2spOwogCiAgICAgZm9yIChjb25zdCBSZWdpc3RlckF0T2Zm c2V0JiByZWdBdE9mZnNldCA6IHJlZ2lzdGVyc1RvU3BpbGwpIHsKICAgICAgICAgR1BSUmVnIHJl ZyA9IHJlZ0F0T2Zmc2V0LnJlZygpLmdwcigpOwotLSAKMi4zMC4yCgo=