126141 2013-12-22 16:47:15 -0800 cStack branch doesn't run navier-stokes because closure calls aren't implemented yet 2013-12-23 11:11:53 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 113621 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff nrotem oliver sam oldest_to_newest 962379 0 fpizlo 2013-12-22 16:47:15 -0800 I'll look into it. 962517 1 219918 fpizlo 2013-12-23 10:55:41 -0800 Created attachment 219918 the patch 962518 2 219918 msaboff 2013-12-23 11:04:34 -0800 Comment on attachment 219918 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=219918&action=review r=me with comments. > Source/JavaScriptCore/jit/JITCall.cpp:147 > + addPtr(TrustedImm32(-static_cast<ptrdiff_t>(sizeof(CallerFrameAndPC))), stackPointerRegister, regT1); > emitGetFromCallFrameHeader64(JSStack::Callee, regT0, regT1); Why don't you change this to a helper uses SP and takes into account the CallerFrameAndPC bias? > Source/JavaScriptCore/jit/JITCall.cpp:191 > + } // SP holds newCallFrame with ArgumentCount initialized. Change the comment to include that SP is offset by CallerFrameAndPC. 962521 3 fpizlo 2013-12-23 11:11:14 -0800 (In reply to comment #2) > (From update of attachment 219918 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=219918&action=review > > r=me with comments. > > > Source/JavaScriptCore/jit/JITCall.cpp:147 > > + addPtr(TrustedImm32(-static_cast<ptrdiff_t>(sizeof(CallerFrameAndPC))), stackPointerRegister, regT1); > > emitGetFromCallFrameHeader64(JSStack::Callee, regT0, regT1); > > Why don't you change this to a helper uses SP and takes into account the CallerFrameAndPC bias? Good point, I can do this in one line already. > > > Source/JavaScriptCore/jit/JITCall.cpp:191 > > + } // SP holds newCallFrame with ArgumentCount initialized. > > Change the comment to include that SP is offset by CallerFrameAndPC. Fixed. 962522 4 fpizlo 2013-12-23 11:11:53 -0800 Landed in http://trac.webkit.org/changeset/161006 219918 2013-12-23 10:55:41 -0800 2013-12-23 11:04:33 -0800 the patch blah.patch text/plain 11852 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYxMDA0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBA CisyMDEzLTEyLTIzICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg Y1N0YWNrIGJyYW5jaCBkb2Vzbid0IHJ1biBuYXZpZXItc3Rva2VzIGJlY2F1c2UgY2xvc3VyZSBj YWxscyBhcmVuJ3QgaW1wbGVtZW50ZWQgeWV0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjYxNDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIEFkZCBhIGJ1bmNoIG9mIGFzc2VydGlvbnMgcmVn YXJkaW5nIHRoZSBzYW5pdHkgb2YgYXJndW1lbnQgY291bnRzLiBUaGlzIGlzIGEgZ3JlYXQgd2F5 IG9mCisgICAgICAgIG1ha2luZyBzdXJlIHRoYXQgU1AvQlAgcG9pbnQgdG8gdGhlIHJpZ2h0IHBs YWNlLgorICAgICAgICAKKyAgICAgICAgVXNlZCB0aGF0IHRvIGRpYWdub3NlIHByb2JsZW1zIHdp dGggY2xvc3VyZSBjYWxscy4gQ2xvc3VyZSBjYWxsIGxpbmtpbmcgZXhwZWN0cyB0aGF0IFNQIGlz CisgICAgICAgIHNldCB1cCBjb3JyZWN0bHkgdmVyeSBlYXJseSBvbi4gVGhlIERGRyBKSVQgd2Fz IGRvaW5nIHRoaXMgY29ycmVjdGx5LCBidXQgdGhlIGJhc2VsaW5lIEpJVAorICAgICAgICB3YXNu J3Q6IGl0IHdhcyBzZXR0aW5nIHVwIFQxIGFzIGEgZmFrZSBTUCBhbmQgdGhlbiBzZXR0aW5nIHVw IFNQIGZvciByZWFsIHZlcnkgbGF0ZS4gVGhpcworICAgICAgICB3YXNuJ3QgZG9pbmcgdXMgYW55 IGdvb2QgYW5kIGl0IHdhcyBtYWtpbmcgY2xvc3VyZSBjYWxscyBmYWlsLgorICAgICAgICAKKyAg ICAgICAgQWxzbywgY2xvc3VyZSBjYWxscyB3ZXJlIHN0aWxsIHJlZmVycmluZyB0byBCUCBpbnN0 ZWFkIG9mIFNQIGFuZCBhc3N1bWluZyB0aGF0IHRoZSBjYWxsZXIKKyAgICAgICAgd2FzIGFkanVz dGluZyBCUC4gT2J2aW91c2x5LCB0aGF0J3Mgbm90IHdoYXQgd2UgZG8gYW55bW9yZS4KKyAgICAg ICAgCisgICAgICAgIFRoZXNlIGZpeGVzIG1ha2UgbmF2aWVyLXN0b2tlcyBydW4uIEl0IHByb2Jh Ymx5IGZpeGVzIG90aGVyIGJ1Z3MsIGJ1dCBJIGhhdmVuJ3QgbG9va2VkIGF0CisgICAgICAgIHRo b3NlIHlldC4KKworICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAg IChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVDdXJyZW50QmxvY2spOgorICAgICAg ICAqIGppdC9Bc3NlbWJseUhlbHBlcnMuY3BwOgorICAgICAgICAoSlNDOjpBc3NlbWJseUhlbHBl cnM6OmppdEFzc2VydEFyZ3VtZW50Q291bnRTYW5lKToKKyAgICAgICAgKiBqaXQvQXNzZW1ibHlI ZWxwZXJzLmg6CisgICAgICAgIChKU0M6OkFzc2VtYmx5SGVscGVyczo6aml0QXNzZXJ0QXJndW1l bnRDb3VudFNhbmUpOgorICAgICAgICAqIGppdC9KSVQuY3BwOgorICAgICAgICAoSlNDOjpKSVQ6 OnByaXZhdGVDb21waWxlTWFpblBhc3MpOgorICAgICAgICAqIGppdC9KSVRDYWxsLmNwcDoKKyAg ICAgICAgKEpTQzo6SklUOjpjb21waWxlTG9hZFZhcmFyZ3MpOgorICAgICAgICAoSlNDOjpKSVQ6 OmNvbXBpbGVDYWxsRXZhbCk6CisgICAgICAgIChKU0M6OkpJVDo6Y29tcGlsZUNhbGxFdmFsU2xv d0Nhc2UpOgorICAgICAgICAoSlNDOjpKSVQ6OmNvbXBpbGVPcENhbGwpOgorICAgICAgICAoSlND OjpKSVQ6OmNvbXBpbGVPcENhbGxTbG93Q2FzZSk6CisgICAgICAgICogaml0L1JlcGF0Y2guY3Bw OgorICAgICAgICAoSlNDOjpsaW5rQ2xvc3VyZUNhbGwpOgorCiAyMDEzLTEyLTIyICBNYXJrIExh bSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBDU3RhY2s6IEFkZCAjaWYgRU5BQkxF KExMSU5UX0NfTE9PUCkgdG8gQyBsb29wIExMSU5UIG9ubHkgcGFydHMgb2YgSlNTdGFjay4KSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3Bw CShyZXZpc2lvbiAxNjA5OTcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1 bGF0aXZlSklULmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2Nyw2ICsxNDY3LDcgQEAgdm9pZCBT cGVjdWxhdGl2ZUpJVDo6Y29tcGlsZUN1cnJlbnRCbG9jawogICAgIAogICAgIG1faml0LmppdEFz c2VydEhhc1ZhbGlkQ2FsbEZyYW1lKCk7CiAgICAgbV9qaXQuaml0QXNzZXJ0VGFnc0luUGxhY2Uo KTsKKyAgICBtX2ppdC5qaXRBc3NlcnRBcmd1bWVudENvdW50U2FuZSgpOwogCiAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBtX2Jsb2NrLT52YXJpYWJsZXNBdEhlYWQubnVtYmVyT2ZBcmd1bWVu dHMoKTsgKytpKSB7CiAgICAgICAgIG1fc3RyZWFtLT5hcHBlbmRBbmRMb2coCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0Fzc2VtYmx5SGVscGVycy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9Bc3NlbWJseUhlbHBlcnMuY3BwCShyZXZpc2lvbiAx NjA5OTcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0Fzc2VtYmx5SGVscGVycy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE3NSw2ICsxNzUsMTMgQEAgdm9pZCBBc3NlbWJseUhlbHBlcnM6 OmppdEFzc2VydElzTnVsbChHUAogICAgIGJyZWFrcG9pbnQoKTsKICAgICBjaGVja051bGwubGlu ayh0aGlzKTsKIH0KKwordm9pZCBBc3NlbWJseUhlbHBlcnM6OmppdEFzc2VydEFyZ3VtZW50Q291 bnRTYW5lKCkKK3sKKyAgICBKdW1wIG9rID0gYnJhbmNoMzIoQmVsb3csIHBheWxvYWRGb3IoSlNT dGFjazo6QXJndW1lbnRDb3VudCksIFRydXN0ZWRJbW0zMigxMDAwMDAwMCkpOworICAgIGJyZWFr cG9pbnQoKTsKKyAgICBvay5saW5rKHRoaXMpOworfQogI2VuZGlmIC8vICFBU1NFUlRfRElTQUJM RUQKIAogfSAvLyBuYW1lc3BhY2UgSlNDCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0 L0Fzc2VtYmx5SGVscGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvQXNzZW1ibHlIZWxwZXJzLmgJKHJldmlzaW9uIDE2MDk5NykKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9qaXQvQXNzZW1ibHlIZWxwZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0NCw2ICsz NDQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBqaXRBc3NlcnRIYXNWYWxpZENhbGxGcmFtZSgpOwog ICAgIHZvaWQgaml0QXNzZXJ0SXNOdWxsKEdQUlJlZyk7CiAgICAgdm9pZCBqaXRBc3NlcnRUYWdz SW5QbGFjZSgpOworICAgIHZvaWQgaml0QXNzZXJ0QXJndW1lbnRDb3VudFNhbmUoKTsKICNlbHNl CiAgICAgdm9pZCBqaXRBc3NlcnRJc0ludDMyKEdQUlJlZykgeyB9CiAgICAgdm9pZCBqaXRBc3Nl cnRJc0pTSW50MzIoR1BSUmVnKSB7IH0KQEAgLTM1Myw2ICszNTQsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBqaXRBc3NlcnRIYXNWYWxpZENhbGxGcmFtZSgpIHsgfQogICAgIHZvaWQgaml0QXNzZXJ0 SXNOdWxsKEdQUlJlZykgeyB9CiAgICAgdm9pZCBqaXRBc3NlcnRUYWdzSW5QbGFjZSgpIHsgfQor ICAgIHZvaWQgaml0QXNzZXJ0QXJndW1lbnRDb3VudFNhbmUoKSB7IH0KICNlbmRpZgogCiAgICAg Ly8gVGhlc2UgbWV0aG9kcyBjb252ZXJ0IGJldHdlZW4gZG91YmxlcywgYW5kIGRvdWJsZXMgYm94 ZWQgYW5kIEpTVmFsdWVzLgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmNwcAkocmV2aXNp b24gMTYwOTk3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMzUsNiArMTM1LDcgQEAgdm9pZCBKSVQ6OmVtaXRFbnRlck9wdGltaXphdGlv bkNoZWNrKCkKIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZU1haW5QYXNzKCkKIHsKICAgICBqaXRB c3NlcnRUYWdzSW5QbGFjZSgpOworICAgIGppdEFzc2VydEFyZ3VtZW50Q291bnRTYW5lKCk7CiAg ICAgCiAgICAgSW5zdHJ1Y3Rpb24qIGluc3RydWN0aW9uc0JlZ2luID0gbV9jb2RlQmxvY2stPmlu c3RydWN0aW9ucygpLmJlZ2luKCk7CiAgICAgdW5zaWduZWQgaW5zdHJ1Y3Rpb25Db3VudCA9IG1f Y29kZUJsb2NrLT5pbnN0cnVjdGlvbnMoKS5zaXplKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVENhbGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUQ2FsbC5jcHAJKHJldmlzaW9uIDE2MDk5NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvSklUQ2FsbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExOSwxMSArMTE5LDEzIEBA IHZvaWQgSklUOjpjb21waWxlTG9hZFZhcmFyZ3MoSW5zdHJ1Y3Rpb24KIAogICAgIGlmIChjYW5P cHRpbWl6ZSkKICAgICAgICAgZW5kLmxpbmsodGhpcyk7CisgICAgCisgICAgYWRkUHRyKFRydXN0 ZWRJbW0zMihzaXplb2YoQ2FsbGVyRnJhbWVBbmRQQykpLCByZWdUMSwgc3RhY2tQb2ludGVyUmVn aXN0ZXIpOwogfQogCiB2b2lkIEpJVDo6Y29tcGlsZUNhbGxFdmFsKEluc3RydWN0aW9uKiBpbnN0 cnVjdGlvbikKIHsKLSAgICBhZGRQdHIoVHJ1c3RlZEltbTMyKEpTU3RhY2s6OkNhbGxlckZyYW1l QW5kUENTaXplICogc3RhdGljX2Nhc3Q8aW50PihzaXplb2YoUmVnaXN0ZXIpKSksIHJlZ1QxLCBz dGFja1BvaW50ZXJSZWdpc3Rlcik7CisgICAgYWRkUHRyKFRydXN0ZWRJbW0zMigtc3RhdGljX2Nh c3Q8cHRyZGlmZl90PihzaXplb2YoQ2FsbGVyRnJhbWVBbmRQQykpKSwgc3RhY2tQb2ludGVyUmVn aXN0ZXIsIHJlZ1QxKTsKICAgICBjYWxsT3BlcmF0aW9uTm9FeGNlcHRpb25DaGVjayhvcGVyYXRp b25DYWxsRXZhbCwgcmVnVDEpOwogICAgIC8vIFJlY2FsY3VsYXRlIG5ld0NhbGxGcmFtZSBhbmQg cHV0IGluIHJlZ1QxIGZvciBwb3NzaWJsZSB1c2UgaW4gc2xvdyBjYXNlCiAgICAgYWRkUHRyKFRy dXN0ZWRJbW0zMigtSlNTdGFjazo6Q2FsbGVyRnJhbWVBbmRQQ1NpemUgKiBzdGF0aWNfY2FzdDxp bnQ+KHNpemVvZihSZWdpc3RlcikpKSwgc3RhY2tQb2ludGVyUmVnaXN0ZXIsIHJlZ1QxKTsKQEAg LTE0MSw4ICsxNDMsOCBAQCB2b2lkIEpJVDo6Y29tcGlsZUNhbGxFdmFsU2xvd0Nhc2UoSW5zdHJ1 CiB7CiAgICAgbGlua1Nsb3dDYXNlKGl0ZXIpOwogCisgICAgYWRkUHRyKFRydXN0ZWRJbW0zMigt c3RhdGljX2Nhc3Q8cHRyZGlmZl90PihzaXplb2YoQ2FsbGVyRnJhbWVBbmRQQykpKSwgc3RhY2tQ b2ludGVyUmVnaXN0ZXIsIHJlZ1QxKTsKICAgICBlbWl0R2V0RnJvbUNhbGxGcmFtZUhlYWRlcjY0 KEpTU3RhY2s6OkNhbGxlZSwgcmVnVDAsIHJlZ1QxKTsKLSAgICBhZGRQdHIoVHJ1c3RlZEltbTMy KEpTU3RhY2s6OkNhbGxlckZyYW1lQW5kUENTaXplICogc3RhdGljX2Nhc3Q8aW50PihzaXplb2Yo UmVnaXN0ZXIpKSksIHJlZ1QxLCBzdGFja1BvaW50ZXJSZWdpc3Rlcik7CiAgICAgZW1pdE5ha2Vk Q2FsbChtX3ZtLT5nZXRDVElTdHViKHZpcnR1YWxDYWxsVGh1bmtHZW5lcmF0b3IpLmNvZGUoKSk7 CiAgICAgYWRkUHRyKFRydXN0ZWRJbW0zMihzdGFja1BvaW50ZXJPZmZzZXRGb3IobV9jb2RlQmxv Y2spICogc2l6ZW9mKFJlZ2lzdGVyKSksIGNhbGxGcmFtZVJlZ2lzdGVyLCBzdGFja1BvaW50ZXJS ZWdpc3Rlcik7CiAgICAgY2hlY2tTdGFja1BvaW50ZXJBbGlnbm1lbnQoKTsKQEAgLTE4NCwxNiAr MTg2LDE2IEBAIHZvaWQgSklUOjpjb21waWxlT3BDYWxsKE9wY29kZUlEIG9wY29kZUkKICAgICAg ICAgICAgIGRvbmUubGluayh0aGlzKTsKICAgICAgICAgfQogICAgIAotICAgICAgICBhZGRQdHIo VHJ1c3RlZEltbTMyKHJlZ2lzdGVyT2Zmc2V0ICogc2l6ZW9mKFJlZ2lzdGVyKSksIGNhbGxGcmFt ZVJlZ2lzdGVyLCByZWdUMSk7Ci0gICAgICAgIHN0b3JlMzIoVHJ1c3RlZEltbTMyKGFyZ0NvdW50 KSwgQWRkcmVzcyhyZWdUMSwgSlNTdGFjazo6QXJndW1lbnRDb3VudCAqIHN0YXRpY19jYXN0PGlu dD4oc2l6ZW9mKFJlZ2lzdGVyKSkgKyBPQkpFQ1RfT0ZGU0VUT0YoRW5jb2RlZFZhbHVlRGVzY3Jp cHRvciwgYXNCaXRzLnBheWxvYWQpKSk7Ci0gICAgfSAvLyByZWdUMSBob2xkcyBuZXdDYWxsRnJh bWUgd2l0aCBBcmd1bWVudENvdW50IGluaXRpYWxpemVkLgorICAgICAgICBhZGRQdHIoVHJ1c3Rl ZEltbTMyKHJlZ2lzdGVyT2Zmc2V0ICogc2l6ZW9mKFJlZ2lzdGVyKSArIHNpemVvZihDYWxsZXJG cmFtZUFuZFBDKSksIGNhbGxGcmFtZVJlZ2lzdGVyLCBzdGFja1BvaW50ZXJSZWdpc3Rlcik7Cisg ICAgICAgIHN0b3JlMzIoVHJ1c3RlZEltbTMyKGFyZ0NvdW50KSwgQWRkcmVzcyhzdGFja1BvaW50 ZXJSZWdpc3RlciwgSlNTdGFjazo6QXJndW1lbnRDb3VudCAqIHN0YXRpY19jYXN0PGludD4oc2l6 ZW9mKFJlZ2lzdGVyKSkgKyBQYXlsb2FkT2Zmc2V0IC0gc2l6ZW9mKENhbGxlckZyYW1lQW5kUEMp KSk7CisgICAgfSAvLyBTUCBob2xkcyBuZXdDYWxsRnJhbWUgd2l0aCBBcmd1bWVudENvdW50IGlu aXRpYWxpemVkLgogICAgIAogICAgIHVpbnQzMl90IGJ5dGVjb2RlT2Zmc2V0ID0gaW5zdHJ1Y3Rp b24gLSBtX2NvZGVCbG9jay0+aW5zdHJ1Y3Rpb25zKCkuYmVnaW4oKTsKICAgICB1aW50MzJfdCBs b2NhdGlvbkJpdHMgPSBDYWxsRnJhbWU6OkxvY2F0aW9uOjplbmNvZGVBc0J5dGVjb2RlT2Zmc2V0 KGJ5dGVjb2RlT2Zmc2V0KTsKLSAgICBzdG9yZTMyKFRydXN0ZWRJbW0zMihsb2NhdGlvbkJpdHMp LCBBZGRyZXNzKGNhbGxGcmFtZVJlZ2lzdGVyLCBKU1N0YWNrOjpBcmd1bWVudENvdW50ICogc3Rh dGljX2Nhc3Q8aW50PihzaXplb2YoUmVnaXN0ZXIpKSArIE9CSkVDVF9PRkZTRVRPRihFbmNvZGVk VmFsdWVEZXNjcmlwdG9yLCBhc0JpdHMudGFnKSkpOworICAgIHN0b3JlMzIoVHJ1c3RlZEltbTMy KGxvY2F0aW9uQml0cyksIEFkZHJlc3MoY2FsbEZyYW1lUmVnaXN0ZXIsIEpTU3RhY2s6OkFyZ3Vt ZW50Q291bnQgKiBzdGF0aWNfY2FzdDxpbnQ+KHNpemVvZihSZWdpc3RlcikpICsgVGFnT2Zmc2V0 KSk7CiAgICAgZW1pdEdldFZpcnR1YWxSZWdpc3RlcihjYWxsZWUsIHJlZ1QwKTsgLy8gcmVnVDAg aG9sZHMgY2FsbGVlLgogCi0gICAgc3RvcmU2NChyZWdUMCwgQWRkcmVzcyhyZWdUMSwgSlNTdGFj azo6Q2FsbGVlICogc3RhdGljX2Nhc3Q8aW50PihzaXplb2YoUmVnaXN0ZXIpKSkpOworICAgIHN0 b3JlNjQocmVnVDAsIEFkZHJlc3Moc3RhY2tQb2ludGVyUmVnaXN0ZXIsIEpTU3RhY2s6OkNhbGxl ZSAqIHN0YXRpY19jYXN0PGludD4oc2l6ZW9mKFJlZ2lzdGVyKSkgLSBzaXplb2YoQ2FsbGVyRnJh bWVBbmRQQykpKTsKIAogICAgIGlmIChvcGNvZGVJRCA9PSBvcF9jYWxsX2V2YWwpIHsKICAgICAg ICAgY29tcGlsZUNhbGxFdmFsKGluc3RydWN0aW9uKTsKQEAgLTIxMSw4ICsyMTMsNyBAQCB2b2lk IEpJVDo6Y29tcGlsZU9wQ2FsbChPcGNvZGVJRCBvcGNvZGVJCiAgICAgbV9jYWxsU3RydWN0dXJl U3R1YkNvbXBpbGF0aW9uSW5mb1tjYWxsTGlua0luZm9JbmRleF0uYnl0ZWNvZGVJbmRleCA9IG1f Ynl0ZWNvZGVPZmZzZXQ7CiAKICAgICBsb2FkUHRyKEFkZHJlc3MocmVnVDAsIE9CSkVDVF9PRkZT RVRPRihKU0Z1bmN0aW9uLCBtX3Njb3BlKSksIHJlZ1QyKTsKLSAgICBzdG9yZTY0KHJlZ1QyLCBB ZGRyZXNzKHJlZ1QxLCBKU1N0YWNrOjpTY29wZUNoYWluICogc2l6ZW9mKFJlZ2lzdGVyKSkpOwot ICAgIGFkZFB0cihUcnVzdGVkSW1tMzIoSlNTdGFjazo6Q2FsbGVyRnJhbWVBbmRQQ1NpemUgKiBz dGF0aWNfY2FzdDxpbnQ+KHNpemVvZihSZWdpc3RlcikpKSwgcmVnVDEsIHN0YWNrUG9pbnRlclJl Z2lzdGVyKTsKKyAgICBzdG9yZTY0KHJlZ1QyLCBBZGRyZXNzKE1hY3JvQXNzZW1ibGVyOjpzdGFj a1BvaW50ZXJSZWdpc3RlciwgSlNTdGFjazo6U2NvcGVDaGFpbiAqIHNpemVvZihSZWdpc3Rlcikg LSBzaXplb2YoQ2FsbGVyRnJhbWVBbmRQQykpKTsKIAogICAgIG1fY2FsbFN0cnVjdHVyZVN0dWJD b21waWxhdGlvbkluZm9bY2FsbExpbmtJbmZvSW5kZXhdLmhvdFBhdGhPdGhlciA9IGVtaXROYWtl ZENhbGwoKTsKIApAQCAtMjMzLDggKzIzNCw2IEBAIHZvaWQgSklUOjpjb21waWxlT3BDYWxsU2xv d0Nhc2UoT3Bjb2RlSUQKIAogICAgIGxpbmtTbG93Q2FzZShpdGVyKTsKIAotICAgIGFkZFB0cihU cnVzdGVkSW1tMzIoSlNTdGFjazo6Q2FsbGVyRnJhbWVBbmRQQ1NpemUgKiBzdGF0aWNfY2FzdDxp bnQ+KHNpemVvZihSZWdpc3RlcikpKSwgcmVnVDEsIHN0YWNrUG9pbnRlclJlZ2lzdGVyKTsKLQog ICAgIFRodW5rR2VuZXJhdG9yIGdlbmVyYXRvciA9IGxpbmtUaHVua0dlbmVyYXRvckZvcigKICAg ICAgICAgb3Bjb2RlSUQgPT0gb3BfY29uc3RydWN0ID8gQ29kZUZvckNvbnN0cnVjdCA6IENvZGVG b3JDYWxsLAogICAgICAgICBSZWdpc3RlclByZXNlcnZhdGlvbk5vdFJlcXVpcmVkKTsKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAkocmV2aXNpb24gMTYwOTk3KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTM0Miw2ICsxMzQyLDE1IEBAIHZvaWQgbGlua0Nsb3N1cmVDYWxsKAogICAgIAogICAgIENDYWxs SGVscGVyczo6SnVtcExpc3Qgc2xvd1BhdGg7CiAgICAgCisgICAgcHRyZGlmZl90IG9mZnNldFRv RnJhbWUgPSAtc2l6ZW9mKENhbGxlckZyYW1lQW5kUEMpOworCisgICAgaWYgKCFBU1NFUlRfRElT QUJMRUQpIHsKKyAgICAgICAgQ0NhbGxIZWxwZXJzOjpKdW1wIG9rQXJndW1lbnRDb3VudCA9IHN0 dWJKaXQuYnJhbmNoMzIoCisgICAgICAgICAgICBDQ2FsbEhlbHBlcnM6OkJlbG93LCBDQ2FsbEhl bHBlcnM6OkFkZHJlc3MoQ0NhbGxIZWxwZXJzOjpzdGFja1BvaW50ZXJSZWdpc3Rlciwgc3RhdGlj X2Nhc3Q8cHRyZGlmZl90PihzaXplb2YoUmVnaXN0ZXIpICogSlNTdGFjazo6QXJndW1lbnRDb3Vu dCkgKyBvZmZzZXRUb0ZyYW1lICsgUGF5bG9hZE9mZnNldCksIENDYWxsSGVscGVyczo6VHJ1c3Rl ZEltbTMyKDEwMDAwMDAwKSk7CisgICAgICAgIHN0dWJKaXQuYnJlYWtwb2ludCgpOworICAgICAg ICBva0FyZ3VtZW50Q291bnQubGluaygmc3R1YkppdCk7CisgICAgfQorICAgICAgICAgICAgCiAj aWYgVVNFKEpTVkFMVUU2NCkKICAgICAvLyBXZSBjYW4gc2FmZWx5IGNsb2JiZXIgZXZlcnl0aGlu ZyBleGNlcHQgdGhlIGNhbGxlZUdQUi4gV2UgY2FuJ3QgcmVseSBvbiB0YWdNYXNrUmVnaXN0ZXIK ICAgICAvLyBiZWluZyBzZXQuIFNvIHdlIGRvIHRoaXMgdGhlIGhhcmQgd2F5LgpAQCAtMTM2Nywx OCArMTM3NiwxOCBAQCB2b2lkIGxpbmtDbG9zdXJlQ2FsbCgKICAgICBzdHViSml0LmxvYWRQdHIo CiAgICAgICAgIENDYWxsSGVscGVyczo6QWRkcmVzcyhjYWxsZWVHUFIsIEpTRnVuY3Rpb246Om9m ZnNldE9mU2NvcGVDaGFpbigpKSwKICAgICAgICAgR1BSSW5mbzo6cmV0dXJuVmFsdWVHUFIpOwot CisgICAgCiAjaWYgVVNFKEpTVkFMVUU2NCkKICAgICBzdHViSml0LnN0b3JlNjQoCiAgICAgICAg IEdQUkluZm86OnJldHVyblZhbHVlR1BSLAotICAgICAgICBDQ2FsbEhlbHBlcnM6OkFkZHJlc3Mo R1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIHN0YXRpY19jYXN0PHB0cmRpZmZfdD4oc2l6ZW9m KFJlZ2lzdGVyKSAqIEpTU3RhY2s6OlNjb3BlQ2hhaW4pKSk7CisgICAgICAgIENDYWxsSGVscGVy czo6QWRkcmVzcyhNYWNyb0Fzc2VtYmxlcjo6c3RhY2tQb2ludGVyUmVnaXN0ZXIsIHN0YXRpY19j YXN0PHB0cmRpZmZfdD4oc2l6ZW9mKFJlZ2lzdGVyKSAqIEpTU3RhY2s6OlNjb3BlQ2hhaW4pICsg b2Zmc2V0VG9GcmFtZSkpOwogI2Vsc2UKICAgICBzdHViSml0LnN0b3JlUHRyKAogICAgICAgICBH UFJJbmZvOjpyZXR1cm5WYWx1ZUdQUiwKLSAgICAgICAgQ0NhbGxIZWxwZXJzOjpBZGRyZXNzKEdQ UkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBzdGF0aWNfY2FzdDxwdHJkaWZmX3Q+KHNpemVvZihS ZWdpc3RlcikgKiBKU1N0YWNrOjpTY29wZUNoYWluKSArIE9CSkVDVF9PRkZTRVRPRihFbmNvZGVk VmFsdWVEZXNjcmlwdG9yLCBhc0JpdHMucGF5bG9hZCkpKTsKKyAgICAgICAgQ0NhbGxIZWxwZXJz OjpBZGRyZXNzKE1hY3JvQXNzZW1ibGVyOjpzdGFja1BvaW50ZXJSZWdpc3Rlciwgc3RhdGljX2Nh c3Q8cHRyZGlmZl90PihzaXplb2YoUmVnaXN0ZXIpICogSlNTdGFjazo6U2NvcGVDaGFpbikgKyBP QkpFQ1RfT0ZGU0VUT0YoRW5jb2RlZFZhbHVlRGVzY3JpcHRvciwgYXNCaXRzLnBheWxvYWQpICsg b2Zmc2V0VG9GcmFtZSkpOwogICAgIHN0dWJKaXQuc3RvcmUzMigKICAgICAgICAgQ0NhbGxIZWxw ZXJzOjpUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZyksCi0gICAgICAgIENDYWxsSGVscGVy czo6QWRkcmVzcyhHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3Rlciwgc3RhdGljX2Nhc3Q8cHRyZGlm Zl90PihzaXplb2YoUmVnaXN0ZXIpICogSlNTdGFjazo6U2NvcGVDaGFpbikgKyBPQkpFQ1RfT0ZG U0VUT0YoRW5jb2RlZFZhbHVlRGVzY3JpcHRvciwgYXNCaXRzLnRhZykpKTsKKyAgICAgICAgQ0Nh bGxIZWxwZXJzOjpBZGRyZXNzKE1hY3JvQXNzZW1ibGVyOjpzdGFja1BvaW50ZXJSZWdpc3Rlciwg c3RhdGljX2Nhc3Q8cHRyZGlmZl90PihzaXplb2YoUmVnaXN0ZXIpICogSlNTdGFjazo6U2NvcGVD aGFpbikgKyBPQkpFQ1RfT0ZGU0VUT0YoRW5jb2RlZFZhbHVlRGVzY3JpcHRvciwgYXNCaXRzLnRh ZykgKyBvZmZzZXRUb0ZyYW1lKSk7CiAjZW5kaWYKICAgICAKICAgICBBc3NlbWJseUhlbHBlcnM6 OkNhbGwgY2FsbCA9IHN0dWJKaXQubmVhckNhbGwoKTsKQEAgLTEzOTEsOCArMTQwMCw2IEBAIHZv aWQgbGlua0Nsb3N1cmVDYWxsKAogI2VuZGlmCiAgICAgc3R1YkppdC5tb3ZlKENDYWxsSGVscGVy czo6VHJ1c3RlZEltbVB0cihjYWxsTGlua0luZm8uY2FsbFJldHVybkxvY2F0aW9uLmV4ZWN1dGFi bGVBZGRyZXNzKCkpLCBHUFJJbmZvOjpyZWdUMik7CiAgICAgCi0gICAgLy8gRklYTUU6IENTdGFj ayAtIFRoaW5rIHRoZSByZXN0b3JlUmV0dXJuQWRkcmVzc0JlZm9yZVJldHVybigpIGluc3RydWN0 aW9uIHNob3VsZCBiZSBhIHBva2UKLSAgICBzdHViSml0LmJyZWFrcG9pbnQoKTsKICAgICBzdHVi Sml0LnJlc3RvcmVSZXR1cm5BZGRyZXNzQmVmb3JlUmV0dXJuKEdQUkluZm86OnJlZ1QyKTsKICAg ICBBc3NlbWJseUhlbHBlcnM6Okp1bXAgc2xvdyA9IHN0dWJKaXQuanVtcCgpOwogICAgIAo=