157726 2016-05-15 15:06:31 -0700 DFG::Plan shouldn't read from its VM once it's been cancelled 2016-05-15 16:07:48 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1193262 0 fpizlo 2016-05-15 15:06:31 -0700 Patch forthcoming. 1193268 1 278981 fpizlo 2016-05-15 15:31:59 -0700 Created attachment 278981 the patch 1193269 2 commit-queue 2016-05-15 15:33:14 -0700 Attachment 278981 did not pass style-queue: ERROR: Source/JavaScriptCore/dfg/DFGPlan.cpp:141: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/JavaScriptCore/dfg/DFGPlan.cpp:147: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] Total errors found: 2 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1193270 3 278981 saam 2016-05-15 15:35:10 -0700 Comment on attachment 278981 the patch r=me 1193274 4 fpizlo 2016-05-15 16:07:48 -0700 Landed in http://trac.webkit.org/changeset/200933 278981 2016-05-15 15:31:59 -0700 2016-05-15 15:35:10 -0700 the patch blah.patch text/plain 14887 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAwOTMwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDYwIEBA CisyMDE2LTA1LTE1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHOjpQbGFuIHNob3VsZG4ndCByZWFkIGZyb20gaXRzIFZNIG9uY2UgaXQncyBiZWVuIGNhbmNl bGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3 NzI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAg ICAgICBQbGFuOjp2bSB3YXMgYSByZWZlcmVuY2UsIG5vdCBhIHBvaW50ZXIsIGFuZCBzbyB3YXNu J3QgbnVsbGVkIGJ5IFBsYW46OmNhbmNlbCgpLiBTbywgYQorICAgICAgICBjYW5jZWxsZWQgcGxh biBtYXkgaGF2ZSBhIGRhbmdsaW5nIHBvaW50ZXIgdG8gYSBWTTogd2UgY291bGQgZGVsZXRlIHRo ZSBWTSBhZnRlciBjYW5jZWxsaW5nCisgICAgICAgIHRoZSBwbGFuLgorICAgICAgICAKKyAgICAg ICAgUHJpb3IgdG8gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjAwNzA1LCB0aGlz IHdhcyBwcm9iYWJseSBmaW5lIGJlY2F1c2Ugbm9ib2R5CisgICAgICAgIHdvdWxkIHJlYWQgUGxh bjo6dm0gaWYgdGhlIHBsYW4gd2FzIGNhbmNlbGxlZC4gQnV0IHIyMDA3MDUgY2hhbmdlZCB0aGF0 LiBJdCB3YXMgYSBoYXJkCisgICAgICAgIHJlZ3Jlc3Npb24gdG8gc3BvdCBiZWNhdXNlIHVzdWFs bHkgYSBjYW5jZWxsZWQgcGxhbiB3aWxsIHN0aWxsIHJlZmVyIHRvIGEgdmFsaWQgVk0uCisgICAg ICAgIAorICAgICAgICBUaGlzIGNoYW5nZSBmaXhlcyB0aGUgcmVncmVzc2lvbiBhbmQgbWFrZXMg aXQgYSBsb3QgZWFzaWVyIHRvIHNwb3QgdGhlIHJlZ3Jlc3Npb24gaW4gdGhlCisgICAgICAgIGZ1 dHVyZS4gUGxhbjo6dm0gaXMgbm93IGEgcG9pbnRlciBhbmQgd2UgbnVsbCBpdCBpbiBQbGFuOjpj YW5jZWwoKS4gTm93IGlmIHlvdSBtYWtlIHRoaXMKKyAgICAgICAgbWlzdGFrZSwgeW91IHdpbGwg Z2V0IGEgY3Jhc2ggYW55dGltZSB0aGUgUGxhbiBpcyBjYW5jZWxsZWQsIG5vdCBqdXN0IGFueXRp bWUgdGhlIHBsYW4gaXMKKyAgICAgICAgY2FuY2VsbGVkIGFuZCB0aGUgVk0gZ2V0cyBkZWxldGVk LiBBbHNvLCBpdCdzIG5vdyB2ZXJ5IGNsZWFyIHdoYXQgdG8gZG8gd2hlbiB5b3Ugd2FudCB0bwor ICAgICAgICB1c2UgUGxhbjo6dm0gb24gdGhlIGNhbmNlbCBwYXRoOiB5b3UgY2FuIG51bGwtY2hl Y2sgdm07IGlmIGl0J3MgbnVsbCwgYXNzdW1lIHRoZSB3b3JzdC4KKyAgICAgICAgCisgICAgICAg IEJlY2F1c2Ugd2UgbnVsbCB0aGUgVk0gb2YgYSBjYW5jZWxsZWQgcGxhbiwgd2UgY2Fubm90IGhh dmUgU2FmZXBvaW50Ojp2bSgpIHJldHVybiB0aGUKKyAgICAgICAgcGxhbidzIFZNIGFueW1vcmUu IFRoYXQncyBiZWNhdXNlIHdoZW4gd2UgY2FuY2VsIGEgcGxhbiB0aGF0IGlzIGF0IGEgc2FmZXBv aW50LCB3ZSB1c2UgdGhlCisgICAgICAgIHNhZmVwb2ludCdzIFZNIHRvIGRldGVybWluZSB3aGV0 aGVyIHRoaXMgaXMgb25lIG9mIG91ciBzYWZlcG9pbnRzICphZnRlciogdGhlIHBsYW4gaXMKKyAg ICAgICAgYWxyZWFkeSBjYW5jZWxsZWQuIFNvLCBTYWZlcG9pbnQgbm93IGhhcyBpdHMgb3duIGNv cHkgb2YgbV92bSwgYW5kIHRoYXQgY29weSBnZXRzIG51bGxlZAorICAgICAgICB3aGVuIHRoZSBT YWZlcG9pbnQgaXMgY2FuY2VsbGVkLiBUaGUgU2FmZXBvaW50J3MgbV92bSB3aWxsIGJlIG51bGxl ZCBtb21lbnRzIGFmdGVyIFBsYW4ncworICAgICAgICB2bSBnZXRzIG51bGxlZCAoc2VlIFdvcmts aXN0OjpyZW1vdmVEZWFkUGxhbnMoKSwgd2hpY2ggaGFzIGEgY2FuY2VsIHBhdGggZm9yIFBsYW5z IGluIG9uZQorICAgICAgICBsb29wIGFuZCBhIGNhbmNlbCBwYXRoIGZvciBTYWZlcG9pbnRzIGlu IHRoZSBsb29wIGFmdGVyIGl0KS4KKworICAgICAgICAqIGRmZy9ERkdKSVRGaW5hbGl6ZXIuY3Bw OgorICAgICAgICAoSlNDOjpERkc6OkpJVEZpbmFsaXplcjo6ZmluYWxpemVDb21tb24pOgorICAg ICAgICAqIGRmZy9ERkdQbGFuLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpQbGFuOjpQbGFuKToK KyAgICAgICAgKEpTQzo6REZHOjpQbGFuOjpjb21wdXRlQ29tcGlsZVRpbWVzKToKKyAgICAgICAg KEpTQzo6REZHOjpQbGFuOjpyZXBvcnRDb21waWxlVGltZXMpOgorICAgICAgICAoSlNDOjpERkc6 OlBsYW46OmNvbXBpbGVJblRocmVhZEltcGwpOgorICAgICAgICAoSlNDOjpERkc6OlBsYW46OnJl YWxseUFkZCk6CisgICAgICAgIChKU0M6OkRGRzo6UGxhbjo6bm90aWZ5Q29tcGlsaW5nKToKKyAg ICAgICAgKEpTQzo6REZHOjpQbGFuOjpmaW5hbGl6ZVdpdGhvdXROb3RpZnlpbmdDYWxsYmFjayk6 CisgICAgICAgIChKU0M6OkRGRzo6UGxhbjo6Y2FuY2VsKToKKyAgICAgICAgKiBkZmcvREZHUGxh bi5oOgorICAgICAgICAoSlNDOjpERkc6OlBsYW46OmNhblRpZXJVcEFuZE9TUkVudGVyKToKKyAg ICAgICAgKiBkZmcvREZHU2FmZXBvaW50LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTYWZlcG9p bnQ6OmNhbmNlbCk6CisgICAgICAgIChKU0M6OkRGRzo6U2FmZXBvaW50Ojp2bSk6CisgICAgICAg ICogZGZnL0RGR1NhZmVwb2ludC5oOgorICAgICAgICAqIGRmZy9ERkdXb3JrbGlzdC5jcHA6Cisg ICAgICAgIChKU0M6OkRGRzo6V29ya2xpc3Q6OmlzQWN0aXZlRm9yVk0pOgorICAgICAgICAoSlND OjpERkc6OldvcmtsaXN0Ojp3YWl0VW50aWxBbGxQbGFuc0ZvclZNQXJlUmVhZHkpOgorICAgICAg ICAoSlNDOjpERkc6OldvcmtsaXN0OjpyZW1vdmVBbGxSZWFkeVBsYW5zRm9yVk0pOgorICAgICAg ICAoSlNDOjpERkc6OldvcmtsaXN0OjpyZW1lbWJlckNvZGVCbG9ja3MpOgorICAgICAgICAoSlND OjpERkc6OldvcmtsaXN0Ojp2aXNpdFdlYWtSZWZlcmVuY2VzKToKKyAgICAgICAgKEpTQzo6REZH OjpXb3JrbGlzdDo6cmVtb3ZlRGVhZFBsYW5zKToKKyAgICAgICAgKEpTQzo6REZHOjpXb3JrbGlz dDo6cnVuVGhyZWFkKToKKyAgICAgICAgKiBmdGwvRlRMSklURmluYWxpemVyLmNwcDoKKyAgICAg ICAgKEpTQzo6RlRMOjpKSVRGaW5hbGl6ZXI6OmZpbmFsaXplRnVuY3Rpb24pOgorCiAyMDE2LTA1 LTE1ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIE1v ZGVybml6ZSBJbnRsIGNvbnN0cnVjdG9yczsgdXNpbmcgSW50ZXJuYWxGdW5jdGlvbjo6Y3JlYXRl U3ViY2xhc3NTdHJ1Y3R1cmUKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklU RmluYWxpemVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0pJVEZpbmFsaXplci5jcHAJKHJldmlzaW9uIDIwMDkyNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHSklURmluYWxpemVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTEsNyArOTEs NyBAQCB2b2lkIEpJVEZpbmFsaXplcjo6ZmluYWxpemVDb21tb24oKQogI2VuZGlmIC8vIEVOQUJM RShGVExfSklUKQogICAgIAogICAgIGlmIChtX3BsYW4uY29tcGlsYXRpb24pCi0gICAgICAgIG1f cGxhbi52bS5tX3BlckJ5dGVjb2RlUHJvZmlsZXItPmFkZENvbXBpbGF0aW9uKG1fcGxhbi5jb2Rl QmxvY2ssIG1fcGxhbi5jb21waWxhdGlvbik7CisgICAgICAgIG1fcGxhbi52bS0+bV9wZXJCeXRl Y29kZVByb2ZpbGVyLT5hZGRDb21waWxhdGlvbihtX3BsYW4uY29kZUJsb2NrLCBtX3BsYW4uY29t cGlsYXRpb24pOwogICAgIAogICAgIGlmICghbV9wbGFuLndpbGxUcnlUb1RpZXJVcCkKICAgICAg ICAgbV9wbGFuLmNvZGVCbG9jay0+YmFzZWxpbmVWZXJzaW9uKCktPm1fZGlkRmFpbEZUTENvbXBp bGF0aW9uID0gdHJ1ZTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUGxhbi5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQbGFuLmNwcAko cmV2aXNpb24gMjAwOTI3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQbGFuLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTM4LDEzICsxMzgsMTMgQEAgUHJvZmlsZXI6OkNvbXBpbGF0 aW9uS2luZCBwcm9maWxlckNvbXBpbAogUGxhbjo6UGxhbihDb2RlQmxvY2sqIHBhc3NlZENvZGVC bG9jaywgQ29kZUJsb2NrKiBwcm9maWxlZERGR0NvZGVCbG9jaywKICAgICBDb21waWxhdGlvbk1v ZGUgbW9kZSwgdW5zaWduZWQgb3NyRW50cnlCeXRlY29kZUluZGV4LAogICAgIGNvbnN0IE9wZXJh bmRzPEpTVmFsdWU+JiBtdXN0SGFuZGxlVmFsdWVzKQotICAgIDogdm0oKnBhc3NlZENvZGVCbG9j ay0+dm0oKSkKKyAgICA6IHZtKHBhc3NlZENvZGVCbG9jay0+dm0oKSkKICAgICAsIGNvZGVCbG9j ayhwYXNzZWRDb2RlQmxvY2spCiAgICAgLCBwcm9maWxlZERGR0NvZGVCbG9jayhwcm9maWxlZERG R0NvZGVCbG9jaykKICAgICAsIG1vZGUobW9kZSkKICAgICAsIG9zckVudHJ5Qnl0ZWNvZGVJbmRl eChvc3JFbnRyeUJ5dGVjb2RlSW5kZXgpCiAgICAgLCBtdXN0SGFuZGxlVmFsdWVzKG11c3RIYW5k bGVWYWx1ZXMpCi0gICAgLCBjb21waWxhdGlvbihjb2RlQmxvY2stPnZtKCktPm1fcGVyQnl0ZWNv ZGVQcm9maWxlciA/IGFkb3B0UmVmKG5ldyBQcm9maWxlcjo6Q29tcGlsYXRpb24oY29kZUJsb2Nr LT52bSgpLT5tX3BlckJ5dGVjb2RlUHJvZmlsZXItPmVuc3VyZUJ5dGVjb2Rlc0Zvcihjb2RlQmxv Y2spLCBwcm9maWxlckNvbXBpbGF0aW9uS2luZEZvck1vZGUobW9kZSkpKSA6IDApCisgICAgLCBj b21waWxhdGlvbih2bS0+bV9wZXJCeXRlY29kZVByb2ZpbGVyID8gYWRvcHRSZWYobmV3IFByb2Zp bGVyOjpDb21waWxhdGlvbih2bS0+bV9wZXJCeXRlY29kZVByb2ZpbGVyLT5lbnN1cmVCeXRlY29k ZXNGb3IoY29kZUJsb2NrKSwgcHJvZmlsZXJDb21waWxhdGlvbktpbmRGb3JNb2RlKG1vZGUpKSkg OiAwKQogICAgICwgaW5saW5lQ2FsbEZyYW1lcyhhZG9wdFJlZihuZXcgSW5saW5lQ2FsbEZyYW1l U2V0KCkpKQogICAgICwgaWRlbnRpZmllcnMoY29kZUJsb2NrKQogICAgICwgd2Vha1JlZmVyZW5j ZXMoY29kZUJsb2NrKQpAQCAtMTYwLDcgKzE2MCw3IEBAIGJvb2wgUGxhbjo6Y29tcHV0ZUNvbXBp bGVUaW1lcygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHJlcG9ydENvbXBpbGVUaW1lcygpCiAgICAg ICAgIHx8IE9wdGlvbnM6OnJlcG9ydFRvdGFsQ29tcGlsZVRpbWVzKCkKLSAgICAgICAgfHwgdm0u bV9wZXJCeXRlY29kZVByb2ZpbGVyOworICAgICAgICB8fCAodm0gJiYgdm0tPm1fcGVyQnl0ZWNv ZGVQcm9maWxlcik7CiB9CiAKIGJvb2wgUGxhbjo6cmVwb3J0Q29tcGlsZVRpbWVzKCkgY29uc3QK QEAgLTI0NCw3ICsyNDQsNyBAQCBQbGFuOjpDb21waWxhdGlvblBhdGggUGxhbjo6Y29tcGlsZUlu VGhyCiAgICAgICAgIGRhdGFMb2coIlxuIik7CiAgICAgfQogICAgIAotICAgIEdyYXBoIGRmZyh2 bSwgKnRoaXMsIGxvbmdMaXZlZFN0YXRlKTsKKyAgICBHcmFwaCBkZmcoKnZtLCAqdGhpcywgbG9u Z0xpdmVkU3RhdGUpOwogICAgIAogICAgIGlmICghcGFyc2UoZGZnKSkgewogICAgICAgICBmaW5h bGl6ZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEZhaWxlZEZpbmFsaXplcj4oKnRoaXMpOwpAQCAtNTM3 LDkgKzUzNyw5IEBAIGJvb2wgUGxhbjo6aXNTdGlsbFZhbGlkKCkKIHZvaWQgUGxhbjo6cmVhbGx5 QWRkKENvbW1vbkRhdGEqIGNvbW1vbkRhdGEpCiB7CiAgICAgd2F0Y2hwb2ludHMucmVhbGx5QWRk KGNvZGVCbG9jaywgKmNvbW1vbkRhdGEpOwotICAgIGlkZW50aWZpZXJzLnJlYWxseUFkZCh2bSwg Y29tbW9uRGF0YSk7Ci0gICAgd2Vha1JlZmVyZW5jZXMucmVhbGx5QWRkKHZtLCBjb21tb25EYXRh KTsKLSAgICB0cmFuc2l0aW9ucy5yZWFsbHlBZGQodm0sIGNvbW1vbkRhdGEpOworICAgIGlkZW50 aWZpZXJzLnJlYWxseUFkZCgqdm0sIGNvbW1vbkRhdGEpOworICAgIHdlYWtSZWZlcmVuY2VzLnJl YWxseUFkZCgqdm0sIGNvbW1vbkRhdGEpOworICAgIHRyYW5zaXRpb25zLnJlYWxseUFkZCgqdm0s IGNvbW1vbkRhdGEpOwogfQogCiB2b2lkIFBsYW46Om5vdGlmeUNvbXBpbGluZygpCkBAIC01NjEs NyArNTYxLDcgQEAgdm9pZCBQbGFuOjpub3RpZnlSZWFkeSgpCiBDb21waWxhdGlvblJlc3VsdCBQ bGFuOjpmaW5hbGl6ZVdpdGhvdXROb3RpZnlpbmdDYWxsYmFjaygpCiB7CiAgICAgLy8gV2Ugd2ls bCBlc3RhYmxpc2ggbmV3IHJlZmVyZW5jZXMgZnJvbSB0aGUgY29kZSBibG9jayB0byB0aGluZ3Mu IFNvLCB3ZSBuZWVkIGEgYmFycmllci4KLSAgICB2bS5oZWFwLndyaXRlQmFycmllcihjb2RlQmxv Y2spOworICAgIHZtLT5oZWFwLndyaXRlQmFycmllcihjb2RlQmxvY2spOwogICAgIAogICAgIGlm ICghaXNTdGlsbFZhbGlkKCkpIHsKICAgICAgICAgQ09ERUJMT0NLX0xPR19FVkVOVChjb2RlQmxv Y2ssICJkZmdGaW5hbGl6ZSIsICgiaW52YWxpZGF0ZWQiKSk7CkBAIC02NjAsNiArNjYwLDcgQEAg Ym9vbCBQbGFuOjppc0tub3duVG9CZUxpdmVEdXJpbmdHQygpCiAKIHZvaWQgUGxhbjo6Y2FuY2Vs KCkKIHsKKyAgICB2bSA9IG51bGxwdHI7CiAgICAgY29kZUJsb2NrID0gbnVsbHB0cjsKICAgICBw cm9maWxlZERGR0NvZGVCbG9jayA9IG51bGxwdHI7CiAgICAgbXVzdEhhbmRsZVZhbHVlcy5jbGVh cigpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQbGFuLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQbGFuLmgJKHJldmlzaW9uIDIwMDky NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUGxhbi5oCSh3b3JraW5nIGNvcHkp CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE1IEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE2IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cwpAQCAtNzgsNyArNzgsMTAgQEAgc3RydWN0IFBsYW4gOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNv dW50ZQogCiAgICAgYm9vbCBjYW5UaWVyVXBBbmRPU1JFbnRlcigpIGNvbnN0IHsgcmV0dXJuICF0 aWVyVXBBbmRPU1JFbnRlckJ5dGVjb2Rlcy5pc0VtcHR5KCk7IH0KICAgICAKLSAgICBWTSYgdm07 CisgICAgLy8gV2FybmluZzogcHJldHR5IG11Y2ggYWxsIG9mIHRoZSBwb2ludGVyIGZpZWxkcyBp biB0aGlzIG9iamVjdCBnZXQgbnVsbGVkIGJ5IGNhbmNlbCgpLiBTbywgaWYKKyAgICAvLyB5b3Un cmUgd3JpdGluZyBjb2RlIHRoYXQgaXMgY2FsbGFibGUgb24gdGhlIGNhbmNlbCBwYXRoLCBiZSBz dXJlIHRvIG51bGwgY2hlY2sgZXZlcnl0aGluZyEKKyAgICAKKyAgICBWTSogdm07CiAKICAgICAv LyBUaGVzZSBjYW4gYmUgcmF3IHBvaW50ZXJzIGJlY2F1c2Ugd2UgdmlzaXQgdGhlbSBkdXJpbmcg ZXZlcnkgR0MgaW4gY2hlY2tMaXZlbmVzc0FuZFZpc2l0Q2hpbGRyZW4uCiAgICAgQ29kZUJsb2Nr KiBjb2RlQmxvY2s7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NhZmVwb2lu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTYWZlcG9p bnQuY3BwCShyZXZpc2lvbiAyMDA5MjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1NhZmVwb2ludC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29w eXJpZ2h0IChDKSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHly aWdodCAoQykgMjAxNCwgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgog ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTQ3LDcgKzQ3LDggQEAgYm9vbCBTYWZlcG9p bnQ6OlJlc3VsdDo6ZGlkR2V0Q2FuY2VsbGVkKAogfQogCiBTYWZlcG9pbnQ6OlNhZmVwb2ludChQ bGFuJiBwbGFuLCBSZXN1bHQmIHJlc3VsdCkKLSAgICA6IG1fcGxhbihwbGFuKQorICAgIDogbV92 bShwbGFuLnZtKQorICAgICwgbV9wbGFuKHBsYW4pCiAgICAgLCBtX2RpZENhbGxCZWdpbihmYWxz ZSkKICAgICAsIG1fcmVzdWx0KHJlc3VsdCkKIHsKQEAgLTExNCwxMSArMTE1LDEyIEBAIHZvaWQg U2FmZXBvaW50OjpjYW5jZWwoKQogICAgIAogICAgIG1fcGxhbi5jYW5jZWwoKTsKICAgICBtX3Jl c3VsdC5tX2RpZEdldENhbmNlbGxlZCA9IHRydWU7CisgICAgbV92bSA9IG51bGxwdHI7CiB9CiAK LVZNJiBTYWZlcG9pbnQ6OnZtKCkgY29uc3QKK1ZNKiBTYWZlcG9pbnQ6OnZtKCkgY29uc3QKIHsK LSAgICByZXR1cm4gbV9wbGFuLnZtOworICAgIHJldHVybiBtX3ZtOwogfQogCiB9IH0gLy8gbmFt ZXNwYWNlIEpTQzo6REZHCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NhZmVw b2ludC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU2FmZXBv aW50LmgJKHJldmlzaW9uIDIwMDkyNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U2FmZXBvaW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJp Z2h0IChDKSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdo dCAoQykgMjAxNCwgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTcyLDkgKzcyLDEwIEBAIHB1YmxpYzoKICAgICBi b29sIGlzS25vd25Ub0JlTGl2ZUR1cmluZ0dDKCk7CiAgICAgdm9pZCBjYW5jZWwoKTsKICAgICAK LSAgICBWTSYgdm0oKSBjb25zdDsKKyAgICBWTSogdm0oKSBjb25zdDsgLy8gTWF5IHJldHVybiBu dWxsIGlmIHdlJ3ZlIGJlZW4gY2FuY2VsbGVkLgogCiBwcml2YXRlOgorICAgIFZNKiBtX3ZtOwog ICAgIFBsYW4mIG1fcGxhbjsKICAgICBWZWN0b3I8U2Nhbm5hYmxlKj4gbV9zY2FubmFibGVzOwog ICAgIGJvb2wgbV9kaWRDYWxsQmVnaW47CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1dvcmtsaXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1dvcmtsaXN0LmNwcAkocmV2aXNpb24gMjAwOTI3KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdXb3JrbGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAv KgotICogQ29weXJpZ2h0IChDKSAyMDEzLCAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE0LCAyMDE2IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtODAsNyAr ODAsNyBAQCBib29sIFdvcmtsaXN0Ojppc0FjdGl2ZUZvclZNKFZNJiB2bSkgY29uCiAgICAgTG9j a0hvbGRlciBsb2NrZXIobV9sb2NrKTsKICAgICBQbGFuTWFwOjpjb25zdF9pdGVyYXRvciBlbmQg PSBtX3BsYW5zLmVuZCgpOwogICAgIGZvciAoUGxhbk1hcDo6Y29uc3RfaXRlcmF0b3IgaXRlciA9 IG1fcGxhbnMuYmVnaW4oKTsgaXRlciAhPSBlbmQ7ICsraXRlcikgewotICAgICAgICBpZiAoJml0 ZXItPnZhbHVlLT52bSA9PSAmdm0pCisgICAgICAgIGlmIChpdGVyLT52YWx1ZS0+dm0gPT0gJnZt KQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKQEAg LTEyOSw3ICsxMjksNyBAQCB2b2lkIFdvcmtsaXN0Ojp3YWl0VW50aWxBbGxQbGFuc0ZvclZNQXJl CiAgICAgICAgIGJvb2wgYWxsQXJlQ29tcGlsZWQgPSB0cnVlOwogICAgICAgICBQbGFuTWFwOjpp dGVyYXRvciBlbmQgPSBtX3BsYW5zLmVuZCgpOwogICAgICAgICBmb3IgKFBsYW5NYXA6Oml0ZXJh dG9yIGl0ZXIgPSBtX3BsYW5zLmJlZ2luKCk7IGl0ZXIgIT0gZW5kOyArK2l0ZXIpIHsKLSAgICAg ICAgICAgIGlmICgmaXRlci0+dmFsdWUtPnZtICE9ICZ2bSkKKyAgICAgICAgICAgIGlmIChpdGVy LT52YWx1ZS0+dm0gIT0gJnZtKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAg ICAgaWYgKGl0ZXItPnZhbHVlLT5zdGFnZSAhPSBQbGFuOjpSZWFkeSkgewogICAgICAgICAgICAg ICAgIGFsbEFyZUNvbXBpbGVkID0gZmFsc2U7CkBAIC0xNTAsNyArMTUwLDcgQEAgdm9pZCBXb3Jr bGlzdDo6cmVtb3ZlQWxsUmVhZHlQbGFuc0ZvclZNKAogICAgIExvY2tIb2xkZXIgbG9ja2VyKG1f bG9jayk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3JlYWR5UGxhbnMuc2l6ZSgpOyAr K2kpIHsKICAgICAgICAgUmVmUHRyPFBsYW4+IHBsYW4gPSBtX3JlYWR5UGxhbnNbaV07Ci0gICAg ICAgIGlmICgmcGxhbi0+dm0gIT0gJnZtKQorICAgICAgICBpZiAocGxhbi0+dm0gIT0gJnZtKQog ICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIGlmIChwbGFuLT5zdGFnZSAhPSBQbGFuOjpS ZWFkeSkKICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtMjEyLDcgKzIxMiw3IEBAIHZvaWQgV29y a2xpc3Q6OnJlbWVtYmVyQ29kZUJsb2NrcyhWTSYgdm0KICAgICBMb2NrSG9sZGVyIGxvY2tlciht X2xvY2spOwogICAgIGZvciAoUGxhbk1hcDo6aXRlcmF0b3IgaXRlciA9IG1fcGxhbnMuYmVnaW4o KTsgaXRlciAhPSBtX3BsYW5zLmVuZCgpOyArK2l0ZXIpIHsKICAgICAgICAgUGxhbiogcGxhbiA9 IGl0ZXItPnZhbHVlLmdldCgpOwotICAgICAgICBpZiAoJnBsYW4tPnZtICE9ICZ2bSkKKyAgICAg ICAgaWYgKHBsYW4tPnZtICE9ICZ2bSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBw bGFuLT5yZW1lbWJlckNvZGVCbG9ja3MoKTsKICAgICB9CkBAIC0yMzksNyArMjM5LDcgQEAgdm9p ZCBXb3JrbGlzdDo6dmlzaXRXZWFrUmVmZXJlbmNlcyhTbG90VgogICAgICAgICBMb2NrSG9sZGVy IGxvY2tlcihtX2xvY2spOwogICAgICAgICBmb3IgKFBsYW5NYXA6Oml0ZXJhdG9yIGl0ZXIgPSBt X3BsYW5zLmJlZ2luKCk7IGl0ZXIgIT0gbV9wbGFucy5lbmQoKTsgKytpdGVyKSB7CiAgICAgICAg ICAgICBQbGFuKiBwbGFuID0gaXRlci0+dmFsdWUuZ2V0KCk7Ci0gICAgICAgICAgICBpZiAoJnBs YW4tPnZtICE9IHZtKQorICAgICAgICAgICAgaWYgKHBsYW4tPnZtICE9IHZtKQogICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgcGxhbi0+Y2hlY2tMaXZlbmVzc0FuZFZpc2l0 Q2hpbGRyZW4odmlzaXRvcik7CiAgICAgICAgIH0KQEAgLTI1MSw3ICsyNTEsNyBAQCB2b2lkIFdv cmtsaXN0Ojp2aXNpdFdlYWtSZWZlcmVuY2VzKFNsb3RWCiAgICAgZm9yICh1bnNpZ25lZCBpID0g bV90aHJlYWRzLnNpemUoKTsgaS0tOykgewogICAgICAgICBUaHJlYWREYXRhKiBkYXRhID0gbV90 aHJlYWRzW2ldLmdldCgpOwogICAgICAgICBTYWZlcG9pbnQqIHNhZmVwb2ludCA9IGRhdGEtPm1f c2FmZXBvaW50OwotICAgICAgICBpZiAoc2FmZXBvaW50ICYmICZzYWZlcG9pbnQtPnZtKCkgPT0g dm0pCisgICAgICAgIGlmIChzYWZlcG9pbnQgJiYgc2FmZXBvaW50LT52bSgpID09IHZtKQogICAg ICAgICAgICAgc2FmZXBvaW50LT5jaGVja0xpdmVuZXNzQW5kVmlzaXRDaGlsZHJlbih2aXNpdG9y KTsKICAgICB9CiB9CkBAIC0yNjMsNyArMjYzLDcgQEAgdm9pZCBXb3JrbGlzdDo6cmVtb3ZlRGVh ZFBsYW5zKFZNJiB2bSkKICAgICAgICAgSGFzaFNldDxDb21waWxhdGlvbktleT4gZGVhZFBsYW5L ZXlzOwogICAgICAgICBmb3IgKFBsYW5NYXA6Oml0ZXJhdG9yIGl0ZXIgPSBtX3BsYW5zLmJlZ2lu KCk7IGl0ZXIgIT0gbV9wbGFucy5lbmQoKTsgKytpdGVyKSB7CiAgICAgICAgICAgICBQbGFuKiBw bGFuID0gaXRlci0+dmFsdWUuZ2V0KCk7Ci0gICAgICAgICAgICBpZiAoJnBsYW4tPnZtICE9ICZ2 bSkKKyAgICAgICAgICAgIGlmIChwbGFuLT52bSAhPSAmdm0pCiAgICAgICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgICAgICBpZiAocGxhbi0+aXNLbm93blRvQmVMaXZlRHVyaW5nR0MoKSkK ICAgICAgICAgICAgICAgICBjb250aW51ZTsKQEAgLTI5Niw3ICsyOTYsNyBAQCB2b2lkIFdvcmts aXN0OjpyZW1vdmVEZWFkUGxhbnMoVk0mIHZtKQogICAgICAgICBTYWZlcG9pbnQqIHNhZmVwb2lu dCA9IGRhdGEtPm1fc2FmZXBvaW50OwogICAgICAgICBpZiAoIXNhZmVwb2ludCkKICAgICAgICAg ICAgIGNvbnRpbnVlOwotICAgICAgICBpZiAoJnNhZmVwb2ludC0+dm0oKSAhPSAmdm0pCisgICAg ICAgIGlmIChzYWZlcG9pbnQtPnZtKCkgIT0gJnZtKQogICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgIGlmIChzYWZlcG9pbnQtPmlzS25vd25Ub0JlTGl2ZUR1cmluZ0dDKCkpCiAgICAgICAg ICAgICBjb250aW51ZTsKQEAgLTM2NSw5ICszNjUsOSBAQCB2b2lkIFdvcmtsaXN0OjpydW5UaHJl YWQoVGhyZWFkRGF0YSogZGF0CiAgICAgICAgICAgICBpZiAoT3B0aW9uczo6dmVyYm9zZUNvbXBp bGF0aW9uUXVldWUoKSkKICAgICAgICAgICAgICAgICBkYXRhTG9nKCp0aGlzLCAiOiBDb21waWxp bmcgIiwgcGxhbi0+a2V5KCksICIgYXN5bmNocm9ub3VzbHlcbiIpOwogICAgICAgICAKLSAgICAg ICAgICAgIFJFTEVBU0VfQVNTRVJUKCFwbGFuLT52bS5oZWFwLmlzQ29sbGVjdGluZygpKTsKKyAg ICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFwbGFuLT52bS0+aGVhcC5pc0NvbGxlY3RpbmcoKSk7 CiAgICAgICAgICAgICBwbGFuLT5jb21waWxlSW5UaHJlYWQobG9uZ0xpdmVkU3RhdGUsIGRhdGEp OwotICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQocGxhbi0+c3RhZ2UgPT0gUGxhbjo6Q2FuY2Vs bGVkIHx8ICFwbGFuLT52bS5oZWFwLmlzQ29sbGVjdGluZygpKTsKKyAgICAgICAgICAgIFJFTEVB U0VfQVNTRVJUKHBsYW4tPnN0YWdlID09IFBsYW46OkNhbmNlbGxlZCB8fCAhcGxhbi0+dm0tPmhl YXAuaXNDb2xsZWN0aW5nKCkpOwogICAgICAgICAgICAgCiAgICAgICAgICAgICB7CiAgICAgICAg ICAgICAgICAgTG9ja0hvbGRlciBsb2NrZXIobV9sb2NrKTsKQEAgLTM3Nyw3ICszNzcsNyBAQCB2 b2lkIFdvcmtsaXN0OjpydW5UaHJlYWQoVGhyZWFkRGF0YSogZGF0CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIHBsYW4tPm5vdGlmeUNvbXBpbGVkKCk7CiAgICAgICAgICAgICB9 Ci0gICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCghcGxhbi0+dm0uaGVhcC5pc0NvbGxlY3Rpbmco KSk7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCghcGxhbi0+dm0tPmhlYXAuaXNDb2xsZWN0 aW5nKCkpOwogICAgICAgICB9CiAKICAgICAgICAgewpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2Z0bC9GVExKSVRGaW5hbGl6ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9mdGwvRlRMSklURmluYWxpemVyLmNwcAkocmV2aXNpb24gMjAwOTI3KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExKSVRGaW5hbGl6ZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC04Myw3ICs4Myw3IEBAIGJvb2wgSklURmluYWxpemVyOjpmaW5hbGl6ZUZ1bmN0aW9uKCkK ICAgICBtX3BsYW4uY29kZUJsb2NrLT5zZXRKSVRDb2RlKGppdENvZGUpOwogCiAgICAgaWYgKG1f cGxhbi5jb21waWxhdGlvbikKLSAgICAgICAgbV9wbGFuLnZtLm1fcGVyQnl0ZWNvZGVQcm9maWxl ci0+YWRkQ29tcGlsYXRpb24obV9wbGFuLmNvZGVCbG9jaywgbV9wbGFuLmNvbXBpbGF0aW9uKTsK KyAgICAgICAgbV9wbGFuLnZtLT5tX3BlckJ5dGVjb2RlUHJvZmlsZXItPmFkZENvbXBpbGF0aW9u KG1fcGxhbi5jb2RlQmxvY2ssIG1fcGxhbi5jb21waWxhdGlvbik7CiAgICAgCiAgICAgcmV0dXJu IHRydWU7CiB9Cg==