151718 2015-12-01 13:12:01 -0800 Remove repetitive cruft from FTL OSR exit code in LowerDFGToLLVM 2015-12-01 14:15:42 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 151710 1 fpizlo fpizlo commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1145346 0 fpizlo 2015-12-01 13:12:01 -0800 Patch forthcoming. 1145348 1 266382 fpizlo 2015-12-01 13:13:00 -0800 Created attachment 266382 the patch 1145356 2 266382 mark.lam 2015-12-01 13:22:35 -0800 Comment on attachment 266382 the patch Missing ChangeLog. 1145358 3 fpizlo 2015-12-01 13:24:27 -0800 (In reply to comment #2) > Comment on attachment 266382 [details] > the patch > > Missing ChangeLog. I didn't mean to put it up for review yet. 1145360 4 266382 fpizlo 2015-12-01 13:24:39 -0800 Comment on attachment 266382 the patch It's not meant to be up for review yet. 1145388 5 266392 fpizlo 2015-12-01 14:01:42 -0800 Created attachment 266392 the patch 1145389 6 266392 ggaren 2015-12-01 14:05:29 -0800 Comment on attachment 266392 the patch r=me 1145395 7 fpizlo 2015-12-01 14:15:42 -0800 Landed in http://trac.webkit.org/changeset/192912 266382 2015-12-01 13:13:00 -0800 2015-12-01 14:01:42 -0800 the patch blah.patch text/plain 6962 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM1N0YWNrbWFwVmFsdWUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvQjNTdGFja21hcFZhbHVlLmgJKHJldmlz aW9uIDE5MjkwMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM1N0YWNrbWFwVmFsdWUu aAkod29ya2luZyBjb3B5KQpAQCAtODQsNiArODQsMTMgQEAgcHVibGljOgogICAgIC8vIGNoaWxk cmVuKCkuYXBwZW5kKCkuIFRoYXQgd2lsbCB3b3JrIGZpbmUsIGJ1dCBpdCdzIG5vdCByZWNvbW1l bmRlZC4KICAgICB2b2lkIGFwcGVuZChjb25zdCBDb25zdHJhaW5lZFZhbHVlJik7CiAKKyAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0b3JUeXBlPgorICAgIHZvaWQgYXBwZW5kQW55cyhjb25zdCBW ZWN0b3JUeXBlJiB2ZWN0b3IpCisgICAgeworICAgICAgICBmb3IgKFZhbHVlKiB2YWx1ZSA6IHZl Y3RvcikKKyAgICAgICAgICAgIGFwcGVuZCh2YWx1ZSk7CisgICAgfQorCiAgICAgLy8gVGhpcyBp cyBhIGhlbHBlciBmb3Igc29tZXRoaW5nIHlvdSBtaWdodCBkbyBhIGxvdCBvZjogYXBwZW5kIGEg dmFsdWUgdGhhdCBzaG91bGQgYmUgY29uc3RyYWluZWQKICAgICAvLyB0byBTb21lUmVnaXN0ZXIu CiAgICAgdm9pZCBhcHBlbmRTb21lUmVnaXN0ZXIoVmFsdWUqKTsKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCShyZXZpc2lvbiAxOTI5 MDEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTI4Myw4ICs1MjgzLDcgQEAgcHJpdmF0ZToKICAgICAgICAgCiAg ICAgICAgIE9TUkV4aXREZXNjcmlwdG9yJiBleGl0RGVzY3JpcHRvciA9IG1fZnRsU3RhdGUuaml0 Q29kZS0+b3NyRXhpdERlc2NyaXB0b3JzLmxhc3QoKTsKICAgICAgICAgCi0gICAgICAgIFN0YWNr bWFwQXJndW1lbnRMaXN0IGFyZ3VtZW50cyA9Ci0gICAgICAgICAgICBidWlsZEV4aXRBcmd1bWVu dHMoZXhpdERlc2NyaXB0b3IsIEZvcm1hdHRlZFZhbHVlKCksIGV4aXREZXNjcmlwdG9yLm1fY29k ZU9yaWdpbik7CisgICAgICAgIFN0YWNrbWFwQXJndW1lbnRMaXN0IGFyZ3VtZW50cyA9IGJ1aWxk RXhpdEFyZ3VtZW50cyhleGl0RGVzY3JpcHRvciwgRm9ybWF0dGVkVmFsdWUoKSk7CiAgICAgICAg IGNhbGxTdGFja21hcChleGl0RGVzY3JpcHRvciwgYXJndW1lbnRzKTsKICAgICAgICAgCiAgICAg ICAgIGV4aXREZXNjcmlwdG9yLm1faXNJbnZhbGlkYXRpb25Qb2ludCA9IHRydWU7CkBAIC05MTgw LDcgKzkxNzksNyBAQCBwcml2YXRlOgogICAgICAgICBleGl0RGVzY3JpcHRvci5tX3N0YWNrbWFw SUQgPSBtX3N0YWNrbWFwSURzIC0gMTsKIAogICAgICAgICBTdGFja21hcEFyZ3VtZW50TGlzdCBm cmVzaExpc3QgPQotICAgICAgICAgICAgYnVpbGRFeGl0QXJndW1lbnRzKGV4aXREZXNjcmlwdG9y LCBub1ZhbHVlKCksIGV4aXREZXNjcmlwdG9yLm1fY29kZU9yaWdpbiwgb2Zmc2V0T2ZFeGl0QXJn dW1lbnRzKTsKKyAgICAgICAgICAgIGJ1aWxkRXhpdEFyZ3VtZW50cyhleGl0RGVzY3JpcHRvciwg bm9WYWx1ZSgpLCBvZmZzZXRPZkV4aXRBcmd1bWVudHMpOwogICAgICAgICBhcmd1bWVudHMuYXBw ZW5kVmVjdG9yKGZyZXNoTGlzdCk7CiAgICAgfQogCkBAIC05MjAxLDEzICs5MjAwLDEzIEBAIHBy aXZhdGU6CiAgICAgICAgIHJldHVybiBtX2Jsb2Nrcy5nZXQoYmxvY2spOwogICAgIH0KIAotICAg IHZvaWQgYXBwZW5kT1NSRXhpdERlc2NyaXB0b3IoRXhpdEtpbmQga2luZCwgRXhjZXB0aW9uVHlw ZSBleGNlcHRpb25UeXBlLCBGb3JtYXR0ZWRWYWx1ZSBsb3dWYWx1ZSwgTm9kZSogaGlnaFZhbHVl LCBOb2RlT3JpZ2luIG9yaWdpbikKKyAgICBPU1JFeGl0RGVzY3JpcHRvciYgYXBwZW5kT1NSRXhp dERlc2NyaXB0b3IoRXhpdEtpbmQga2luZCwgRXhjZXB0aW9uVHlwZSBleGNlcHRpb25UeXBlLCBG b3JtYXR0ZWRWYWx1ZSBsb3dWYWx1ZSwgTm9kZSogaGlnaFZhbHVlLCBOb2RlT3JpZ2luIG9yaWdp bikKICAgICB7Ci0gICAgICAgIG1fZnRsU3RhdGUuaml0Q29kZS0+b3NyRXhpdERlc2NyaXB0b3Jz LmFwcGVuZChPU1JFeGl0RGVzY3JpcHRvcigKKyAgICAgICAgcmV0dXJuIG1fZnRsU3RhdGUuaml0 Q29kZS0+b3NyRXhpdERlc2NyaXB0b3JzLmFsbG9jKAogICAgICAgICAgICAga2luZCwgZXhjZXB0 aW9uVHlwZSwgbG93VmFsdWUuZm9ybWF0KCksIG1fZ3JhcGgubWV0aG9kT2ZHZXR0aW5nQVZhbHVl UHJvZmlsZUZvcihoaWdoVmFsdWUpLAogICAgICAgICAgICAgb3JpZ2luLmZvckV4aXQsIG9yaWdp bi5zZW1hbnRpYywKICAgICAgICAgICAgIGF2YWlsYWJpbGl0eU1hcCgpLm1fbG9jYWxzLm51bWJl ck9mQXJndW1lbnRzKCksCi0gICAgICAgICAgICBhdmFpbGFiaWxpdHlNYXAoKS5tX2xvY2Fscy5u dW1iZXJPZkxvY2FscygpKSk7CisgICAgICAgICAgICBhdmFpbGFiaWxpdHlNYXAoKS5tX2xvY2Fs cy5udW1iZXJPZkxvY2FscygpKTsKICAgICB9CiAgICAgCiAgICAgdm9pZCBhcHBlbmRPU1JFeGl0 KApAQCAtOTI0OCw4ICs5MjQ3LDcgQEAgcHJpdmF0ZToKICAgICAgICAgYmxlc3NTcGVjdWxhdGlv bigKICAgICAgICAgICAgIG1fb3V0LnNwZWN1bGF0ZShmYWlsQ29uZGl0aW9uKSwga2luZCwgbG93 VmFsdWUsIGhpZ2hWYWx1ZSwgb3JpZ2luLCBpc0V4Y2VwdGlvbkhhbmRsZXIpOwogI2Vsc2UgLy8g RlRMX1VTRVNfQjMKLSAgICAgICAgYXBwZW5kT1NSRXhpdERlc2NyaXB0b3Ioa2luZCwgaXNFeGNl cHRpb25IYW5kbGVyID8gRXhjZXB0aW9uVHlwZTo6Q0NhbGxFeGNlcHRpb24gOiBFeGNlcHRpb25U eXBlOjpOb25lLCBsb3dWYWx1ZSwgaGlnaFZhbHVlLCBvcmlnaW4pOwotICAgICAgICBPU1JFeGl0 RGVzY3JpcHRvciYgZXhpdERlc2NyaXB0b3IgPSBtX2Z0bFN0YXRlLmppdENvZGUtPm9zckV4aXRE ZXNjcmlwdG9ycy5sYXN0KCk7CisgICAgICAgIE9TUkV4aXREZXNjcmlwdG9yJiBleGl0RGVzY3Jp cHRvciA9IGFwcGVuZE9TUkV4aXREZXNjcmlwdG9yKGtpbmQsIGlzRXhjZXB0aW9uSGFuZGxlciA/ IEV4Y2VwdGlvblR5cGU6OkNDYWxsRXhjZXB0aW9uIDogRXhjZXB0aW9uVHlwZTo6Tm9uZSwgbG93 VmFsdWUsIGhpZ2hWYWx1ZSwgb3JpZ2luKTsKIAogICAgICAgICBpZiAoZmFpbENvbmRpdGlvbiA9 PSBtX291dC5ib29sZWFuVHJ1ZSkgewogICAgICAgICAgICAgZW1pdE9TUkV4aXRDYWxsKGV4aXRE ZXNjcmlwdG9yLCBsb3dWYWx1ZSk7CkBAIC05Mjc3LDEyICs5Mjc1LDggQEAgcHJpdmF0ZToKICNp ZiBGVExfVVNFU19CMwogICAgIHZvaWQgYmxlc3NTcGVjdWxhdGlvbihCMzo6U3RhY2ttYXBWYWx1 ZSogdmFsdWUsIEV4aXRLaW5kIGtpbmQsIEZvcm1hdHRlZFZhbHVlIGxvd1ZhbHVlLCBOb2RlKiBo aWdoVmFsdWUsIE5vZGVPcmlnaW4gb3JpZ2luLCBib29sIGlzRXhjZXB0aW9uSGFuZGxlciA9IGZh bHNlKQogICAgIHsKLSAgICAgICAgYXBwZW5kT1NSRXhpdERlc2NyaXB0b3Ioa2luZCwgaXNFeGNl cHRpb25IYW5kbGVyID8gRXhjZXB0aW9uVHlwZTo6Q0NhbGxFeGNlcHRpb24gOiBFeGNlcHRpb25U eXBlOjpOb25lLCBsb3dWYWx1ZSwgaGlnaFZhbHVlLCBvcmlnaW4pOwotICAgICAgICBPU1JFeGl0 RGVzY3JpcHRvciYgZXhpdERlc2NyaXB0b3IgPSBtX2Z0bFN0YXRlLmppdENvZGUtPm9zckV4aXRE ZXNjcmlwdG9ycy5sYXN0KCk7Ci0gICAgICAgIENvZGVPcmlnaW4gY29kZU9yaWdpbiA9IGV4aXRE ZXNjcmlwdG9yLm1fY29kZU9yaWdpbjsKLSAgICAgICAgU3RhY2ttYXBBcmd1bWVudExpc3QgYXJn dW1lbnRzID0gYnVpbGRFeGl0QXJndW1lbnRzKGV4aXREZXNjcmlwdG9yLCBsb3dWYWx1ZSwgY29k ZU9yaWdpbik7Ci0gICAgICAgIGZvciAoTFZhbHVlIGNoaWxkIDogYXJndW1lbnRzKQotICAgICAg ICAgICAgdmFsdWUtPmFwcGVuZChjaGlsZCk7CisgICAgICAgIE9TUkV4aXREZXNjcmlwdG9yJiBl eGl0RGVzY3JpcHRvciA9IGFwcGVuZE9TUkV4aXREZXNjcmlwdG9yKGtpbmQsIGlzRXhjZXB0aW9u SGFuZGxlciA/IEV4Y2VwdGlvblR5cGU6OkNDYWxsRXhjZXB0aW9uIDogRXhjZXB0aW9uVHlwZTo6 Tm9uZSwgbG93VmFsdWUsIGhpZ2hWYWx1ZSwgb3JpZ2luKTsKKyAgICAgICAgdmFsdWUtPmFwcGVu ZEFueXMoYnVpbGRFeGl0QXJndW1lbnRzKGV4aXREZXNjcmlwdG9yLCBsb3dWYWx1ZSkpOwogICAg ICAgICB2YWx1ZS0+c2V0R2VuZXJhdG9yKAogICAgICAgICAgICAgWyZdIChDQ2FsbEhlbHBlcnMm IGppdCwgY29uc3QgQjM6OlN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYpIHsKICAgICAgICAgICAg ICAgICBqaXQub29wcygpOwpAQCAtOTI5MywzNSArOTI4NywyOSBAQCBwcml2YXRlOgogI2lmICFG VExfVVNFU19CMwogICAgIHZvaWQgZW1pdE9TUkV4aXRDYWxsKE9TUkV4aXREZXNjcmlwdG9yJiBl eGl0RGVzY3JpcHRvciwgRm9ybWF0dGVkVmFsdWUgbG93VmFsdWUpCiAgICAgewotICAgICAgICBT dGFja21hcEFyZ3VtZW50TGlzdCBhcmd1bWVudHM7Ci0gICAgICAgIAotICAgICAgICBDb2RlT3Jp Z2luIGNvZGVPcmlnaW4gPSBleGl0RGVzY3JpcHRvci5tX2NvZGVPcmlnaW47Ci0gICAgICAgIAot ICAgICAgICBidWlsZEV4aXRBcmd1bWVudHMoZXhpdERlc2NyaXB0b3IsIGFyZ3VtZW50cywgbG93 VmFsdWUsIGNvZGVPcmlnaW4pOwotICAgICAgICAKLSAgICAgICAgY2FsbFN0YWNrbWFwKGV4aXRE ZXNjcmlwdG9yLCBhcmd1bWVudHMpOworICAgICAgICBjYWxsU3RhY2ttYXAoZXhpdERlc2NyaXB0 b3IsIGJ1aWxkRXhpdEFyZ3VtZW50cyhleGl0RGVzY3JpcHRvciwgbG93VmFsdWUpKTsKICAgICB9 CiAjZW5kaWYKIAogICAgIFN0YWNrbWFwQXJndW1lbnRMaXN0IGJ1aWxkRXhpdEFyZ3VtZW50cygK LSAgICAgICAgT1NSRXhpdERlc2NyaXB0b3ImIGV4aXREZXNjcmlwdG9yLCBGb3JtYXR0ZWRWYWx1 ZSBsb3dWYWx1ZSwgQ29kZU9yaWdpbiBjb2RlT3JpZ2luLAorICAgICAgICBPU1JFeGl0RGVzY3Jp cHRvciYgZXhpdERlc2NyaXB0b3IsIEZvcm1hdHRlZFZhbHVlIGxvd1ZhbHVlLAogICAgICAgICB1 bnNpZ25lZCBvZmZzZXRPZkV4aXRBcmd1bWVudHNJblN0YWNrbWFwTG9jYXRpb25zID0gMCkKICAg ICB7CiAgICAgICAgIFN0YWNrbWFwQXJndW1lbnRMaXN0IHJlc3VsdDsKICAgICAgICAgYnVpbGRF eGl0QXJndW1lbnRzKAotICAgICAgICAgICAgZXhpdERlc2NyaXB0b3IsIHJlc3VsdCwgbG93VmFs dWUsIGNvZGVPcmlnaW4sIG9mZnNldE9mRXhpdEFyZ3VtZW50c0luU3RhY2ttYXBMb2NhdGlvbnMp OworICAgICAgICAgICAgZXhpdERlc2NyaXB0b3IsIHJlc3VsdCwgbG93VmFsdWUsIG9mZnNldE9m RXhpdEFyZ3VtZW50c0luU3RhY2ttYXBMb2NhdGlvbnMpOwogICAgICAgICByZXR1cm4gcmVzdWx0 OwogICAgIH0KICAgICAKICAgICB2b2lkIGJ1aWxkRXhpdEFyZ3VtZW50cygKICAgICAgICAgT1NS RXhpdERlc2NyaXB0b3ImIGV4aXREZXNjcmlwdG9yLCBTdGFja21hcEFyZ3VtZW50TGlzdCYgYXJn dW1lbnRzLCBGb3JtYXR0ZWRWYWx1ZSBsb3dWYWx1ZSwKLSAgICAgICAgQ29kZU9yaWdpbiBjb2Rl T3JpZ2luLCB1bnNpZ25lZCBvZmZzZXRPZkV4aXRBcmd1bWVudHNJblN0YWNrbWFwTG9jYXRpb25z ID0gMCkKKyAgICAgICAgdW5zaWduZWQgb2Zmc2V0T2ZFeGl0QXJndW1lbnRzSW5TdGFja21hcExv Y2F0aW9ucyA9IDApCiAgICAgewogICAgICAgICBpZiAoISFsb3dWYWx1ZSkKICAgICAgICAgICAg IGFyZ3VtZW50cy5hcHBlbmQobG93VmFsdWUudmFsdWUoKSk7CiAgICAgICAgIAogICAgICAgICBB dmFpbGFiaWxpdHlNYXAgYXZhaWxhYmlsaXR5TWFwID0gdGhpcy0+YXZhaWxhYmlsaXR5TWFwKCk7 Ci0gICAgICAgIGF2YWlsYWJpbGl0eU1hcC5wcnVuZUJ5TGl2ZW5lc3MobV9ncmFwaCwgY29kZU9y aWdpbik7CisgICAgICAgIGF2YWlsYWJpbGl0eU1hcC5wcnVuZUJ5TGl2ZW5lc3MobV9ncmFwaCwg ZXhpdERlc2NyaXB0b3IubV9jb2RlT3JpZ2luKTsKICAgICAgICAgCiAgICAgICAgIEhhc2hNYXA8 Tm9kZSosIEV4aXRUaW1lT2JqZWN0TWF0ZXJpYWxpemF0aW9uKj4gbWFwOwogICAgICAgICBhdmFp bGFiaWxpdHlNYXAuZm9yRWFjaEF2YWlsYWJpbGl0eSgKQEAgLTkzNDgsNyArOTMzNiw3IEBAIHBy aXZhdGU6CiAgICAgICAgICAgICBpZiAoT3B0aW9uczo6dmFsaWRhdGVGVExPU1JFeGl0TGl2ZW5l c3MoKSkgewogICAgICAgICAgICAgICAgIERGR19BU1NFUlQoCiAgICAgICAgICAgICAgICAgICAg IG1fZ3JhcGgsIG1fbm9kZSwKLSAgICAgICAgICAgICAgICAgICAgKCEoYXZhaWxhYmlsaXR5Lmlz RGVhZCgpICYmIG1fZ3JhcGguaXNMaXZlSW5CeXRlY29kZShWaXJ0dWFsUmVnaXN0ZXIob3BlcmFu ZCksIGNvZGVPcmlnaW4pKSkgfHwgbV9ncmFwaC5tX3BsYW4ubW9kZSA9PSBGVExGb3JPU1JFbnRy eU1vZGUpOworICAgICAgICAgICAgICAgICAgICAoIShhdmFpbGFiaWxpdHkuaXNEZWFkKCkgJiYg bV9ncmFwaC5pc0xpdmVJbkJ5dGVjb2RlKFZpcnR1YWxSZWdpc3RlcihvcGVyYW5kKSwgZXhpdERl c2NyaXB0b3IubV9jb2RlT3JpZ2luKSkpIHx8IG1fZ3JhcGgubV9wbGFuLm1vZGUgPT0gRlRMRm9y T1NSRW50cnlNb2RlKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIEV4aXRWYWx1ZSBleGl0 VmFsdWUgPSBleGl0VmFsdWVGb3JBdmFpbGFiaWxpdHkoYXJndW1lbnRzLCBtYXAsIGF2YWlsYWJp bGl0eSk7CiAgICAgICAgICAgICBpZiAoZXhpdFZhbHVlLmhhc0luZGV4SW5TdGFja21hcExvY2F0 aW9ucygpKQo= 266392 2015-12-01 14:01:42 -0800 2015-12-01 14:05:29 -0800 the patch blah.patch text/plain 8578 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkyOTEwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE1LTEyLTAxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg UmVtb3ZlIHJlcGV0aXRpdmUgY3J1ZnQgZnJvbSBGVEwgT1NSIGV4aXQgY29kZSBpbiBMb3dlckRG R1RvTExWTQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTUxNzE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBiMy9CM1N0YWNrbWFwVmFsdWUuaDoKKyAgICAgICAgKiBmdGwvRlRMTG93ZXJERkdUb0xMVk0u Y3BwOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0xMVk06OmNvbXBpbGVJbnZh bGlkYXRpb25Qb2ludCk6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvTExWTTo6 YXBwZW5kT1NSRXhpdEFyZ3VtZW50c0ZvclBhdGNocG9pbnRJZldpbGxDYXRjaEV4Y2VwdGlvbik6 CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvTExWTTo6bG93QmxvY2spOgorICAg ICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0xMVk06OmFwcGVuZE9TUkV4aXREZXNjcmlw dG9yKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9MTFZNOjphcHBlbmRPU1JF eGl0KToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9MTFZNOjpibGVzc1NwZWN1 bGF0aW9uKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9MTFZNOjplbWl0T1NS RXhpdENhbGwpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0xMVk06OmJ1aWxk RXhpdEFyZ3VtZW50cyk6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvTExWTTo6 Y2FsbFN0YWNrbWFwKToKKwogMjAxNS0xMi0wMSAgQ2FpdGxpbiBQb3R0ZXIgIDxjYWl0cEBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtKU0NdIGFkZCBtaXNzaW5nIFJlcXVpcmVPYmplY3RDb2VyY2li bGUoKSBzdGVwIGluIGRlc3RydWN0dXJpbmcKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i My9CM1N0YWNrbWFwVmFsdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv YjMvQjNTdGFja21hcFZhbHVlLmgJKHJldmlzaW9uIDE5MjkwMSkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9iMy9CM1N0YWNrbWFwVmFsdWUuaAkod29ya2luZyBjb3B5KQpAQCAtODQsNiArODQs MTMgQEAgcHVibGljOgogICAgIC8vIGNoaWxkcmVuKCkuYXBwZW5kKCkuIFRoYXQgd2lsbCB3b3Jr IGZpbmUsIGJ1dCBpdCdzIG5vdCByZWNvbW1lbmRlZC4KICAgICB2b2lkIGFwcGVuZChjb25zdCBD b25zdHJhaW5lZFZhbHVlJik7CiAKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0b3JUeXBlPgor ICAgIHZvaWQgYXBwZW5kQW55cyhjb25zdCBWZWN0b3JUeXBlJiB2ZWN0b3IpCisgICAgeworICAg ICAgICBmb3IgKFZhbHVlKiB2YWx1ZSA6IHZlY3RvcikKKyAgICAgICAgICAgIGFwcGVuZCh2YWx1 ZSk7CisgICAgfQorCiAgICAgLy8gVGhpcyBpcyBhIGhlbHBlciBmb3Igc29tZXRoaW5nIHlvdSBt aWdodCBkbyBhIGxvdCBvZjogYXBwZW5kIGEgdmFsdWUgdGhhdCBzaG91bGQgYmUgY29uc3RyYWlu ZWQKICAgICAvLyB0byBTb21lUmVnaXN0ZXIuCiAgICAgdm9pZCBhcHBlbmRTb21lUmVnaXN0ZXIo VmFsdWUqKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xM Vk0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJE RkdUb0xMVk0uY3BwCShyZXZpc2lvbiAxOTI5MDEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTI4Myw4ICs1Mjgz LDcgQEAgcHJpdmF0ZToKICAgICAgICAgCiAgICAgICAgIE9TUkV4aXREZXNjcmlwdG9yJiBleGl0 RGVzY3JpcHRvciA9IG1fZnRsU3RhdGUuaml0Q29kZS0+b3NyRXhpdERlc2NyaXB0b3JzLmxhc3Qo KTsKICAgICAgICAgCi0gICAgICAgIFN0YWNrbWFwQXJndW1lbnRMaXN0IGFyZ3VtZW50cyA9Ci0g ICAgICAgICAgICBidWlsZEV4aXRBcmd1bWVudHMoZXhpdERlc2NyaXB0b3IsIEZvcm1hdHRlZFZh bHVlKCksIGV4aXREZXNjcmlwdG9yLm1fY29kZU9yaWdpbik7CisgICAgICAgIFN0YWNrbWFwQXJn dW1lbnRMaXN0IGFyZ3VtZW50cyA9IGJ1aWxkRXhpdEFyZ3VtZW50cyhleGl0RGVzY3JpcHRvciwg Rm9ybWF0dGVkVmFsdWUoKSk7CiAgICAgICAgIGNhbGxTdGFja21hcChleGl0RGVzY3JpcHRvciwg YXJndW1lbnRzKTsKICAgICAgICAgCiAgICAgICAgIGV4aXREZXNjcmlwdG9yLm1faXNJbnZhbGlk YXRpb25Qb2ludCA9IHRydWU7CkBAIC05MTgwLDcgKzkxNzksNyBAQCBwcml2YXRlOgogICAgICAg ICBleGl0RGVzY3JpcHRvci5tX3N0YWNrbWFwSUQgPSBtX3N0YWNrbWFwSURzIC0gMTsKIAogICAg ICAgICBTdGFja21hcEFyZ3VtZW50TGlzdCBmcmVzaExpc3QgPQotICAgICAgICAgICAgYnVpbGRF eGl0QXJndW1lbnRzKGV4aXREZXNjcmlwdG9yLCBub1ZhbHVlKCksIGV4aXREZXNjcmlwdG9yLm1f Y29kZU9yaWdpbiwgb2Zmc2V0T2ZFeGl0QXJndW1lbnRzKTsKKyAgICAgICAgICAgIGJ1aWxkRXhp dEFyZ3VtZW50cyhleGl0RGVzY3JpcHRvciwgbm9WYWx1ZSgpLCBvZmZzZXRPZkV4aXRBcmd1bWVu dHMpOwogICAgICAgICBhcmd1bWVudHMuYXBwZW5kVmVjdG9yKGZyZXNoTGlzdCk7CiAgICAgfQog CkBAIC05MjAxLDEzICs5MjAwLDEzIEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiBtX2Jsb2Nr cy5nZXQoYmxvY2spOwogICAgIH0KIAotICAgIHZvaWQgYXBwZW5kT1NSRXhpdERlc2NyaXB0b3Io RXhpdEtpbmQga2luZCwgRXhjZXB0aW9uVHlwZSBleGNlcHRpb25UeXBlLCBGb3JtYXR0ZWRWYWx1 ZSBsb3dWYWx1ZSwgTm9kZSogaGlnaFZhbHVlLCBOb2RlT3JpZ2luIG9yaWdpbikKKyAgICBPU1JF eGl0RGVzY3JpcHRvciYgYXBwZW5kT1NSRXhpdERlc2NyaXB0b3IoRXhpdEtpbmQga2luZCwgRXhj ZXB0aW9uVHlwZSBleGNlcHRpb25UeXBlLCBGb3JtYXR0ZWRWYWx1ZSBsb3dWYWx1ZSwgTm9kZSog aGlnaFZhbHVlLCBOb2RlT3JpZ2luIG9yaWdpbikKICAgICB7Ci0gICAgICAgIG1fZnRsU3RhdGUu aml0Q29kZS0+b3NyRXhpdERlc2NyaXB0b3JzLmFwcGVuZChPU1JFeGl0RGVzY3JpcHRvcigKKyAg ICAgICAgcmV0dXJuIG1fZnRsU3RhdGUuaml0Q29kZS0+b3NyRXhpdERlc2NyaXB0b3JzLmFsbG9j KAogICAgICAgICAgICAga2luZCwgZXhjZXB0aW9uVHlwZSwgbG93VmFsdWUuZm9ybWF0KCksIG1f Z3JhcGgubWV0aG9kT2ZHZXR0aW5nQVZhbHVlUHJvZmlsZUZvcihoaWdoVmFsdWUpLAogICAgICAg ICAgICAgb3JpZ2luLmZvckV4aXQsIG9yaWdpbi5zZW1hbnRpYywKICAgICAgICAgICAgIGF2YWls YWJpbGl0eU1hcCgpLm1fbG9jYWxzLm51bWJlck9mQXJndW1lbnRzKCksCi0gICAgICAgICAgICBh dmFpbGFiaWxpdHlNYXAoKS5tX2xvY2Fscy5udW1iZXJPZkxvY2FscygpKSk7CisgICAgICAgICAg ICBhdmFpbGFiaWxpdHlNYXAoKS5tX2xvY2Fscy5udW1iZXJPZkxvY2FscygpKTsKICAgICB9CiAg ICAgCiAgICAgdm9pZCBhcHBlbmRPU1JFeGl0KApAQCAtOTI0OCw4ICs5MjQ3LDcgQEAgcHJpdmF0 ZToKICAgICAgICAgYmxlc3NTcGVjdWxhdGlvbigKICAgICAgICAgICAgIG1fb3V0LnNwZWN1bGF0 ZShmYWlsQ29uZGl0aW9uKSwga2luZCwgbG93VmFsdWUsIGhpZ2hWYWx1ZSwgb3JpZ2luLCBpc0V4 Y2VwdGlvbkhhbmRsZXIpOwogI2Vsc2UgLy8gRlRMX1VTRVNfQjMKLSAgICAgICAgYXBwZW5kT1NS RXhpdERlc2NyaXB0b3Ioa2luZCwgaXNFeGNlcHRpb25IYW5kbGVyID8gRXhjZXB0aW9uVHlwZTo6 Q0NhbGxFeGNlcHRpb24gOiBFeGNlcHRpb25UeXBlOjpOb25lLCBsb3dWYWx1ZSwgaGlnaFZhbHVl LCBvcmlnaW4pOwotICAgICAgICBPU1JFeGl0RGVzY3JpcHRvciYgZXhpdERlc2NyaXB0b3IgPSBt X2Z0bFN0YXRlLmppdENvZGUtPm9zckV4aXREZXNjcmlwdG9ycy5sYXN0KCk7CisgICAgICAgIE9T UkV4aXREZXNjcmlwdG9yJiBleGl0RGVzY3JpcHRvciA9IGFwcGVuZE9TUkV4aXREZXNjcmlwdG9y KGtpbmQsIGlzRXhjZXB0aW9uSGFuZGxlciA/IEV4Y2VwdGlvblR5cGU6OkNDYWxsRXhjZXB0aW9u IDogRXhjZXB0aW9uVHlwZTo6Tm9uZSwgbG93VmFsdWUsIGhpZ2hWYWx1ZSwgb3JpZ2luKTsKIAog ICAgICAgICBpZiAoZmFpbENvbmRpdGlvbiA9PSBtX291dC5ib29sZWFuVHJ1ZSkgewogICAgICAg ICAgICAgZW1pdE9TUkV4aXRDYWxsKGV4aXREZXNjcmlwdG9yLCBsb3dWYWx1ZSk7CkBAIC05Mjc3 LDEyICs5Mjc1LDggQEAgcHJpdmF0ZToKICNpZiBGVExfVVNFU19CMwogICAgIHZvaWQgYmxlc3NT cGVjdWxhdGlvbihCMzo6U3RhY2ttYXBWYWx1ZSogdmFsdWUsIEV4aXRLaW5kIGtpbmQsIEZvcm1h dHRlZFZhbHVlIGxvd1ZhbHVlLCBOb2RlKiBoaWdoVmFsdWUsIE5vZGVPcmlnaW4gb3JpZ2luLCBi b29sIGlzRXhjZXB0aW9uSGFuZGxlciA9IGZhbHNlKQogICAgIHsKLSAgICAgICAgYXBwZW5kT1NS RXhpdERlc2NyaXB0b3Ioa2luZCwgaXNFeGNlcHRpb25IYW5kbGVyID8gRXhjZXB0aW9uVHlwZTo6 Q0NhbGxFeGNlcHRpb24gOiBFeGNlcHRpb25UeXBlOjpOb25lLCBsb3dWYWx1ZSwgaGlnaFZhbHVl LCBvcmlnaW4pOwotICAgICAgICBPU1JFeGl0RGVzY3JpcHRvciYgZXhpdERlc2NyaXB0b3IgPSBt X2Z0bFN0YXRlLmppdENvZGUtPm9zckV4aXREZXNjcmlwdG9ycy5sYXN0KCk7Ci0gICAgICAgIENv ZGVPcmlnaW4gY29kZU9yaWdpbiA9IGV4aXREZXNjcmlwdG9yLm1fY29kZU9yaWdpbjsKLSAgICAg ICAgU3RhY2ttYXBBcmd1bWVudExpc3QgYXJndW1lbnRzID0gYnVpbGRFeGl0QXJndW1lbnRzKGV4 aXREZXNjcmlwdG9yLCBsb3dWYWx1ZSwgY29kZU9yaWdpbik7Ci0gICAgICAgIGZvciAoTFZhbHVl IGNoaWxkIDogYXJndW1lbnRzKQotICAgICAgICAgICAgdmFsdWUtPmFwcGVuZChjaGlsZCk7Cisg ICAgICAgIE9TUkV4aXREZXNjcmlwdG9yJiBleGl0RGVzY3JpcHRvciA9IGFwcGVuZE9TUkV4aXRE ZXNjcmlwdG9yKGtpbmQsIGlzRXhjZXB0aW9uSGFuZGxlciA/IEV4Y2VwdGlvblR5cGU6OkNDYWxs RXhjZXB0aW9uIDogRXhjZXB0aW9uVHlwZTo6Tm9uZSwgbG93VmFsdWUsIGhpZ2hWYWx1ZSwgb3Jp Z2luKTsKKyAgICAgICAgdmFsdWUtPmFwcGVuZEFueXMoYnVpbGRFeGl0QXJndW1lbnRzKGV4aXRE ZXNjcmlwdG9yLCBsb3dWYWx1ZSkpOwogICAgICAgICB2YWx1ZS0+c2V0R2VuZXJhdG9yKAogICAg ICAgICAgICAgWyZdIChDQ2FsbEhlbHBlcnMmIGppdCwgY29uc3QgQjM6OlN0YWNrbWFwR2VuZXJh dGlvblBhcmFtcyYpIHsKICAgICAgICAgICAgICAgICBqaXQub29wcygpOwpAQCAtOTI5MywzNSAr OTI4NywyOSBAQCBwcml2YXRlOgogI2lmICFGVExfVVNFU19CMwogICAgIHZvaWQgZW1pdE9TUkV4 aXRDYWxsKE9TUkV4aXREZXNjcmlwdG9yJiBleGl0RGVzY3JpcHRvciwgRm9ybWF0dGVkVmFsdWUg bG93VmFsdWUpCiAgICAgewotICAgICAgICBTdGFja21hcEFyZ3VtZW50TGlzdCBhcmd1bWVudHM7 Ci0gICAgICAgIAotICAgICAgICBDb2RlT3JpZ2luIGNvZGVPcmlnaW4gPSBleGl0RGVzY3JpcHRv ci5tX2NvZGVPcmlnaW47Ci0gICAgICAgIAotICAgICAgICBidWlsZEV4aXRBcmd1bWVudHMoZXhp dERlc2NyaXB0b3IsIGFyZ3VtZW50cywgbG93VmFsdWUsIGNvZGVPcmlnaW4pOwotICAgICAgICAK LSAgICAgICAgY2FsbFN0YWNrbWFwKGV4aXREZXNjcmlwdG9yLCBhcmd1bWVudHMpOworICAgICAg ICBjYWxsU3RhY2ttYXAoZXhpdERlc2NyaXB0b3IsIGJ1aWxkRXhpdEFyZ3VtZW50cyhleGl0RGVz Y3JpcHRvciwgbG93VmFsdWUpKTsKICAgICB9CiAjZW5kaWYKIAogICAgIFN0YWNrbWFwQXJndW1l bnRMaXN0IGJ1aWxkRXhpdEFyZ3VtZW50cygKLSAgICAgICAgT1NSRXhpdERlc2NyaXB0b3ImIGV4 aXREZXNjcmlwdG9yLCBGb3JtYXR0ZWRWYWx1ZSBsb3dWYWx1ZSwgQ29kZU9yaWdpbiBjb2RlT3Jp Z2luLAorICAgICAgICBPU1JFeGl0RGVzY3JpcHRvciYgZXhpdERlc2NyaXB0b3IsIEZvcm1hdHRl ZFZhbHVlIGxvd1ZhbHVlLAogICAgICAgICB1bnNpZ25lZCBvZmZzZXRPZkV4aXRBcmd1bWVudHNJ blN0YWNrbWFwTG9jYXRpb25zID0gMCkKICAgICB7CiAgICAgICAgIFN0YWNrbWFwQXJndW1lbnRM aXN0IHJlc3VsdDsKICAgICAgICAgYnVpbGRFeGl0QXJndW1lbnRzKAotICAgICAgICAgICAgZXhp dERlc2NyaXB0b3IsIHJlc3VsdCwgbG93VmFsdWUsIGNvZGVPcmlnaW4sIG9mZnNldE9mRXhpdEFy Z3VtZW50c0luU3RhY2ttYXBMb2NhdGlvbnMpOworICAgICAgICAgICAgZXhpdERlc2NyaXB0b3Is IHJlc3VsdCwgbG93VmFsdWUsIG9mZnNldE9mRXhpdEFyZ3VtZW50c0luU3RhY2ttYXBMb2NhdGlv bnMpOwogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0KICAgICAKICAgICB2b2lkIGJ1aWxk RXhpdEFyZ3VtZW50cygKICAgICAgICAgT1NSRXhpdERlc2NyaXB0b3ImIGV4aXREZXNjcmlwdG9y LCBTdGFja21hcEFyZ3VtZW50TGlzdCYgYXJndW1lbnRzLCBGb3JtYXR0ZWRWYWx1ZSBsb3dWYWx1 ZSwKLSAgICAgICAgQ29kZU9yaWdpbiBjb2RlT3JpZ2luLCB1bnNpZ25lZCBvZmZzZXRPZkV4aXRB cmd1bWVudHNJblN0YWNrbWFwTG9jYXRpb25zID0gMCkKKyAgICAgICAgdW5zaWduZWQgb2Zmc2V0 T2ZFeGl0QXJndW1lbnRzSW5TdGFja21hcExvY2F0aW9ucyA9IDApCiAgICAgewogICAgICAgICBp ZiAoISFsb3dWYWx1ZSkKICAgICAgICAgICAgIGFyZ3VtZW50cy5hcHBlbmQobG93VmFsdWUudmFs dWUoKSk7CiAgICAgICAgIAogICAgICAgICBBdmFpbGFiaWxpdHlNYXAgYXZhaWxhYmlsaXR5TWFw ID0gdGhpcy0+YXZhaWxhYmlsaXR5TWFwKCk7Ci0gICAgICAgIGF2YWlsYWJpbGl0eU1hcC5wcnVu ZUJ5TGl2ZW5lc3MobV9ncmFwaCwgY29kZU9yaWdpbik7CisgICAgICAgIGF2YWlsYWJpbGl0eU1h cC5wcnVuZUJ5TGl2ZW5lc3MobV9ncmFwaCwgZXhpdERlc2NyaXB0b3IubV9jb2RlT3JpZ2luKTsK ICAgICAgICAgCiAgICAgICAgIEhhc2hNYXA8Tm9kZSosIEV4aXRUaW1lT2JqZWN0TWF0ZXJpYWxp emF0aW9uKj4gbWFwOwogICAgICAgICBhdmFpbGFiaWxpdHlNYXAuZm9yRWFjaEF2YWlsYWJpbGl0 eSgKQEAgLTkzNDgsNyArOTMzNiw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBpZiAoT3B0aW9u czo6dmFsaWRhdGVGVExPU1JFeGl0TGl2ZW5lc3MoKSkgewogICAgICAgICAgICAgICAgIERGR19B U1NFUlQoCiAgICAgICAgICAgICAgICAgICAgIG1fZ3JhcGgsIG1fbm9kZSwKLSAgICAgICAgICAg ICAgICAgICAgKCEoYXZhaWxhYmlsaXR5LmlzRGVhZCgpICYmIG1fZ3JhcGguaXNMaXZlSW5CeXRl Y29kZShWaXJ0dWFsUmVnaXN0ZXIob3BlcmFuZCksIGNvZGVPcmlnaW4pKSkgfHwgbV9ncmFwaC5t X3BsYW4ubW9kZSA9PSBGVExGb3JPU1JFbnRyeU1vZGUpOworICAgICAgICAgICAgICAgICAgICAo IShhdmFpbGFiaWxpdHkuaXNEZWFkKCkgJiYgbV9ncmFwaC5pc0xpdmVJbkJ5dGVjb2RlKFZpcnR1 YWxSZWdpc3RlcihvcGVyYW5kKSwgZXhpdERlc2NyaXB0b3IubV9jb2RlT3JpZ2luKSkpIHx8IG1f Z3JhcGgubV9wbGFuLm1vZGUgPT0gRlRMRm9yT1NSRW50cnlNb2RlKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIEV4aXRWYWx1ZSBleGl0VmFsdWUgPSBleGl0VmFsdWVGb3JBdmFpbGFiaWxp dHkoYXJndW1lbnRzLCBtYXAsIGF2YWlsYWJpbGl0eSk7CiAgICAgICAgICAgICBpZiAoZXhpdFZh bHVlLmhhc0luZGV4SW5TdGFja21hcExvY2F0aW9ucygpKQpAQCAtOTM3OCw3ICs5MzY2LDcgQEAg cHJpdmF0ZToKICAgICB9CiAKICNpZiAhRlRMX1VTRVNfQjMKLSAgICB2b2lkIGNhbGxTdGFja21h cChPU1JFeGl0RGVzY3JpcHRvciYgZXhpdERlc2NyaXB0b3IsIFN0YWNrbWFwQXJndW1lbnRMaXN0 JiBhcmd1bWVudHMpCisgICAgdm9pZCBjYWxsU3RhY2ttYXAoT1NSRXhpdERlc2NyaXB0b3ImIGV4 aXREZXNjcmlwdG9yLCBTdGFja21hcEFyZ3VtZW50TGlzdCBhcmd1bWVudHMpCiAgICAgewogICAg ICAgICBleGl0RGVzY3JpcHRvci5tX3N0YWNrbWFwSUQgPSBtX3N0YWNrbWFwSURzKys7CiAgICAg ICAgIGFyZ3VtZW50cy5pbnNlcnQoMCwgbV9vdXQuY29uc3RJbnQzMihNYWNyb0Fzc2VtYmxlcjo6 bWF4SnVtcFJlcGxhY2VtZW50U2l6ZSgpKSk7Cg==