149878 2015-10-07 10:49:35 -0700 JIT::compileGetDirectOffset is useless 2015-10-07 11:05:37 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 149852 1 fpizlo fpizlo barraclough benjamin ggaren mark.lam mhahnenb msaboff nrotem oliver saam sam oldest_to_newest 1131327 0 fpizlo 2015-10-07 10:49:35 -0700 Patch forthcoming. 1131328 1 262615 fpizlo 2015-10-07 10:51:28 -0700 Created attachment 262615 the patch 1131329 2 262615 mark.lam 2015-10-07 10:53:45 -0700 Comment on attachment 262615 the patch r=me 1131331 3 fpizlo 2015-10-07 10:59:33 -0700 The iOS build failure is real, and it's because there is one more thing that needs to be removed on 32-bit. I'll make sure it builds before landing. 1131332 4 fpizlo 2015-10-07 11:05:37 -0700 Landed in http://trac.webkit.org/changeset/190672 262615 2015-10-07 10:51:28 -0700 2015-10-07 10:53:45 -0700 the patch blah.patch text/plain 10583 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkwNjcyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDE1LTEwLTA3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg SklUOjpjb21waWxlR2V0RGlyZWN0T2Zmc2V0IGlzIHVzZWxlc3MKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTg3OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR3byBvZiB0aGUgb3ZlcmxvYWRzIG9mIHRo aXMgbWV0aG9kIHdlcmUgbmV2ZXIgY2FsbGVkLiBUaGUgb3RoZXIgd2FzIGNhbGxlZCBvbmx5IGZy b20gb25lCisgICAgICAgIHBsYWNlLCBpbiBhIG1hbm5lciB0aGF0IHJlbmRlcmVkIG1vc3Qgb2Yg aXRzIGNvZGUgZGVhZC4gVGhpcyBjaGFuZ2UgcmVtb3ZlcyB0aGUgZGVhZCBjb2RlIGFuZAorICAg ICAgICBmb2xkcyB0aGUgbWV0aG9kIGludG8gaXRzIG9uZSBjYWxsZXIuCisKKyAgICAgICAgKiBq aXQvSklULmg6CisgICAgICAgICogaml0L0pJVFByb3BlcnR5QWNjZXNzLmNwcDoKKyAgICAgICAg KEpTQzo6SklUOjplbWl0U2xvd19vcF9nZXRfYnlfdmFsKToKKyAgICAgICAgKEpTQzo6SklUOjpl bWl0X29wX3B1dF9ieV92YWwpOgorICAgICAgICAoSlNDOjpKSVQ6OmNvbXBpbGVQdXREaXJlY3RP ZmZzZXQpOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRWYXJJbmplY3Rpb25DaGVjayk6CisgICAg ICAgIChKU0M6OkpJVDo6ZW1pdEdldEdsb2JhbFByb3BlcnR5KToKKyAgICAgICAgKEpTQzo6SklU OjplbWl0R2V0VmFyRnJvbVBvaW50ZXIpOgorICAgICAgICAoSlNDOjpKSVQ6OmNvbXBpbGVHZXRE aXJlY3RPZmZzZXQpOiBEZWxldGVkLgorICAgICAgICAqIGppdC9KSVRQcm9wZXJ0eUFjY2VzczMy XzY0LmNwcDoKKyAgICAgICAgKEpTQzo6SklUOjpjb21waWxlUHV0RGlyZWN0T2Zmc2V0KToKKyAg ICAgICAgKEpTQzo6SklUOjplbWl0VmFySW5qZWN0aW9uQ2hlY2spOgorICAgICAgICAoSlNDOjpK SVQ6OmVtaXRHZXRHbG9iYWxQcm9wZXJ0eSk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdEdldFZh ckZyb21Qb2ludGVyKToKKyAgICAgICAgKEpTQzo6SklUOjpjb21waWxlR2V0RGlyZWN0T2Zmc2V0 KTogRGVsZXRlZC4KKwogMjAxNS0xMC0wNiAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29t PgogCiAgICAgICAgIElubGluZSBjYWNoZXMgc2hvdWxkIGhhbmRsZSBvdXQtb2YtbGluZSBvZmZz ZXRzIG91dC1vZi1saW5lCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgJKHJldmlzaW9uIDE5 MDY3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgJKHdvcmtpbmcgY29weSkK QEAgLTQyNSwxMCArNDI1LDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHZvaWQgZW1pdEp1 bXBTbG93Q2FzZUlmTm90SlNDZWxsKGludCB2aXJ0dWFsUmVnaXN0ZXJJbmRleCwgUmVnaXN0ZXJJ RCB0YWcpOwogCiAgICAgICAgIHZvaWQgY29tcGlsZUdldEJ5SWRIb3RQYXRoKGNvbnN0IElkZW50 aWZpZXIqKTsKLSAgICAgICAgdm9pZCBjb21waWxlR2V0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQg YmFzZSwgUmVnaXN0ZXJJRCByZXN1bHRUYWcsIFJlZ2lzdGVySUQgcmVzdWx0UGF5bG9hZCwgUHJv cGVydHlPZmZzZXQgY2FjaGVkT2Zmc2V0KTsKLSAgICAgICAgdm9pZCBjb21waWxlR2V0RGlyZWN0 T2Zmc2V0KEpTT2JqZWN0KiBiYXNlLCBSZWdpc3RlcklEIHJlc3VsdFRhZywgUmVnaXN0ZXJJRCBy ZXN1bHRQYXlsb2FkLCBQcm9wZXJ0eU9mZnNldCBjYWNoZWRPZmZzZXQpOwotICAgICAgICB2b2lk IGNvbXBpbGVHZXREaXJlY3RPZmZzZXQoUmVnaXN0ZXJJRCBiYXNlLCBSZWdpc3RlcklEIHJlc3Vs dFRhZywgUmVnaXN0ZXJJRCByZXN1bHRQYXlsb2FkLCBSZWdpc3RlcklEIG9mZnNldCwgRmluYWxP YmplY3RNb2RlID0gTWF5QmVGaW5hbCk7Ci0gICAgICAgIHZvaWQgY29tcGlsZVB1dERpcmVjdE9m ZnNldChSZWdpc3RlcklEIGJhc2UsIFJlZ2lzdGVySUQgdmFsdWVUYWcsIFJlZ2lzdGVySUQgdmFs dWVQYXlsb2FkLCBQcm9wZXJ0eU9mZnNldCBjYWNoZWRPZmZzZXQpOwogCiAgICAgICAgIC8vIEFy aXRobWV0aWMgb3Bjb2RlIGhlbHBlcnMKICAgICAgICAgdm9pZCBlbWl0QWRkMzJDb25zdGFudChp bnQgZHN0LCBpbnQgb3AsIGludDMyX3QgY29uc3RhbnQsIFJlc3VsdFR5cGUgb3BUeXBlKTsKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MzMl82NC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vz czMyXzY0LmNwcAkocmV2aXNpb24gMTkwNjcxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9KSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjcxLDU4ICs2 NzEsNiBAQCB2b2lkIEpJVDo6Y29tcGlsZVB1dERpcmVjdE9mZnNldChSZWdpc3RlCiAgICAgZW1p dFN0b3JlKGluZGV4UmVsYXRpdmVUb0Jhc2UoY2FjaGVkT2Zmc2V0KSwgdmFsdWVUYWcsIHZhbHVl UGF5bG9hZCwgYmFzZSk7CiB9CiAKLS8vIENvbXBpbGUgYSBsb2FkIGZyb20gYW4gb2JqZWN0J3Mg cHJvcGVydHkgc3RvcmFnZS4gIE1heSBvdmVyd3JpdGUgYmFzZS4KLXZvaWQgSklUOjpjb21waWxl R2V0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQgYmFzZSwgUmVnaXN0ZXJJRCByZXN1bHRUYWcsIFJl Z2lzdGVySUQgcmVzdWx0UGF5bG9hZCwgUHJvcGVydHlPZmZzZXQgY2FjaGVkT2Zmc2V0KQotewot ICAgIGlmIChpc0lubGluZU9mZnNldChjYWNoZWRPZmZzZXQpKSB7Ci0gICAgICAgIGVtaXRMb2Fk KGluZGV4UmVsYXRpdmVUb0Jhc2UoY2FjaGVkT2Zmc2V0KSwgcmVzdWx0VGFnLCByZXN1bHRQYXls b2FkLCBiYXNlKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLSAgICAKLSAgICBSZWdpc3RlcklE IHRlbXAgPSByZXN1bHRQYXlsb2FkOwotICAgIGxvYWRQdHIoQWRkcmVzcyhiYXNlLCBKU09iamVj dDo6YnV0dGVyZmx5T2Zmc2V0KCkpLCB0ZW1wKTsKLSAgICBlbWl0TG9hZChpbmRleFJlbGF0aXZl VG9CYXNlKGNhY2hlZE9mZnNldCksIHJlc3VsdFRhZywgcmVzdWx0UGF5bG9hZCwgdGVtcCk7Ci19 Ci0KLXZvaWQgSklUOjpjb21waWxlR2V0RGlyZWN0T2Zmc2V0KEpTT2JqZWN0KiBiYXNlLCBSZWdp c3RlcklEIHJlc3VsdFRhZywgUmVnaXN0ZXJJRCByZXN1bHRQYXlsb2FkLCBQcm9wZXJ0eU9mZnNl dCBjYWNoZWRPZmZzZXQpCi17Ci0gICAgaWYgKGlzSW5saW5lT2Zmc2V0KGNhY2hlZE9mZnNldCkp IHsKLSAgICAgICAgbW92ZShUcnVzdGVkSW1tUHRyKGJhc2UtPmxvY2F0aW9uRm9yT2Zmc2V0KGNh Y2hlZE9mZnNldCkpLCByZXN1bHRUYWcpOwotICAgICAgICBsb2FkMzIoQWRkcmVzcyhyZXN1bHRU YWcsIE9CSkVDVF9PRkZTRVRPRihKU1ZhbHVlLCB1LmFzQml0cy5wYXlsb2FkKSksIHJlc3VsdFBh eWxvYWQpOwotICAgICAgICBsb2FkMzIoQWRkcmVzcyhyZXN1bHRUYWcsIE9CSkVDVF9PRkZTRVRP RihKU1ZhbHVlLCB1LmFzQml0cy50YWcpKSwgcmVzdWx0VGFnKTsKLSAgICAgICAgcmV0dXJuOwot ICAgIH0KLSAgICAKLSAgICBsb2FkUHRyKGJhc2UtPmJ1dHRlcmZseUFkZHJlc3MoKSwgcmVzdWx0 VGFnKTsKLSAgICBsb2FkMzIoQWRkcmVzcyhyZXN1bHRUYWcsIG9mZnNldEluQnV0dGVyZmx5KGNh Y2hlZE9mZnNldCkgKiBzaXplb2YoV3JpdGVCYXJyaWVyPFVua25vd24+KSArIE9CSkVDVF9PRkZT RVRPRihKU1ZhbHVlLCB1LmFzQml0cy5wYXlsb2FkKSksIHJlc3VsdFBheWxvYWQpOwotICAgIGxv YWQzMihBZGRyZXNzKHJlc3VsdFRhZywgb2Zmc2V0SW5CdXR0ZXJmbHkoY2FjaGVkT2Zmc2V0KSAq IHNpemVvZihXcml0ZUJhcnJpZXI8VW5rbm93bj4pICsgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUs IHUuYXNCaXRzLnRhZykpLCByZXN1bHRUYWcpOwotfQotCi12b2lkIEpJVDo6Y29tcGlsZUdldERp cmVjdE9mZnNldChSZWdpc3RlcklEIGJhc2UsIFJlZ2lzdGVySUQgcmVzdWx0VGFnLCBSZWdpc3Rl cklEIHJlc3VsdFBheWxvYWQsIFJlZ2lzdGVySUQgb2Zmc2V0LCBGaW5hbE9iamVjdE1vZGUgZmlu YWxPYmplY3RNb2RlKQotewotICAgIEFTU0VSVChzaXplb2YoSlNWYWx1ZSkgPT0gOCk7Ci0gICAg Ci0gICAgaWYgKGZpbmFsT2JqZWN0TW9kZSA9PSBNYXlCZUZpbmFsKSB7Ci0gICAgICAgIEp1bXAg aXNJbmxpbmUgPSBicmFuY2gzMihMZXNzVGhhbiwgb2Zmc2V0LCBUcnVzdGVkSW1tMzIoZmlyc3RP dXRPZkxpbmVPZmZzZXQpKTsKLSAgICAgICAgbG9hZFB0cihBZGRyZXNzKGJhc2UsIEpTT2JqZWN0 OjpidXR0ZXJmbHlPZmZzZXQoKSksIGJhc2UpOwotICAgICAgICBuZWczMihvZmZzZXQpOwotICAg ICAgICBKdW1wIGRvbmUgPSBqdW1wKCk7Ci0gICAgICAgIGlzSW5saW5lLmxpbmsodGhpcyk7Ci0g ICAgICAgIGFkZFB0cihUcnVzdGVkSW1tUHRyKEpTT2JqZWN0OjpvZmZzZXRPZklubGluZVN0b3Jh Z2UoKSAtIChmaXJzdE91dE9mTGluZU9mZnNldCAtIDIpICogc2l6ZW9mKEVuY29kZWRKU1ZhbHVl KSksIGJhc2UpOwotICAgICAgICBkb25lLmxpbmsodGhpcyk7Ci0gICAgfSBlbHNlIHsKLSAgICAg ICAgaWYgKCFBU1NFUlRfRElTQUJMRUQpIHsKLSAgICAgICAgICAgIEp1bXAgaXNPdXRPZkxpbmUg PSBicmFuY2gzMihHcmVhdGVyVGhhbk9yRXF1YWwsIG9mZnNldCwgVHJ1c3RlZEltbTMyKGZpcnN0 T3V0T2ZMaW5lT2Zmc2V0KSk7Ci0gICAgICAgICAgICBhYm9ydFdpdGhSZWFzb24oSklUT2Zmc2V0 SXNOb3RPdXRPZkxpbmUpOwotICAgICAgICAgICAgaXNPdXRPZkxpbmUubGluayh0aGlzKTsKLSAg ICAgICAgfQotICAgICAgICBsb2FkUHRyKEFkZHJlc3MoYmFzZSwgSlNPYmplY3Q6OmJ1dHRlcmZs eU9mZnNldCgpKSwgYmFzZSk7Ci0gICAgICAgIG5lZzMyKG9mZnNldCk7Ci0gICAgfQotICAgIGxv YWQzMihCYXNlSW5kZXgoYmFzZSwgb2Zmc2V0LCBUaW1lc0VpZ2h0LCBPQkpFQ1RfT0ZGU0VUT0Yo SlNWYWx1ZSwgdS5hc0JpdHMucGF5bG9hZCkgKyAoZmlyc3RPdXRPZkxpbmVPZmZzZXQgLSAyKSAq IHNpemVvZihFbmNvZGVkSlNWYWx1ZSkpLCByZXN1bHRQYXlsb2FkKTsKLSAgICBsb2FkMzIoQmFz ZUluZGV4KGJhc2UsIG9mZnNldCwgVGltZXNFaWdodCwgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUs IHUuYXNCaXRzLnRhZykgKyAoZmlyc3RPdXRPZkxpbmVPZmZzZXQgLSAyKSAqIHNpemVvZihFbmNv ZGVkSlNWYWx1ZSkpLCByZXN1bHRUYWcpOwotfQotCiB2b2lkIEpJVDo6ZW1pdFZhckluamVjdGlv bkNoZWNrKGJvb2wgbmVlZHNWYXJJbmplY3Rpb25DaGVja3MpCiB7CiAgICAgaWYgKCFuZWVkc1Zh ckluamVjdGlvbkNoZWNrcykKQEAgLTg0Miw5ICs3OTAsMjIgQEAgdm9pZCBKSVQ6OmVtaXRMb2Fk V2l0aFN0cnVjdHVyZUNoZWNrKGludAogCiB2b2lkIEpJVDo6ZW1pdEdldEdsb2JhbFByb3BlcnR5 KHVpbnRwdHJfdCogb3BlcmFuZFNsb3QpCiB7Ci0gICAgbW92ZShyZWdUMCwgcmVnVDIpOwotICAg IGxvYWQzMihvcGVyYW5kU2xvdCwgcmVnVDMpOwotICAgIGNvbXBpbGVHZXREaXJlY3RPZmZzZXQo cmVnVDIsIHJlZ1QxLCByZWdUMCwgcmVnVDMsIEtub3duTm90RmluYWwpOworICAgIEdQUlJlZyBi YXNlID0gcmVnVDI7CisgICAgR1BSUmVnIHJlc3VsdFRhZyA9IHJlZ1QxOworICAgIEdQUlJlZyBy ZXN1bHRQYXlsb2FkID0gcmVnVDA7CisgICAgR1BSUmVnIG9mZnNldCA9IHJlZ1QzOworICAgIAor ICAgIG1vdmUocmVnVDAsIGJhc2UpOworICAgIGxvYWQzMihvcGVyYW5kU2xvdCwgb2Zmc2V0KTsK KyAgICBpZiAoIUFTU0VSVF9ESVNBQkxFRCkgeworICAgICAgICBKdW1wIGlzT3V0T2ZMaW5lID0g YnJhbmNoMzIoR3JlYXRlclRoYW5PckVxdWFsLCBvZmZzZXQsIFRydXN0ZWRJbW0zMihmaXJzdE91 dE9mTGluZU9mZnNldCkpOworICAgICAgICBhYm9ydFdpdGhSZWFzb24oSklUT2Zmc2V0SXNOb3RP dXRPZkxpbmUpOworICAgICAgICBpc091dE9mTGluZS5saW5rKHRoaXMpOworICAgIH0KKyAgICBs b2FkUHRyKEFkZHJlc3MoYmFzZSwgSlNPYmplY3Q6OmJ1dHRlcmZseU9mZnNldCgpKSwgYmFzZSk7 CisgICAgbmVnMzIob2Zmc2V0KTsKKyAgICBsb2FkMzIoQmFzZUluZGV4KGJhc2UsIG9mZnNldCwg VGltZXNFaWdodCwgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRzLnBheWxvYWQpICsg KGZpcnN0T3V0T2ZMaW5lT2Zmc2V0IC0gMikgKiBzaXplb2YoRW5jb2RlZEpTVmFsdWUpKSwgcmVz dWx0UGF5bG9hZCk7CisgICAgbG9hZDMyKEJhc2VJbmRleChiYXNlLCBvZmZzZXQsIFRpbWVzRWln aHQsIE9CSkVDVF9PRkZTRVRPRihKU1ZhbHVlLCB1LmFzQml0cy50YWcpICsgKGZpcnN0T3V0T2ZM aW5lT2Zmc2V0IC0gMikgKiBzaXplb2YoRW5jb2RlZEpTVmFsdWUpKSwgcmVzdWx0VGFnKTsKIH0K IAogdm9pZCBKSVQ6OmVtaXRHZXRWYXJGcm9tUG9pbnRlcihKU1ZhbHVlKiBvcGVyYW5kLCBHUFJS ZWcgdGFnLCBHUFJSZWcgcGF5bG9hZCkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv SklUUHJvcGVydHlBY2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwCShyZXZpc2lvbiAxOTA2NzEpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVFByb3BlcnR5QWNjZXNzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjY3LDMxICsyNjcsNiBAQCB2b2lkIEpJVDo6ZW1pdFNsb3dfb3BfZ2V0X2J5X3ZhbChJbnN0 cnVjCiAgICAgZW1pdFZhbHVlUHJvZmlsaW5nU2l0ZSgpOwogfQogCi12b2lkIEpJVDo6Y29tcGls ZUdldERpcmVjdE9mZnNldChSZWdpc3RlcklEIGJhc2UsIFJlZ2lzdGVySUQgcmVzdWx0LCBSZWdp c3RlcklEIG9mZnNldCwgUmVnaXN0ZXJJRCBzY3JhdGNoLCBGaW5hbE9iamVjdE1vZGUgZmluYWxP YmplY3RNb2RlKQotewotICAgIEFTU0VSVChzaXplb2YoSlNWYWx1ZSkgPT0gOCk7Ci0gICAgCi0g ICAgaWYgKGZpbmFsT2JqZWN0TW9kZSA9PSBNYXlCZUZpbmFsKSB7Ci0gICAgICAgIEp1bXAgaXNJ bmxpbmUgPSBicmFuY2gzMihMZXNzVGhhbiwgb2Zmc2V0LCBUcnVzdGVkSW1tMzIoZmlyc3RPdXRP ZkxpbmVPZmZzZXQpKTsKLSAgICAgICAgbG9hZFB0cihBZGRyZXNzKGJhc2UsIEpTT2JqZWN0Ojpi dXR0ZXJmbHlPZmZzZXQoKSksIHNjcmF0Y2gpOwotICAgICAgICBuZWczMihvZmZzZXQpOwotICAg ICAgICBKdW1wIGRvbmUgPSBqdW1wKCk7Ci0gICAgICAgIGlzSW5saW5lLmxpbmsodGhpcyk7Ci0g ICAgICAgIGFkZFB0cihUcnVzdGVkSW1tMzIoSlNPYmplY3Q6Om9mZnNldE9mSW5saW5lU3RvcmFn ZSgpIC0gKGZpcnN0T3V0T2ZMaW5lT2Zmc2V0IC0gMikgKiBzaXplb2YoRW5jb2RlZEpTVmFsdWUp KSwgYmFzZSwgc2NyYXRjaCk7Ci0gICAgICAgIGRvbmUubGluayh0aGlzKTsKLSAgICB9IGVsc2Ug ewotICAgICAgICBpZiAoIUFTU0VSVF9ESVNBQkxFRCkgewotICAgICAgICAgICAgSnVtcCBpc091 dE9mTGluZSA9IGJyYW5jaDMyKEdyZWF0ZXJUaGFuT3JFcXVhbCwgb2Zmc2V0LCBUcnVzdGVkSW1t MzIoZmlyc3RPdXRPZkxpbmVPZmZzZXQpKTsKLSAgICAgICAgICAgIGFib3J0V2l0aFJlYXNvbihK SVRPZmZzZXRJc05vdE91dE9mTGluZSk7Ci0gICAgICAgICAgICBpc091dE9mTGluZS5saW5rKHRo aXMpOwotICAgICAgICB9Ci0gICAgICAgIGxvYWRQdHIoQWRkcmVzcyhiYXNlLCBKU09iamVjdDo6 YnV0dGVyZmx5T2Zmc2V0KCkpLCBzY3JhdGNoKTsKLSAgICAgICAgbmVnMzIob2Zmc2V0KTsKLSAg ICB9Ci0gICAgc2lnbkV4dGVuZDMyVG9QdHIob2Zmc2V0LCBvZmZzZXQpOwotICAgIGxvYWQ2NChC YXNlSW5kZXgoc2NyYXRjaCwgb2Zmc2V0LCBUaW1lc0VpZ2h0LCAoZmlyc3RPdXRPZkxpbmVPZmZz ZXQgLSAyKSAqIHNpemVvZihFbmNvZGVkSlNWYWx1ZSkpLCByZXN1bHQpOwotfQotCiB2b2lkIEpJ VDo6ZW1pdF9vcF9wdXRfYnlfdmFsKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiB7 CiAgICAgaW50IGJhc2UgPSBjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kOwpAQCAtNjYx LDI5ICs2MzYsNiBAQCB2b2lkIEpJVDo6Y29tcGlsZVB1dERpcmVjdE9mZnNldChSZWdpc3RlCiAg ICAgc3RvcmU2NCh2YWx1ZSwgQWRkcmVzcyhiYXNlLCBzaXplb2YoSlNWYWx1ZSkgKiBvZmZzZXRJ bkJ1dHRlcmZseShjYWNoZWRPZmZzZXQpKSk7CiB9CiAKLS8vIENvbXBpbGUgYSBsb2FkIGZyb20g YW4gb2JqZWN0J3MgcHJvcGVydHkgc3RvcmFnZS4gIE1heSBvdmVyd3JpdGUgYmFzZS4KLXZvaWQg SklUOjpjb21waWxlR2V0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQgYmFzZSwgUmVnaXN0ZXJJRCBy ZXN1bHQsIFByb3BlcnR5T2Zmc2V0IGNhY2hlZE9mZnNldCkKLXsKLSAgICBpZiAoaXNJbmxpbmVP ZmZzZXQoY2FjaGVkT2Zmc2V0KSkgewotICAgICAgICBsb2FkNjQoQWRkcmVzcyhiYXNlLCBKU09i amVjdDo6b2Zmc2V0T2ZJbmxpbmVTdG9yYWdlKCkgKyBzaXplb2YoSlNWYWx1ZSkgKiBvZmZzZXRJ bklubGluZVN0b3JhZ2UoY2FjaGVkT2Zmc2V0KSksIHJlc3VsdCk7Ci0gICAgICAgIHJldHVybjsK LSAgICB9Ci0gICAgCi0gICAgbG9hZFB0cihBZGRyZXNzKGJhc2UsIEpTT2JqZWN0OjpidXR0ZXJm bHlPZmZzZXQoKSksIHJlc3VsdCk7Ci0gICAgbG9hZDY0KEFkZHJlc3MocmVzdWx0LCBzaXplb2Yo SlNWYWx1ZSkgKiBvZmZzZXRJbkJ1dHRlcmZseShjYWNoZWRPZmZzZXQpKSwgcmVzdWx0KTsKLX0K LQotdm9pZCBKSVQ6OmNvbXBpbGVHZXREaXJlY3RPZmZzZXQoSlNPYmplY3QqIGJhc2UsIFJlZ2lz dGVySUQgcmVzdWx0LCBQcm9wZXJ0eU9mZnNldCBjYWNoZWRPZmZzZXQpCi17Ci0gICAgaWYgKGlz SW5saW5lT2Zmc2V0KGNhY2hlZE9mZnNldCkpIHsKLSAgICAgICAgbG9hZDY0KGJhc2UtPmxvY2F0 aW9uRm9yT2Zmc2V0KGNhY2hlZE9mZnNldCksIHJlc3VsdCk7Ci0gICAgICAgIHJldHVybjsKLSAg ICB9Ci0gICAgCi0gICAgbG9hZFB0cihiYXNlLT5idXR0ZXJmbHlBZGRyZXNzKCksIHJlc3VsdCk7 Ci0gICAgbG9hZDY0KEFkZHJlc3MocmVzdWx0LCBvZmZzZXRJbkJ1dHRlcmZseShjYWNoZWRPZmZz ZXQpICogc2l6ZW9mKFdyaXRlQmFycmllcjxVbmtub3duPikpLCByZXN1bHQpOwotfQotCiB2b2lk IEpJVDo6ZW1pdFZhckluamVjdGlvbkNoZWNrKGJvb2wgbmVlZHNWYXJJbmplY3Rpb25DaGVja3Mp CiB7CiAgICAgaWYgKCFuZWVkc1ZhckluamVjdGlvbkNoZWNrcykKQEAgLTgwNCw4ICs3NTYsMjEg QEAgdm9pZCBKSVQ6OmVtaXRMb2FkV2l0aFN0cnVjdHVyZUNoZWNrKGludAogCiB2b2lkIEpJVDo6 ZW1pdEdldEdsb2JhbFByb3BlcnR5KHVpbnRwdHJfdCogb3BlcmFuZFNsb3QpCiB7Ci0gICAgbG9h ZDMyKG9wZXJhbmRTbG90LCByZWdUMSk7Ci0gICAgY29tcGlsZUdldERpcmVjdE9mZnNldChyZWdU MCwgcmVnVDAsIHJlZ1QxLCByZWdUMiwgS25vd25Ob3RGaW5hbCk7CisgICAgR1BSUmVnIGJhc2Ug PSByZWdUMDsKKyAgICBHUFJSZWcgcmVzdWx0ID0gcmVnVDA7CisgICAgR1BSUmVnIG9mZnNldCA9 IHJlZ1QxOworICAgIEdQUlJlZyBzY3JhdGNoID0gcmVnVDI7CisgICAgCisgICAgbG9hZDMyKG9w ZXJhbmRTbG90LCBvZmZzZXQpOworICAgIGlmICghQVNTRVJUX0RJU0FCTEVEKSB7CisgICAgICAg IEp1bXAgaXNPdXRPZkxpbmUgPSBicmFuY2gzMihHcmVhdGVyVGhhbk9yRXF1YWwsIG9mZnNldCwg VHJ1c3RlZEltbTMyKGZpcnN0T3V0T2ZMaW5lT2Zmc2V0KSk7CisgICAgICAgIGFib3J0V2l0aFJl YXNvbihKSVRPZmZzZXRJc05vdE91dE9mTGluZSk7CisgICAgICAgIGlzT3V0T2ZMaW5lLmxpbmso dGhpcyk7CisgICAgfQorICAgIGxvYWRQdHIoQWRkcmVzcyhiYXNlLCBKU09iamVjdDo6YnV0dGVy Zmx5T2Zmc2V0KCkpLCBzY3JhdGNoKTsKKyAgICBuZWczMihvZmZzZXQpOworICAgIHNpZ25FeHRl bmQzMlRvUHRyKG9mZnNldCwgb2Zmc2V0KTsKKyAgICBsb2FkNjQoQmFzZUluZGV4KHNjcmF0Y2gs IG9mZnNldCwgVGltZXNFaWdodCwgKGZpcnN0T3V0T2ZMaW5lT2Zmc2V0IC0gMikgKiBzaXplb2Yo RW5jb2RlZEpTVmFsdWUpKSwgcmVzdWx0KTsKIH0KIAogdm9pZCBKSVQ6OmVtaXRHZXRWYXJGcm9t UG9pbnRlcihKU1ZhbHVlKiBvcGVyYW5kLCBHUFJSZWcgcmVnKQo=