122248 2013-10-02 16:37:51 -0700 The DFG should use always DFG::Graph methods for determining where special registers are 2013-10-02 19:26:28 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 122024 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 935607 0 fpizlo 2013-10-02 16:37:51 -0700 Patch forthcoming. 935609 1 213215 fpizlo 2013-10-02 16:39:22 -0700 Created attachment 213215 the patch 935642 2 fpizlo 2013-10-02 19:26:28 -0700 Landed in http://trac.webkit.org/changeset/156817 213215 2013-10-02 16:39:22 -0700 2013-10-02 16:43:54 -0700 the patch blah.patch text/plain 15404 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU2ODEwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBA CisyMDEzLTEwLTAyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg VGhlIERGRyBzaG91bGQgdXNlIGFsd2F5cyBERkc6OkdyYXBoIG1ldGhvZHMgZm9yIGRldGVybWlu aW5nIHdoZXJlIHNwZWNpYWwgcmVnaXN0ZXJzIGFyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyMjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBUaGlzIG1ha2VzIGl0IHBvc3NpYmxlIHRv IGhhdmUgdGhlIERGRyB1c2UgZGlmZmVyZW50IHJlZ2lzdGVycyB0aGFuIHRoZSBvdGhlciBlbmdp bmVzCisgICAgICAgIGZvciB0aGluZ3MgbGlrZSBhY3RpdmF0aW9uIGFuZCBhcmd1bWVudHMuCisK KyAgICAgICAgKiBkZmcvREZHQ1NFUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkNTRVBo YXNlOjpzZXRMb2NhbFN0b3JlRWxpbWluYXRpb24pOgorICAgICAgICAqIGRmZy9ERkdDbG9iYmVy aXplLmg6CisgICAgICAgIChKU0M6OkRGRzo6Y2xvYmJlcml6ZSk6CisgICAgICAgICogZGZnL0RG R0dyYXBoLmg6CisgICAgICAgIChKU0M6OkRGRzo6R3JhcGg6OmFjdGl2YXRpb25SZWdpc3Rlcik6 CisgICAgICAgIChKU0M6OkRGRzo6R3JhcGg6OnVuY2hlY2tlZEFjdGl2YXRpb25SZWdpc3Rlcik6 CisgICAgICAgICogZGZnL0RGR09TUkV4aXRDb21waWxlcjMyXzY0LmNwcDoKKyAgICAgICAgKEpT Qzo6REZHOjpPU1JFeGl0Q29tcGlsZXI6OmNvbXBpbGVFeGl0KToKKyAgICAgICAgKiBkZmcvREZH T1NSRXhpdENvbXBpbGVyNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6Ok9TUkV4aXRDb21waWxl cjo6Y29tcGlsZUV4aXQpOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNw cDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZSk6CisgICAgICAg ICogZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1 bGF0aXZlSklUOjpjb21waWxlKToKKyAgICAgICAgKiBqaXQvQXNzZW1ibHlIZWxwZXJzLmg6Cisg ICAgICAgIChKU0M6OkFzc2VtYmx5SGVscGVyczo6YmFzZWxpbmVBcmd1bWVudHNSZWdpc3RlckZv cik6CisKIDIwMTMtMTAtMDIgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAK ICAgICAgICAgTWFrZSBCYXNlbGluZSBKSVQgZXhjZXB0aW9uIGhhbmRsaW5nIHdvcmsgbGlrZSB0 aGUgREZHIEpJVApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDU0VQaGFzZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDU0VQaGFzZS5j cHAJKHJldmlzaW9uIDE1Njc1OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ1NF UGhhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MDIsNyArOTAyLDkgQEAgcHJpdmF0ZToKICAg ICAgICAgICAgICAgICAKICAgICAgICAgICAgIGNhc2UgR2V0TXlTY29wZToKICAgICAgICAgICAg IGNhc2UgU2tpcFRvcFNjb3BlOgotICAgICAgICAgICAgICAgIGlmIChtX2dyYXBoLnVuY2hlY2tl ZEFjdGl2YXRpb25SZWdpc3RlckZvcihub2RlLT5jb2RlT3JpZ2luKSA9PSBsb2NhbCkKKyAgICAg ICAgICAgICAgICBpZiAobm9kZS0+Y29kZU9yaWdpbi5pbmxpbmVDYWxsRnJhbWUpCisgICAgICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGlmIChtX2dyYXBoLnVuY2hlY2tl ZEFjdGl2YXRpb25SZWdpc3RlcigpID09IGxvY2FsKQogICAgICAgICAgICAgICAgICAgICByZXN1 bHQubWF5QmVBY2Nlc3NlZCA9IHRydWU7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICAgICAgCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJpemUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Nsb2JiZXJpemUu aAkocmV2aXNpb24gMTU2NzU5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDbG9i YmVyaXplLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ5Nyw3ICs0OTcsNyBAQCB2b2lkIGNsb2JiZXJp emUoR3JhcGgmIGdyYXBoLCBOb2RlKiBub2RlCiAgICAgICAgIHJldHVybjsKICAgICAgICAgCiAg ICAgY2FzZSBTa2lwVG9wU2NvcGU6Ci0gICAgICAgIHJlYWQoQWJzdHJhY3RIZWFwKFZhcmlhYmxl cywgZ3JhcGgubV9jb2RlQmxvY2stPmFjdGl2YXRpb25SZWdpc3RlcigpKSk7CisgICAgICAgIHJl YWQoQWJzdHJhY3RIZWFwKFZhcmlhYmxlcywgZ3JhcGguYWN0aXZhdGlvblJlZ2lzdGVyKCkpKTsK ICAgICAgICAgcmV0dXJuOwogICAgICAgICAKICAgICBjYXNlIEdldENsb3N1cmVSZWdpc3RlcnM6 CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdHcmFwaC5oCShyZXZpc2lvbiAxNTY3NTkp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmgJKHdvcmtpbmcgY29weSkK QEAgLTQ1MywxNCArNDUzLDEzIEBAIHB1YmxpYzoKICAgICAgICAgICAgIGNvZGVPcmlnaW4uaW5s aW5lQ2FsbEZyYW1lLT5zdGFja09mZnNldCk7CiAgICAgfQogICAgIAotICAgIFZpcnR1YWxSZWdp c3RlciB1bmNoZWNrZWRBY3RpdmF0aW9uUmVnaXN0ZXJGb3IoY29uc3QgQ29kZU9yaWdpbiYpCisg ICAgVmlydHVhbFJlZ2lzdGVyIGFjdGl2YXRpb25SZWdpc3RlcigpCisgICAgeworICAgICAgICBy ZXR1cm4gbV9jb2RlQmxvY2stPmFjdGl2YXRpb25SZWdpc3RlcigpOworICAgIH0KKyAgICAKKyAg ICBWaXJ0dWFsUmVnaXN0ZXIgdW5jaGVja2VkQWN0aXZhdGlvblJlZ2lzdGVyKCkKICAgICB7Ci0g ICAgICAgIC8vIFRoaXMgd2lsbCBpZ25vcmUgQ29kZU9yaWdpbiBiZWNhdXNlIHdlIGRvbid0IGlu bGluZSBjb2RlIHRoYXQgdXNlcyBhY3RpdmF0aW9ucy4KLSAgICAgICAgLy8gSGVuY2UgZm9yIGlu bGluZWQgY2FsbCBmcmFtZXMgaXQgd2lsbCByZXR1cm4gdGhlIG91dGVybW9zdCBjb2RlIGJsb2Nr J3MKLSAgICAgICAgLy8gYWN0aXZhdGlvbiByZWdpc3Rlci4gVGhpcyBtZXRob2QgaXMgb25seSB1 c2VkIHRvIGNvbXBhcmUgdGhlIHJlc3VsdCB0byBhIGxvY2FsCi0gICAgICAgIC8vIHRvIHNlZSBp ZiB3ZSdyZSBtdWNraW5nIHdpdGggdGhlIGFjdGl2YXRpb24gcmVnaXN0ZXIuIEhlbmNlIGlmIHdl IHJldHVybiB0aGUKLSAgICAgICAgLy8gIndyb25nIiBhY3RpdmF0aW9uIHJlZ2lzdGVyIGZvciB0 aGUgZnJhbWUgdGhlbiBpdCB3aWxsIGNvbXBhcmUgZmFsc2UsIHdoaWNoIGlzCi0gICAgICAgIC8v IHdoYXQgd2Ugd2FudGVkLgogICAgICAgICByZXR1cm4gbV9jb2RlQmxvY2stPnVuY2hlY2tlZEFj dGl2YXRpb25SZWdpc3RlcigpOwogICAgIH0KICAgICAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHT1NSRXhpdENvbXBpbGVyMzJfNjQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdENvbXBpbGVyMzJfNjQuY3BwCShyZXZpc2lv biAxNTY3NTkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXRDb21waWxl cjMyXzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDI3LDcgKzQyNyw3IEBAIHZvaWQgT1NSRXhp dENvbXBpbGVyOjpjb21waWxlRXhpdChjb25zdCAKIAogICAgICAgICAgICAgaWYgKCFtX2ppdC5i YXNlbGluZUNvZGVCbG9ja0ZvcihpbmxpbmVDYWxsRnJhbWUpLT51c2VzQXJndW1lbnRzKCkpCiAg ICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBWaXJ0dWFsUmVnaXN0ZXIgYXJn dW1lbnRzUmVnaXN0ZXIgPSBtX2ppdC5hcmd1bWVudHNSZWdpc3RlckZvcihpbmxpbmVDYWxsRnJh bWUpOworICAgICAgICAgICAgVmlydHVhbFJlZ2lzdGVyIGFyZ3VtZW50c1JlZ2lzdGVyID0gbV9q aXQuYmFzZWxpbmVBcmd1bWVudHNSZWdpc3RlckZvcihpbmxpbmVDYWxsRnJhbWUpOwogICAgICAg ICAgICAgaWYgKGRpZENyZWF0ZUFyZ3VtZW50c09iamVjdC5hZGQoaW5saW5lQ2FsbEZyYW1lKS5p c05ld0VudHJ5KSB7CiAgICAgICAgICAgICAgICAgLy8gV2Uga25vdyB0aGlzIGNhbGwgZnJhbWUg b3B0aW1pemVkIG91dCBhbiBhcmd1bWVudHMgb2JqZWN0IHRoYXQKICAgICAgICAgICAgICAgICAv LyB0aGUgYmFzZWxpbmUgSklUIHdvdWxkIGhhdmUgY3JlYXRlZC4gRG8gdGhhdCBjcmVhdGlvbiBu b3cuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXRDb21waWxlcjY0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXRD b21waWxlcjY0LmNwcAkocmV2aXNpb24gMTU2NzU5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdPU1JFeGl0Q29tcGlsZXI2NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4Nyw3ICsz ODcsNyBAQCB2b2lkIE9TUkV4aXRDb21waWxlcjo6Y29tcGlsZUV4aXQoY29uc3QgCiAKICAgICAg ICAgICAgIGlmICghbV9qaXQuYmFzZWxpbmVDb2RlQmxvY2tGb3IoaW5saW5lQ2FsbEZyYW1lKS0+ dXNlc0FyZ3VtZW50cygpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAg VmlydHVhbFJlZ2lzdGVyIGFyZ3VtZW50c1JlZ2lzdGVyID0gbV9qaXQuYXJndW1lbnRzUmVnaXN0 ZXJGb3IoaW5saW5lQ2FsbEZyYW1lKTsKKyAgICAgICAgICAgIFZpcnR1YWxSZWdpc3RlciBhcmd1 bWVudHNSZWdpc3RlciA9IG1faml0LmJhc2VsaW5lQXJndW1lbnRzUmVnaXN0ZXJGb3IoaW5saW5l Q2FsbEZyYW1lKTsKICAgICAgICAgICAgIGlmIChkaWRDcmVhdGVBcmd1bWVudHNPYmplY3QuYWRk KGlubGluZUNhbGxGcmFtZSkuaXNOZXdFbnRyeSkgewogICAgICAgICAgICAgICAgIC8vIFdlIGtu b3cgdGhpcyBjYWxsIGZyYW1lIG9wdGltaXplZCBvdXQgYW4gYXJndW1lbnRzIG9iamVjdCB0aGF0 CiAgICAgICAgICAgICAgICAgLy8gdGhlIGJhc2VsaW5lIEpJVCB3b3VsZCBoYXZlIGNyZWF0ZWQu IERvIHRoYXQgY3JlYXRpb24gbm93LgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCShyZXZpc2lvbiAxNTY3NTkpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNzE4LDcgKzM3MTgsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpj b21waWxlKE5vZGUqIG5vZGUpCiAgICAgICAgICAgICBtX2ppdC5icmFuY2hUZXN0UHRyKAogICAg ICAgICAgICAgICAgIEpJVENvbXBpbGVyOjpaZXJvLAogICAgICAgICAgICAgICAgIEpJVENvbXBp bGVyOjpwYXlsb2FkRm9yKAotICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxWaXJ0dWFs UmVnaXN0ZXI+KG1faml0LmNvZGVCbG9jaygpLT5hY3RpdmF0aW9uUmVnaXN0ZXIoKSkpKTsKKyAg ICAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8VmlydHVhbFJlZ2lzdGVyPihtX2ppdC5ncmFw aCgpLmFjdGl2YXRpb25SZWdpc3RlcigpKSkpOwogICAgICAgICBtX2ppdC5sb2FkUHRyKEpJVENv bXBpbGVyOjpBZGRyZXNzKHJlc3VsdEdQUiwgSlNTY29wZTo6b2Zmc2V0T2ZOZXh0KCkpLCByZXN1 bHRHUFIpOwogICAgICAgICBhY3RpdmF0aW9uTm90Q3JlYXRlZC5saW5rKCZtX2ppdCk7CiAgICAg ICAgIGNlbGxSZXN1bHQocmVzdWx0R1BSLCBub2RlKTsKQEAgLTQ0NjcsNyArNDQ2Nyw3IEBAIHZv aWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSogbm9kZSkKICAgICAgICAgICAgIFVuY291 bnRhYmxlLCBKU1ZhbHVlUmVncygpLCAwLAogICAgICAgICAgICAgbV9qaXQuYnJhbmNoMzIoCiAg ICAgICAgICAgICAgICAgSklUQ29tcGlsZXI6Ok5vdEVxdWFsLAotICAgICAgICAgICAgICAgIEpJ VENvbXBpbGVyOjp0YWdGb3IobV9qaXQuYXJndW1lbnRzUmVnaXN0ZXJGb3Iobm9kZS0+Y29kZU9y aWdpbikpLAorICAgICAgICAgICAgICAgIEpJVENvbXBpbGVyOjp0YWdGb3IobV9qaXQuZ3JhcGgo KS5hcmd1bWVudHNSZWdpc3RlckZvcihub2RlLT5jb2RlT3JpZ2luKSksCiAgICAgICAgICAgICAg ICAgVHJ1c3RlZEltbTMyKEpTVmFsdWU6OkVtcHR5VmFsdWVUYWcpKSk7CiAgICAgICAgIG5vUmVz dWx0KG5vZGUpOwogICAgICAgICBicmVhazsKQEAgLTQ0ODQsNyArNDQ4NCw3IEBAIHZvaWQgU3Bl Y3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSogbm9kZSkKICAgICAgICAgICAgICAgICBBcmd1bWVu dHNFc2NhcGVkLCBKU1ZhbHVlUmVncygpLCAwLAogICAgICAgICAgICAgICAgIG1faml0LmJyYW5j aDMyKAogICAgICAgICAgICAgICAgICAgICBKSVRDb21waWxlcjo6Tm90RXF1YWwsCi0gICAgICAg ICAgICAgICAgICAgIEpJVENvbXBpbGVyOjp0YWdGb3IobV9qaXQuYXJndW1lbnRzUmVnaXN0ZXJG b3Iobm9kZS0+Y29kZU9yaWdpbikpLAorICAgICAgICAgICAgICAgICAgICBKSVRDb21waWxlcjo6 dGFnRm9yKG1faml0LmdyYXBoKCkuYXJndW1lbnRzUmVnaXN0ZXJGb3Iobm9kZS0+Y29kZU9yaWdp bikpLAogICAgICAgICAgICAgICAgICAgICBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6RW1wdHlWYWx1 ZVRhZykpKTsKICAgICAgICAgfQogICAgICAgICAKQEAgLTQ1MDMsNyArNDUwMyw3IEBAIHZvaWQg U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSogbm9kZSkKICAgICAgICAgCiAgICAgICAgIEpJ VENvbXBpbGVyOjpKdW1wIGNyZWF0ZWQgPSBtX2ppdC5icmFuY2gzMigKICAgICAgICAgICAgIEpJ VENvbXBpbGVyOjpOb3RFcXVhbCwKLSAgICAgICAgICAgIEpJVENvbXBpbGVyOjp0YWdGb3IobV9q aXQuYXJndW1lbnRzUmVnaXN0ZXJGb3Iobm9kZS0+Y29kZU9yaWdpbikpLAorICAgICAgICAgICAg SklUQ29tcGlsZXI6OnRhZ0ZvcihtX2ppdC5ncmFwaCgpLmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG5v ZGUtPmNvZGVPcmlnaW4pKSwKICAgICAgICAgICAgIFRydXN0ZWRJbW0zMihKU1ZhbHVlOjpFbXB0 eVZhbHVlVGFnKSk7CiAgICAgICAgIAogICAgICAgICBpZiAobm9kZS0+Y29kZU9yaWdpbi5pbmxp bmVDYWxsRnJhbWUpIHsKQEAgLTQ1MjQsNyArNDUyNCw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6 OmNvbXBpbGUoTm9kZSogbm9kZSkKICAgICAgICAgICAgIHNsb3dQYXRoQ2FsbCgKICAgICAgICAg ICAgICAgICBjcmVhdGVkLCB0aGlzLCBvcGVyYXRpb25HZXRBcmd1bWVudHNMZW5ndGgsCiAgICAg ICAgICAgICAgICAgSlNWYWx1ZVJlZ3MocmVzdWx0VGFnR1BSLCByZXN1bHRQYXlsb2FkR1BSKSwK LSAgICAgICAgICAgICAgICBtX2ppdC5hcmd1bWVudHNSZWdpc3RlckZvcihub2RlLT5jb2RlT3Jp Z2luKS5vZmZzZXQoKSkpOworICAgICAgICAgICAgICAgIG1faml0LmdyYXBoKCkuYXJndW1lbnRz UmVnaXN0ZXJGb3Iobm9kZS0+Y29kZU9yaWdpbikub2Zmc2V0KCkpKTsKICAgICAgICAgCiAgICAg ICAgIGpzVmFsdWVSZXN1bHQocmVzdWx0VGFnR1BSLCByZXN1bHRQYXlsb2FkR1BSLCBub2RlKTsK ICAgICAgICAgYnJlYWs7CkBAIC00NTQ1LDcgKzQ1NDUsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklU Ojpjb21waWxlKE5vZGUqIG5vZGUpCiAgICAgICAgICAgICAgICAgQXJndW1lbnRzRXNjYXBlZCwg SlNWYWx1ZVJlZ3MoKSwgMCwKICAgICAgICAgICAgICAgICBtX2ppdC5icmFuY2gzMigKICAgICAg ICAgICAgICAgICAgICAgSklUQ29tcGlsZXI6Ok5vdEVxdWFsLAotICAgICAgICAgICAgICAgICAg ICBKSVRDb21waWxlcjo6dGFnRm9yKG1faml0LmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG5vZGUtPmNv ZGVPcmlnaW4pKSwKKyAgICAgICAgICAgICAgICAgICAgSklUQ29tcGlsZXI6OnRhZ0ZvcihtX2pp dC5ncmFwaCgpLmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG5vZGUtPmNvZGVPcmlnaW4pKSwKICAgICAg ICAgICAgICAgICAgICAgVHJ1c3RlZEltbTMyKEpTVmFsdWU6OkVtcHR5VmFsdWVUYWcpKSk7CiAg ICAgICAgIH0KICAgICAgICAgICAgIApAQCAtNDYyNCw3ICs0NjI0LDcgQEAgdm9pZCBTcGVjdWxh dGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgICAgICBzbG93UGF0aC5hcHBlbmQoCiAg ICAgICAgICAgICBtX2ppdC5icmFuY2gzMigKICAgICAgICAgICAgICAgICBKSVRDb21waWxlcjo6 Tm90RXF1YWwsCi0gICAgICAgICAgICAgICAgSklUQ29tcGlsZXI6OnRhZ0ZvcihtX2ppdC5hcmd1 bWVudHNSZWdpc3RlckZvcihub2RlLT5jb2RlT3JpZ2luKSksCisgICAgICAgICAgICAgICAgSklU Q29tcGlsZXI6OnRhZ0ZvcihtX2ppdC5ncmFwaCgpLmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG5vZGUt PmNvZGVPcmlnaW4pKSwKICAgICAgICAgICAgICAgICBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6RW1w dHlWYWx1ZVRhZykpKTsKICAgICAgICAgCiAgICAgICAgIG1faml0LmFkZDMyKFRydXN0ZWRJbW0z MigxKSwgaW5kZXhHUFIsIHJlc3VsdFBheWxvYWRHUFIpOwpAQCAtNDY4NywxNCArNDY4NywxNCBA QCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUqIG5vZGUpCiAgICAgICAgICAgICAg ICAgc2xvd1BhdGhDYWxsKAogICAgICAgICAgICAgICAgICAgICBzbG93UGF0aCwgdGhpcywgb3Bl cmF0aW9uR2V0SW5saW5lZEFyZ3VtZW50QnlWYWwsCiAgICAgICAgICAgICAgICAgICAgIEpTVmFs dWVSZWdzKHJlc3VsdFRhZ0dQUiwgcmVzdWx0UGF5bG9hZEdQUiksCi0gICAgICAgICAgICAgICAg ICAgIG1faml0LmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG5vZGUtPmNvZGVPcmlnaW4pLm9mZnNldCgp LAorICAgICAgICAgICAgICAgICAgICBtX2ppdC5ncmFwaCgpLmFyZ3VtZW50c1JlZ2lzdGVyRm9y KG5vZGUtPmNvZGVPcmlnaW4pLm9mZnNldCgpLAogICAgICAgICAgICAgICAgICAgICBub2RlLT5j b2RlT3JpZ2luLmlubGluZUNhbGxGcmFtZSwgaW5kZXhHUFIpKTsKICAgICAgICAgfSBlbHNlIHsK ICAgICAgICAgICAgIGFkZFNsb3dQYXRoR2VuZXJhdG9yKAogICAgICAgICAgICAgICAgIHNsb3dQ YXRoQ2FsbCgKICAgICAgICAgICAgICAgICAgICAgc2xvd1BhdGgsIHRoaXMsIG9wZXJhdGlvbkdl dEFyZ3VtZW50QnlWYWwsCiAgICAgICAgICAgICAgICAgICAgIEpTVmFsdWVSZWdzKHJlc3VsdFRh Z0dQUiwgcmVzdWx0UGF5bG9hZEdQUiksCi0gICAgICAgICAgICAgICAgICAgIG1faml0LmFyZ3Vt ZW50c1JlZ2lzdGVyRm9yKG5vZGUtPmNvZGVPcmlnaW4pLm9mZnNldCgpLCBpbmRleEdQUikpOwor ICAgICAgICAgICAgICAgICAgICBtX2ppdC5ncmFwaCgpLmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG5v ZGUtPmNvZGVPcmlnaW4pLm9mZnNldCgpLCBpbmRleEdQUikpOwogICAgICAgICB9CiAgICAgICAg IAogICAgICAgICBzbG93QXJndW1lbnQubGluaygmbV9qaXQpOwpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCShyZXZpc2lvbiAx NTY3NTkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MDEyLDcgKzQwMTIsNyBAQCB2b2lkIFNwZWN1bGF0aXZl SklUOjpjb21waWxlKE5vZGUqIG5vZGUpCiAgICAgICAgICAgICBtX2ppdC5icmFuY2hUZXN0NjQo CiAgICAgICAgICAgICAgICAgSklUQ29tcGlsZXI6Olplcm8sCiAgICAgICAgICAgICAgICAgSklU Q29tcGlsZXI6OmFkZHJlc3NGb3IoCi0gICAgICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PFZp cnR1YWxSZWdpc3Rlcj4obV9qaXQuY29kZUJsb2NrKCktPmFjdGl2YXRpb25SZWdpc3RlcigpKSkp OworICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxWaXJ0dWFsUmVnaXN0ZXI+KG1faml0 LmdyYXBoKCkuYWN0aXZhdGlvblJlZ2lzdGVyKCkpKSk7CiAgICAgICAgIG1faml0LmxvYWRQdHIo SklUQ29tcGlsZXI6OkFkZHJlc3MocmVzdWx0R1BSLCBKU1Njb3BlOjpvZmZzZXRPZk5leHQoKSks IHJlc3VsdEdQUik7CiAgICAgICAgIGFjdGl2YXRpb25Ob3RDcmVhdGVkLmxpbmsoJm1faml0KTsK ICAgICAgICAgY2VsbFJlc3VsdChyZXN1bHRHUFIsIG5vZGUpOwpAQCAtNDczMSw3ICs0NzMxLDcg QEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgICAgICAgICAg ICAgIG1faml0LmJyYW5jaFRlc3Q2NCgKICAgICAgICAgICAgICAgICAgICAgSklUQ29tcGlsZXI6 Ok5vblplcm8sCiAgICAgICAgICAgICAgICAgICAgIEpJVENvbXBpbGVyOjphZGRyZXNzRm9yKAot ICAgICAgICAgICAgICAgICAgICAgICAgbV9qaXQuYXJndW1lbnRzUmVnaXN0ZXJGb3Iobm9kZS0+ Y29kZU9yaWdpbikpKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBtX2ppdC5ncmFwaCgpLmFy Z3VtZW50c1JlZ2lzdGVyRm9yKG5vZGUtPmNvZGVPcmlnaW4pKSkpOwogICAgICAgICB9CiAgICAg ICAgIAogICAgICAgICBSRUxFQVNFX0FTU0VSVCghbm9kZS0+Y29kZU9yaWdpbi5pbmxpbmVDYWxs RnJhbWUpOwpAQCAtNDc0OCw3ICs0NzQ4LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGls ZShOb2RlKiBub2RlKQogICAgICAgICBKSVRDb21waWxlcjo6SnVtcCBjcmVhdGVkID0gbV9qaXQu YnJhbmNoVGVzdDY0KAogICAgICAgICAgICAgSklUQ29tcGlsZXI6Ok5vblplcm8sCiAgICAgICAg ICAgICBKSVRDb21waWxlcjo6YWRkcmVzc0ZvcigKLSAgICAgICAgICAgICAgICBtX2ppdC5hcmd1 bWVudHNSZWdpc3RlckZvcihub2RlLT5jb2RlT3JpZ2luKSkpOworICAgICAgICAgICAgICAgIG1f aml0LmdyYXBoKCkuYXJndW1lbnRzUmVnaXN0ZXJGb3Iobm9kZS0+Y29kZU9yaWdpbikpKTsKICAg ICAgICAgCiAgICAgICAgIGlmIChub2RlLT5jb2RlT3JpZ2luLmlubGluZUNhbGxGcmFtZSkgewog ICAgICAgICAgICAgbV9qaXQubW92ZSgKQEAgLTQ3NjcsNyArNDc2Nyw3IEBAIHZvaWQgU3BlY3Vs YXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSogbm9kZSkKICAgICAgICAgYWRkU2xvd1BhdGhHZW5lcmF0 b3IoCiAgICAgICAgICAgICBzbG93UGF0aENhbGwoCiAgICAgICAgICAgICAgICAgY3JlYXRlZCwg dGhpcywgb3BlcmF0aW9uR2V0QXJndW1lbnRzTGVuZ3RoLCByZXN1bHRHUFIsCi0gICAgICAgICAg ICAgICAgbV9qaXQuYXJndW1lbnRzUmVnaXN0ZXJGb3Iobm9kZS0+Y29kZU9yaWdpbikub2Zmc2V0 KCkpKTsKKyAgICAgICAgICAgICAgICBtX2ppdC5ncmFwaCgpLmFyZ3VtZW50c1JlZ2lzdGVyRm9y KG5vZGUtPmNvZGVPcmlnaW4pLm9mZnNldCgpKSk7CiAgICAgICAgIAogICAgICAgICBqc1ZhbHVl UmVzdWx0KHJlc3VsdEdQUiwgbm9kZSk7CiAgICAgICAgIGJyZWFrOwpAQCAtNDc4Nyw3ICs0Nzg3 LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgICAgICAg ICAgICAgIG1faml0LmJyYW5jaFRlc3Q2NCgKICAgICAgICAgICAgICAgICAgICAgSklUQ29tcGls ZXI6Ok5vblplcm8sCiAgICAgICAgICAgICAgICAgICAgIEpJVENvbXBpbGVyOjphZGRyZXNzRm9y KAotICAgICAgICAgICAgICAgICAgICAgICAgbV9qaXQuYXJndW1lbnRzUmVnaXN0ZXJGb3Iobm9k ZS0+Y29kZU9yaWdpbikpKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBtX2ppdC5ncmFwaCgp LmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG5vZGUtPmNvZGVPcmlnaW4pKSkpOwogICAgICAgICB9CiAK ICAgICAgICAgbV9qaXQuYWRkMzIoVHJ1c3RlZEltbTMyKDEpLCBpbmRleEdQUiwgcmVzdWx0R1BS KTsKQEAgLTQ4NTQsNyArNDg1NCw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9k ZSogbm9kZSkKICAgICAgICAgICAgIG1faml0LmJyYW5jaFRlc3Q2NCgKICAgICAgICAgICAgICAg ICBKSVRDb21waWxlcjo6Tm9uWmVybywKICAgICAgICAgICAgICAgICBKSVRDb21waWxlcjo6YWRk cmVzc0ZvcigKLSAgICAgICAgICAgICAgICAgICAgbV9qaXQuYXJndW1lbnRzUmVnaXN0ZXJGb3Io bm9kZS0+Y29kZU9yaWdpbikpKSk7CisgICAgICAgICAgICAgICAgICAgIG1faml0LmdyYXBoKCku YXJndW1lbnRzUmVnaXN0ZXJGb3Iobm9kZS0+Y29kZU9yaWdpbikpKSk7CiAgICAgICAgIAogICAg ICAgICBtX2ppdC5hZGQzMihUcnVzdGVkSW1tMzIoMSksIGluZGV4R1BSLCByZXN1bHRHUFIpOwog ICAgICAgICBpZiAobm9kZS0+Y29kZU9yaWdpbi5pbmxpbmVDYWxsRnJhbWUpIHsKQEAgLTQ5MDYs MTQgKzQ5MDYsMTQgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQog ICAgICAgICAgICAgYWRkU2xvd1BhdGhHZW5lcmF0b3IoCiAgICAgICAgICAgICAgICAgc2xvd1Bh dGhDYWxsKAogICAgICAgICAgICAgICAgICAgICBzbG93UGF0aCwgdGhpcywgb3BlcmF0aW9uR2V0 SW5saW5lZEFyZ3VtZW50QnlWYWwsIHJlc3VsdEdQUiwgCi0gICAgICAgICAgICAgICAgICAgIG1f aml0LmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG5vZGUtPmNvZGVPcmlnaW4pLm9mZnNldCgpLAorICAg ICAgICAgICAgICAgICAgICBtX2ppdC5ncmFwaCgpLmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG5vZGUt PmNvZGVPcmlnaW4pLm9mZnNldCgpLAogICAgICAgICAgICAgICAgICAgICBub2RlLT5jb2RlT3Jp Z2luLmlubGluZUNhbGxGcmFtZSwKICAgICAgICAgICAgICAgICAgICAgaW5kZXhHUFIpKTsKICAg ICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGFkZFNsb3dQYXRoR2VuZXJhdG9yKAogICAgICAg ICAgICAgICAgIHNsb3dQYXRoQ2FsbCgKICAgICAgICAgICAgICAgICAgICAgc2xvd1BhdGgsIHRo aXMsIG9wZXJhdGlvbkdldEFyZ3VtZW50QnlWYWwsIHJlc3VsdEdQUiwgCi0gICAgICAgICAgICAg ICAgICAgIG1faml0LmFyZ3VtZW50c1JlZ2lzdGVyRm9yKG5vZGUtPmNvZGVPcmlnaW4pLm9mZnNl dCgpLAorICAgICAgICAgICAgICAgICAgICBtX2ppdC5ncmFwaCgpLmFyZ3VtZW50c1JlZ2lzdGVy Rm9yKG5vZGUtPmNvZGVPcmlnaW4pLm9mZnNldCgpLAogICAgICAgICAgICAgICAgICAgICBpbmRl eEdQUikpOwogICAgICAgICB9CiAgICAgICAgIApAQCAtNDkzMSw3ICs0OTMxLDcgQEAgdm9pZCBT cGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgICAgICAgICAgbV9qaXQuYnJh bmNoVGVzdDY0KAogICAgICAgICAgICAgICAgIEpJVENvbXBpbGVyOjpOb25aZXJvLAogICAgICAg ICAgICAgICAgIEpJVENvbXBpbGVyOjphZGRyZXNzRm9yKAotICAgICAgICAgICAgICAgICAgICBt X2ppdC5hcmd1bWVudHNSZWdpc3RlckZvcihub2RlLT5jb2RlT3JpZ2luKSkpKTsKKyAgICAgICAg ICAgICAgICAgICAgbV9qaXQuZ3JhcGgoKS5hcmd1bWVudHNSZWdpc3RlckZvcihub2RlLT5jb2Rl T3JpZ2luKSkpKTsKICAgICAgICAgbm9SZXN1bHQobm9kZSk7CiAgICAgICAgIGJyZWFrOwogICAg IH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQXNzZW1ibHlIZWxwZXJzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9Bc3NlbWJseUhlbHBlcnMuaAko cmV2aXNpb24gMTU2NzU5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9Bc3NlbWJseUhl bHBlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMzgwLDE4ICszODAsMTggQEAgcHVibGljOgogICAg ICAgICByZXR1cm4gbV9iYXNlbGluZUNvZGVCbG9jazsKICAgICB9CiAgICAgCi0gICAgVmlydHVh bFJlZ2lzdGVyIGFyZ3VtZW50c1JlZ2lzdGVyRm9yKElubGluZUNhbGxGcmFtZSogaW5saW5lQ2Fs bEZyYW1lKQorICAgIFZpcnR1YWxSZWdpc3RlciBiYXNlbGluZUFyZ3VtZW50c1JlZ2lzdGVyRm9y KElubGluZUNhbGxGcmFtZSogaW5saW5lQ2FsbEZyYW1lKQogICAgIHsKICAgICAgICAgaWYgKCFp bmxpbmVDYWxsRnJhbWUpCi0gICAgICAgICAgICByZXR1cm4gY29kZUJsb2NrKCktPmFyZ3VtZW50 c1JlZ2lzdGVyKCk7CisgICAgICAgICAgICByZXR1cm4gYmFzZWxpbmVDb2RlQmxvY2soKS0+YXJn dW1lbnRzUmVnaXN0ZXIoKTsKICAgICAgICAgCiAgICAgICAgIHJldHVybiBWaXJ0dWFsUmVnaXN0 ZXIoYmFzZWxpbmVDb2RlQmxvY2tGb3JJbmxpbmVDYWxsRnJhbWUoCiAgICAgICAgICAgICBpbmxp bmVDYWxsRnJhbWUpLT5hcmd1bWVudHNSZWdpc3RlcigpLm9mZnNldCgpICsgaW5saW5lQ2FsbEZy YW1lLT5zdGFja09mZnNldCk7CiAgICAgfQogICAgIAotICAgIFZpcnR1YWxSZWdpc3RlciBhcmd1 bWVudHNSZWdpc3RlckZvcihjb25zdCBDb2RlT3JpZ2luJiBjb2RlT3JpZ2luKQorICAgIFZpcnR1 YWxSZWdpc3RlciBiYXNlbGluZUFyZ3VtZW50c1JlZ2lzdGVyRm9yKGNvbnN0IENvZGVPcmlnaW4m IGNvZGVPcmlnaW4pCiAgICAgewotICAgICAgICByZXR1cm4gYXJndW1lbnRzUmVnaXN0ZXJGb3Io Y29kZU9yaWdpbi5pbmxpbmVDYWxsRnJhbWUpOworICAgICAgICByZXR1cm4gYmFzZWxpbmVBcmd1 bWVudHNSZWdpc3RlckZvcihjb2RlT3JpZ2luLmlubGluZUNhbGxGcmFtZSk7CiAgICAgfQogICAg IAogICAgIFNoYXJlZFN5bWJvbFRhYmxlKiBzeW1ib2xUYWJsZUZvcihjb25zdCBDb2RlT3JpZ2lu JiBjb2RlT3JpZ2luKQo=