188707 2018-08-17 14:21:28 -0700 intersectionOfPastValuesAtHead must filter values after they've observed an invalidation point 2018-08-20 17:29:13 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff rmorisset ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1451215 0 saam 2018-08-17 14:21:28 -0700 ... 1451217 1 saam 2018-08-17 14:22:32 -0700 <rdar://problem/43015442> 1451233 2 347392 saam 2018-08-17 14:57:23 -0700 Created attachment 347392 patch 1451246 3 347392 mark.lam 2018-08-17 15:31:14 -0700 Comment on attachment 347392 patch View in context: https://bugs.webkit.org/attachment.cgi?id=347392&action=review r=me > Source/JavaScriptCore/ChangeLog:29 > + We fix this by filtering values in intersectionOfPastValuesAtHead as > + with values as if an invalidation point has occured. This places the The text "intersectionOfPastValuesAtHead as with values as if" is unclear. Looks like there's some partial edits here. Please fix. 1451247 4 347398 saam 2018-08-17 15:38:24 -0700 Created attachment 347398 patch for landing 1451273 5 347398 ggaren 2018-08-17 16:33:12 -0700 Comment on attachment 347398 patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=347398&action=review > Source/JavaScriptCore/dfg/DFGCFAPhase.cpp:147 > + // the incoming value as if an invalidation point has occurred. as if it could live past an invalidation point > Source/JavaScriptCore/dfg/DFGCFAPhase.cpp:149 > + // structure, and an InvalidationPoint no longer guarantees It’s more like we’re violating the promise made by an invalidation point. The invalidating point itself still works. We must conservatively act as if there’s an invalidation point because we do not pr Isley model them in osr entry metadata. 1451275 6 347412 saam 2018-08-17 16:48:11 -0700 Created attachment 347412 patch for landing 1451277 7 347414 saam 2018-08-17 16:49:48 -0700 Created attachment 347414 patch for landing 1451319 8 347414 commit-queue 2018-08-17 18:56:55 -0700 Comment on attachment 347414 patch for landing Rejecting attachment 347414 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 347414, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in JSTests/ChangeLog contains OOPS!. Full output: https://webkit-queues.webkit.org/results/8897685 1451324 9 saam 2018-08-17 19:05:29 -0700 landed in: https://trac.webkit.org/changeset/235007/webkit 1451389 10 fpizlo 2018-08-18 09:28:02 -0700 (In reply to Geoffrey Garen from comment #5) > Comment on attachment 347398 [details] > patch for landing > > View in context: > https://bugs.webkit.org/attachment.cgi?id=347398&action=review > > > Source/JavaScriptCore/dfg/DFGCFAPhase.cpp:147 > > + // the incoming value as if an invalidation point has occurred. > > as if it could live past an invalidation point > > > Source/JavaScriptCore/dfg/DFGCFAPhase.cpp:149 > > + // structure, and an InvalidationPoint no longer guarantees > > It’s more like we’re violating the promise made by an invalidation point. > The invalidating point itself still works. We must conservatively act as if > there’s an invalidation point because we do not pr Isley model them in osr > entry metadata. OSR happens at a point in time where if any watchpoints fired, we would have jettisoned the code block. Therefore, the most precise modeling of invalidation points at OSR is to say that they had happened. So, we are modeling them precisely in this patch. 347392 2018-08-17 14:57:23 -0700 2018-08-17 15:38:24 -0700 patch a-backup.diff text/plain 5168 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzQ5OTYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE2IEBACisyMDE4LTA4LTE3ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIGludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZCBtdXN0IGZpbHRl ciB2YWx1ZXMgYWZ0ZXIgdGhleSd2ZSBvYnNlcnZlZCBhbiBpbnZhbGlkYXRpb24gcG9pbnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODcwNworICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNDMwMTU0NDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3MvY2ZhLWV4cGVjdGVkLXZhbHVlcy1tdXN0 LXNldC1jbG9iYmVyZWQtdG8tZmFsc2UuanM6IEFkZGVkLgorICAgICAgICAoZm9vKToKKyAgICAg ICAgKGxldC5jb21wLnZhbHVlT2YpOgorICAgICAgICAocmVzdWx0KToKKwogMjAxOC0wOC0xMCAg S2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBTbGljaW5n IGFuIEFycmF5QnVmZmVyIHdpdGggYSBsb25nIG51bWJlciByZXR1cm5zIGFuIEFycmF5QnVmZmVy IHdpdGggYnl0ZUxlbmd0aCB6ZXJvCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQt dmFsdWVzLW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxzZS5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKU1Rl c3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQtdmFsdWVzLW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxz ZS5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQtdmFsdWVz LW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxzZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsx LDM4IEBACisvL0AgcnVuRGVmYXVsdCgiLS11c2VGVExKSVQ9MCIsICItLXVzZUNvbmN1cnJlbnRK SVQ9ZmFsc2UiKQorCitsZXQgbnVtID0gMTUwOworCitmdW5jdGlvbiBmb28oY29tcCwgbywgYikg eworICAgIGxldCBzdW0gPSBvLmY7CisgICAgaWYgKGIpCisgICAgICAgIE9TUkV4aXQoKTsKKyAg ICBmb3IgKGxldCBpID0gMDsgaSA8IGNvbXA7ICsraSkgeworICAgICAgICBzdW0gKz0gby5mOwor ICAgIH0KKyAgICByZXR1cm4gc3VtOworfQorbm9JbmxpbmUoZm9vKTsKKworbGV0IG8gPSB7Zjoy NX07CitsZXQgbzIgPSB7ZjoyNSwgZzo0NH07CitvMi5mID0gNDU7CitvMi5mID0gNDU7CitvMi5m ID0gNDU7CitvMi5mID0gNDU7CitsZXQgY29tcCA9IHsKKyAgICB2YWx1ZU9mKCkgeyByZXR1cm4g bnVtOyB9Cit9CisKK2Zvbyhjb21wLCBvMiwgdHJ1ZSk7Citmb28oY29tcCwgbzIsIHRydWUpOwor Zm9yIChsZXQgaSA9IDA7IGkgPCA1MDA7ICsraSkgeworICAgIGZvbyhjb21wLCBvMiwgZmFsc2Up OworfQorCitsZXQgbzMgPSB7ZzoyNCwgZjo3M307CitudW0gPSAxMDAwMDAwMDsKK2xldCByZXN1 bHQgPSBmb28oY29tcCwgbzMsIGZhbHNlKTsKKworaWYgKHJlc3VsdCAhPT0gKG51bSArIDEpKjcz KSB7CisgICAgdGhyb3cgbmV3IEVycm9yKCJCYWQ6ICIgKyByZXN1bHQpOworfQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzQ5OTEpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTgtMDgt MTcgIFNhYW0gYmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CisKKyAgICAgICAgaW50ZXJzZWN0 aW9uT2ZQYXN0VmFsdWVzQXRIZWFkIG11c3QgZmlsdGVyIHZhbHVlcyBhZnRlciB0aGV5J3ZlIG9i c2VydmVkIGFuIGludmFsaWRhdGlvbiBwb2ludAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4NzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MzAx NTQ0Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZSB1c2UgdGhlIHZhbHVlcyBpbiBpbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWQgdG8gdmVy aWZ5IHRoYXQgd2UgY2FuCisgICAgICAgIE9TUiBlbnRlciBhdCB0aGUgaGVhZCBvZiBhIGJsb2Nr LiBXZSB2ZXJpZnkgaXQncyBzYWZlIHRvIE9TUiBlbnRlciBieSBjaGVja2luZworICAgICAgICB0 aGF0IHRoZSBpbmNvbWluZyB2YWx1ZXMgYXJlIGNvbXBhdGlibGUgd2l0aCB0aGUgQWJzdHJhY3RW YWx1ZS4KKyAgICAgICAgCisgICAgICAgIFRoZSBidWcgaXMgdGhhdCB3ZSB3ZXJlIHNvbWV0aW1l cyBmaWx0ZXJpbmcgdGhlIGludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZAorICAgICAgICB3 aXRoIGFic3RyYWN0IHZhbHVlcyB0aGF0IHdlcmUgY2xvYmJlcmVyZC4gVGhpcyBtZWFudCB0aGF0 IHRoZSB2YWx1ZSB3ZSdyZQorICAgICAgICB2ZXJpZnlpbmcgd2l0aCBPU1IgZW50cnkgZWZmZWN0 aXZlbHkgaGFzIGFuIGluZmluaXRlIHN0cnVjdHVyZSBzZXQgc2luY2UKKyAgICAgICAgaXQncyBj bG9iYmVyZWQuIFNvLCBpbWFnaW5lIHdlIGhhZCBjb2RlIGxpa2UgdGhpczoKKyAgICAgICAgYGBg CisgICAgICAgIC0tLT4gV2UgT1NSIGVudGVyIGhlcmUKKyAgICAgICAgSW52YWxpZGF0aW9uUG9p bnQKKyAgICAgICAgR2V0QnlPZmZzZXQoQGJhc2UpCisgICAgICAgIGBgYAorICAgICAgICAKKyAg ICAgICAgVGhlIGFic3RyYWN0IHZhbHVlIGZvciBAYmFzZSBpbnNpZGUgaW50ZXJzZWN0aW9uT2ZQ YXN0VmFsdWVzQXRIZWFkIGhhZCBhCisgICAgICAgIGNsb2JiZXJyZWQgc3RydWN0dXJlIHNldCwg c28gd2UnZCBhbGxvdyBhbnkgaW5jb21pbmcgb2JqZWN0IHdpdGggYW55CisgICAgICAgIHN0cnVj dHVyZS4gSG93ZXZlciwgdGhpcyBpcyB3cm9uZyBiZWNhdXNlIHRoZSBpbnZhbGlkYXRpb24gcG9p bnQgaXMgbm8KKyAgICAgICAgbG9uZ2VyIGd1YXJhbnRlZWluZyB0aGUgc3RydWN0dXJlIHRoYXQg QGJhc2UgaGFzLgorICAgICAgICAKKyAgICAgICAgV2UgZml4IHRoaXMgYnkgZmlsdGVyaW5nIHZh bHVlcyBpbiBpbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWQgYXMKKyAgICAgICAgd2l0aCB2 YWx1ZXMgYXMgaWYgYW4gaW52YWxpZGF0aW9uIHBvaW50IGhhcyBvY2N1cmVkLiBUaGlzIHBsYWNl cyB0aGUKKyAgICAgICAgc3RyaWN0ZXIgcmVxdWlyZW1lbnQgdGhhdCB0byBPU1IgZW50ZXIgYXQg YSBwcm9ncmFtIHBvaW50LCB0aGUKKyAgICAgICAgaW5jb21pbmcgdmFsdWVzIG11c3QgYmUgY29t cGF0aWJsZSBhcyBpZiBhbiBpbnZhbGlkYXRpb24gcG9pbnQgaGFzCisgICAgICAgIG9jY3VycmVk LgorCisgICAgICAgICogZGZnL0RGR0NGQVBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpD RkFQaGFzZTo6cnVuKToKKwogMjAxOC0wOC0xNyAgWXVzdWtlIFN1enVraSAgPHl1c3VrZXN1enVr aUBzbG93c3RhcnQub3JnPiBhbmQgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255 LmNvbT4KIAogICAgICAgICBbSlNDXSBBZGQgR1BSUmVnOjpJbnZhbGlkR1BSUmVnIGFuZCBGUFJS ZWc6OkludmFsaWRGUFJSZWcKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ0ZB UGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ0ZB UGhhc2UuY3BwCShyZXZpc2lvbiAyMzQ5OTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR0NGQVBoYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxLDggKzE0MSwxNiBAQCBwdWJs aWM6CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIAogICAg ICAgICAgICAgICAgIGJsb2NrLT5pbnRlcnNlY3Rpb25PZkNGQUhhc1Zpc2l0ZWQgJj0gYmxvY2st PmNmYUhhc1Zpc2l0ZWQ7Ci0gICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gYmxvY2st PmludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZC5zaXplKCk7IGktLTspCi0gICAgICAgICAg ICAgICAgICAgIGJsb2NrLT5pbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWRbaV0uZmlsdGVy KGJsb2NrLT52YWx1ZXNBdEhlYWRbaV0pOworICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQg aSA9IGJsb2NrLT5pbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWQuc2l6ZSgpOyBpLS07KSB7 CisgICAgICAgICAgICAgICAgICAgIEFic3RyYWN0VmFsdWUgdmFsdWUgPSBibG9jay0+dmFsdWVz QXRIZWFkW2ldOworICAgICAgICAgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIGd1YXJhbnRlZSB0 aGF0IHdoZW4gd2UgZG8gYW4gT1NSIGVudHJ5LCB3ZSB2YWxpZGF0ZQorICAgICAgICAgICAgICAg ICAgICAvLyB0aGUgaW5jb21pbmcgdmFsdWUgYXMgaWYgYW4gaW52YWxpZGF0aW9uIHBvaW50IGhh cyBvY2N1cnJlZC4KKyAgICAgICAgICAgICAgICAgICAgLy8gT3RoZXJ3aXNlLCB3ZSBtYXkgYWxs b3cgb2JqZWN0cyB0byBPU1IgZW50ZXIgd2l0aCB0aGUgd3JvbmcKKyAgICAgICAgICAgICAgICAg ICAgLy8gc3RydWN0dXJlLCBhbmQgYW4gSW52YWxpZGF0aW9uUG9pbnQgbm8gbG9uZ2VyIGd1YXJh bnRlZXMKKyAgICAgICAgICAgICAgICAgICAgLy8gdGhlIHN0cnVjdHVyZSB0aGF0IGEgdmFsdWUg bWF5IGhhdmUuCisgICAgICAgICAgICAgICAgICAgIHZhbHVlLm1fc3RydWN0dXJlLm9ic2VydmVJ bnZhbGlkYXRpb25Qb2ludCgpOworICAgICAgICAgICAgICAgICAgICBibG9jay0+aW50ZXJzZWN0 aW9uT2ZQYXN0VmFsdWVzQXRIZWFkW2ldLmZpbHRlcih2YWx1ZSk7CisgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIAo= 347398 2018-08-17 15:38:24 -0700 2018-08-17 16:48:11 -0700 patch for landing a-backup.diff text/plain 5159 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzQ5OTYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE2IEBACisyMDE4LTA4LTE3ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIGludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZCBtdXN0IGZpbHRl ciB2YWx1ZXMgYWZ0ZXIgdGhleSd2ZSBvYnNlcnZlZCBhbiBpbnZhbGlkYXRpb24gcG9pbnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODcwNworICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNDMwMTU0NDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3MvY2ZhLWV4cGVjdGVkLXZhbHVlcy1tdXN0 LXNldC1jbG9iYmVyZWQtdG8tZmFsc2UuanM6IEFkZGVkLgorICAgICAgICAoZm9vKToKKyAgICAg ICAgKGxldC5jb21wLnZhbHVlT2YpOgorICAgICAgICAocmVzdWx0KToKKwogMjAxOC0wOC0xMCAg S2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBTbGljaW5n IGFuIEFycmF5QnVmZmVyIHdpdGggYSBsb25nIG51bWJlciByZXR1cm5zIGFuIEFycmF5QnVmZmVy IHdpdGggYnl0ZUxlbmd0aCB6ZXJvCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQt dmFsdWVzLW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxzZS5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKU1Rl c3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQtdmFsdWVzLW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxz ZS5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQtdmFsdWVz LW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxzZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsx LDM4IEBACisvL0AgcnVuRGVmYXVsdCgiLS11c2VGVExKSVQ9MCIsICItLXVzZUNvbmN1cnJlbnRK SVQ9ZmFsc2UiKQorCitsZXQgbnVtID0gMTUwOworCitmdW5jdGlvbiBmb28oY29tcCwgbywgYikg eworICAgIGxldCBzdW0gPSBvLmY7CisgICAgaWYgKGIpCisgICAgICAgIE9TUkV4aXQoKTsKKyAg ICBmb3IgKGxldCBpID0gMDsgaSA8IGNvbXA7ICsraSkgeworICAgICAgICBzdW0gKz0gby5mOwor ICAgIH0KKyAgICByZXR1cm4gc3VtOworfQorbm9JbmxpbmUoZm9vKTsKKworbGV0IG8gPSB7Zjoy NX07CitsZXQgbzIgPSB7ZjoyNSwgZzo0NH07CitvMi5mID0gNDU7CitvMi5mID0gNDU7CitvMi5m ID0gNDU7CitvMi5mID0gNDU7CitsZXQgY29tcCA9IHsKKyAgICB2YWx1ZU9mKCkgeyByZXR1cm4g bnVtOyB9Cit9CisKK2Zvbyhjb21wLCBvMiwgdHJ1ZSk7Citmb28oY29tcCwgbzIsIHRydWUpOwor Zm9yIChsZXQgaSA9IDA7IGkgPCA1MDA7ICsraSkgeworICAgIGZvbyhjb21wLCBvMiwgZmFsc2Up OworfQorCitsZXQgbzMgPSB7ZzoyNCwgZjo3M307CitudW0gPSAxMDAwMDAwMDsKK2xldCByZXN1 bHQgPSBmb28oY29tcCwgbzMsIGZhbHNlKTsKKworaWYgKHJlc3VsdCAhPT0gKG51bSArIDEpKjcz KSB7CisgICAgdGhyb3cgbmV3IEVycm9yKCJCYWQ6ICIgKyByZXN1bHQpOworfQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzQ5OTEpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTgtMDgt MTcgIFNhYW0gYmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CisKKyAgICAgICAgaW50ZXJzZWN0 aW9uT2ZQYXN0VmFsdWVzQXRIZWFkIG11c3QgZmlsdGVyIHZhbHVlcyBhZnRlciB0aGV5J3ZlIG9i c2VydmVkIGFuIGludmFsaWRhdGlvbiBwb2ludAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4NzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MzAx NTQ0Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBNYXJrIExhbS4KKworICAgICAgICBXZSB1c2Ug dGhlIHZhbHVlcyBpbiBpbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWQgdG8gdmVyaWZ5IHRo YXQgd2UgY2FuCisgICAgICAgIE9TUiBlbnRlciBhdCB0aGUgaGVhZCBvZiBhIGJsb2NrLiBXZSB2 ZXJpZnkgaXQncyBzYWZlIHRvIE9TUiBlbnRlciBieSBjaGVja2luZworICAgICAgICB0aGF0IHRo ZSBpbmNvbWluZyB2YWx1ZXMgYXJlIGNvbXBhdGlibGUgd2l0aCB0aGUgQWJzdHJhY3RWYWx1ZS4K KyAgICAgICAgCisgICAgICAgIFRoZSBidWcgaXMgdGhhdCB3ZSB3ZXJlIHNvbWV0aW1lcyBmaWx0 ZXJpbmcgdGhlIGludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZAorICAgICAgICB3aXRoIGFi c3RyYWN0IHZhbHVlcyB0aGF0IHdlcmUgY2xvYmJlcmVyZC4gVGhpcyBtZWFudCB0aGF0IHRoZSB2 YWx1ZSB3ZSdyZQorICAgICAgICB2ZXJpZnlpbmcgd2l0aCBPU1IgZW50cnkgZWZmZWN0aXZlbHkg aGFzIGFuIGluZmluaXRlIHN0cnVjdHVyZSBzZXQgc2luY2UKKyAgICAgICAgaXQncyBjbG9iYmVy ZWQuIFNvLCBpbWFnaW5lIHdlIGhhZCBjb2RlIGxpa2UgdGhpczoKKyAgICAgICAgYGBgCisgICAg ICAgIC0tLT4gV2UgT1NSIGVudGVyIGhlcmUKKyAgICAgICAgSW52YWxpZGF0aW9uUG9pbnQKKyAg ICAgICAgR2V0QnlPZmZzZXQoQGJhc2UpCisgICAgICAgIGBgYAorICAgICAgICAKKyAgICAgICAg VGhlIGFic3RyYWN0IHZhbHVlIGZvciBAYmFzZSBpbnNpZGUgaW50ZXJzZWN0aW9uT2ZQYXN0VmFs dWVzQXRIZWFkIGhhZCBhCisgICAgICAgIGNsb2JiZXJyZWQgc3RydWN0dXJlIHNldCwgc28gd2Un ZCBhbGxvdyBhbnkgaW5jb21pbmcgb2JqZWN0IHdpdGggYW55CisgICAgICAgIHN0cnVjdHVyZS4g SG93ZXZlciwgdGhpcyBpcyB3cm9uZyBiZWNhdXNlIHRoZSBpbnZhbGlkYXRpb24gcG9pbnQgaXMg bm8KKyAgICAgICAgbG9uZ2VyIGd1YXJhbnRlZWluZyB0aGUgc3RydWN0dXJlIHRoYXQgQGJhc2Ug aGFzLgorICAgICAgICAKKyAgICAgICAgV2UgZml4IHRoaXMgYnkgZmlsdGVyaW5nIHZhbHVlcyBp biBpbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWQKKyAgICAgICAgd2l0aCB2YWx1ZXMgYXMg aWYgYW4gaW52YWxpZGF0aW9uIHBvaW50IGhhcyBvY2N1cmVkLiBUaGlzIHBsYWNlcyB0aGUKKyAg ICAgICAgc3RyaWN0ZXIgcmVxdWlyZW1lbnQgdGhhdCB0byBPU1IgZW50ZXIgYXQgYSBwcm9ncmFt IHBvaW50LCB0aGUKKyAgICAgICAgaW5jb21pbmcgdmFsdWVzIG11c3QgYmUgY29tcGF0aWJsZSBh cyBpZiBhbiBpbnZhbGlkYXRpb24gcG9pbnQgaGFzCisgICAgICAgIG9jY3VycmVkLgorCisgICAg ICAgICogZGZnL0RGR0NGQVBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpDRkFQaGFzZTo6 cnVuKToKKwogMjAxOC0wOC0xNyAgWXVzdWtlIFN1enVraSAgPHl1c3VrZXN1enVraUBzbG93c3Rh cnQub3JnPiBhbmQgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAog ICAgICAgICBbSlNDXSBBZGQgR1BSUmVnOjpJbnZhbGlkR1BSUmVnIGFuZCBGUFJSZWc6OkludmFs aWRGUFJSZWcKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ0ZBUGhhc2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ0ZBUGhhc2UuY3Bw CShyZXZpc2lvbiAyMzQ5OTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NGQVBo YXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxLDggKzE0MSwxNiBAQCBwdWJsaWM6CiAgICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIAogICAgICAgICAgICAg ICAgIGJsb2NrLT5pbnRlcnNlY3Rpb25PZkNGQUhhc1Zpc2l0ZWQgJj0gYmxvY2stPmNmYUhhc1Zp c2l0ZWQ7Ci0gICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gYmxvY2stPmludGVyc2Vj dGlvbk9mUGFzdFZhbHVlc0F0SGVhZC5zaXplKCk7IGktLTspCi0gICAgICAgICAgICAgICAgICAg IGJsb2NrLT5pbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWRbaV0uZmlsdGVyKGJsb2NrLT52 YWx1ZXNBdEhlYWRbaV0pOworICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IGJsb2Nr LT5pbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWQuc2l6ZSgpOyBpLS07KSB7CisgICAgICAg ICAgICAgICAgICAgIEFic3RyYWN0VmFsdWUgdmFsdWUgPSBibG9jay0+dmFsdWVzQXRIZWFkW2ld OworICAgICAgICAgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIGd1YXJhbnRlZSB0aGF0IHdoZW4g d2UgZG8gYW4gT1NSIGVudHJ5LCB3ZSB2YWxpZGF0ZQorICAgICAgICAgICAgICAgICAgICAvLyB0 aGUgaW5jb21pbmcgdmFsdWUgYXMgaWYgYW4gaW52YWxpZGF0aW9uIHBvaW50IGhhcyBvY2N1cnJl ZC4KKyAgICAgICAgICAgICAgICAgICAgLy8gT3RoZXJ3aXNlLCB3ZSBtYXkgYWxsb3cgb2JqZWN0 cyB0byBPU1IgZW50ZXIgd2l0aCB0aGUgd3JvbmcKKyAgICAgICAgICAgICAgICAgICAgLy8gc3Ry dWN0dXJlLCBhbmQgYW4gSW52YWxpZGF0aW9uUG9pbnQgbm8gbG9uZ2VyIGd1YXJhbnRlZXMKKyAg ICAgICAgICAgICAgICAgICAgLy8gdGhlIHN0cnVjdHVyZSB0aGF0IGEgdmFsdWUgbWF5IGhhdmUu CisgICAgICAgICAgICAgICAgICAgIHZhbHVlLm1fc3RydWN0dXJlLm9ic2VydmVJbnZhbGlkYXRp b25Qb2ludCgpOworICAgICAgICAgICAgICAgICAgICBibG9jay0+aW50ZXJzZWN0aW9uT2ZQYXN0 VmFsdWVzQXRIZWFkW2ldLmZpbHRlcih2YWx1ZSk7CisgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgfQogICAgICAgICB9CiAgICAgICAgIAo= 347412 2018-08-17 16:48:11 -0700 2018-08-17 16:49:48 -0700 patch for landing a-backup.diff text/plain 5288 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzQ5OTYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE2IEBACisyMDE4LTA4LTE3ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIGludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZCBtdXN0IGZpbHRl ciB2YWx1ZXMgYWZ0ZXIgdGhleSd2ZSBvYnNlcnZlZCBhbiBpbnZhbGlkYXRpb24gcG9pbnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODcwNworICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNDMwMTU0NDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3MvY2ZhLWV4cGVjdGVkLXZhbHVlcy1tdXN0 LXNldC1jbG9iYmVyZWQtdG8tZmFsc2UuanM6IEFkZGVkLgorICAgICAgICAoZm9vKToKKyAgICAg ICAgKGxldC5jb21wLnZhbHVlT2YpOgorICAgICAgICAocmVzdWx0KToKKwogMjAxOC0wOC0xMCAg S2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBTbGljaW5n IGFuIEFycmF5QnVmZmVyIHdpdGggYSBsb25nIG51bWJlciByZXR1cm5zIGFuIEFycmF5QnVmZmVy IHdpdGggYnl0ZUxlbmd0aCB6ZXJvCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQt dmFsdWVzLW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxzZS5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKU1Rl c3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQtdmFsdWVzLW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxz ZS5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQtdmFsdWVz LW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxzZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsx LDM4IEBACisvL0AgcnVuRGVmYXVsdCgiLS11c2VGVExKSVQ9MCIsICItLXVzZUNvbmN1cnJlbnRK SVQ9ZmFsc2UiKQorCitsZXQgbnVtID0gMTUwOworCitmdW5jdGlvbiBmb28oY29tcCwgbywgYikg eworICAgIGxldCBzdW0gPSBvLmY7CisgICAgaWYgKGIpCisgICAgICAgIE9TUkV4aXQoKTsKKyAg ICBmb3IgKGxldCBpID0gMDsgaSA8IGNvbXA7ICsraSkgeworICAgICAgICBzdW0gKz0gby5mOwor ICAgIH0KKyAgICByZXR1cm4gc3VtOworfQorbm9JbmxpbmUoZm9vKTsKKworbGV0IG8gPSB7Zjoy NX07CitsZXQgbzIgPSB7ZjoyNSwgZzo0NH07CitvMi5mID0gNDU7CitvMi5mID0gNDU7CitvMi5m ID0gNDU7CitvMi5mID0gNDU7CitsZXQgY29tcCA9IHsKKyAgICB2YWx1ZU9mKCkgeyByZXR1cm4g bnVtOyB9Cit9CisKK2Zvbyhjb21wLCBvMiwgdHJ1ZSk7Citmb28oY29tcCwgbzIsIHRydWUpOwor Zm9yIChsZXQgaSA9IDA7IGkgPCA1MDA7ICsraSkgeworICAgIGZvbyhjb21wLCBvMiwgZmFsc2Up OworfQorCitsZXQgbzMgPSB7ZzoyNCwgZjo3M307CitudW0gPSAxMDAwMDAwMDsKK2xldCByZXN1 bHQgPSBmb28oY29tcCwgbzMsIGZhbHNlKTsKKworaWYgKHJlc3VsdCAhPT0gKG51bSArIDEpKjcz KSB7CisgICAgdGhyb3cgbmV3IEVycm9yKCJCYWQ6ICIgKyByZXN1bHQpOworfQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzQ5OTEpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTgtMDgt MTcgIFNhYW0gYmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CisKKyAgICAgICAgaW50ZXJzZWN0 aW9uT2ZQYXN0VmFsdWVzQXRIZWFkIG11c3QgZmlsdGVyIHZhbHVlcyBhZnRlciB0aGV5J3ZlIG9i c2VydmVkIGFuIGludmFsaWRhdGlvbiBwb2ludAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4NzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MzAx NTQ0Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBNYXJrIExhbS4KKworICAgICAgICBXZSB1c2Ug dGhlIHZhbHVlcyBpbiBpbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWQgdG8gdmVyaWZ5IHRo YXQgaXQgaXMgc2FmZSB0bworICAgICAgICBPU1IgZW50ZXIgYXQgdGhlIGhlYWQgb2YgYSBibG9j ay4gV2UgdmVyaWZ5IGl0J3Mgc2FmZSB0byBPU1IgZW50ZXIgYnkgY2hlY2tpbmcKKyAgICAgICAg dGhhdCBlYWNoIGluY29taW5nIHZhbHVlIGlzIGNvbXBhdGlibGUgd2l0aCBpdHMgY29ycmVzcG9u ZGluZyBBYnN0cmFjdFZhbHVlLgorICAgICAgICAKKyAgICAgICAgVGhlIGJ1ZyBpcyB0aGF0IHdl IHdlcmUgc29tZXRpbWVzIGZpbHRlcmluZyB0aGUgaW50ZXJzZWN0aW9uT2ZQYXN0VmFsdWVzQXRI ZWFkCisgICAgICAgIHdpdGggYWJzdHJhY3QgdmFsdWVzIHRoYXQgd2VyZSBjbG9iYmVyZXJkLiBU aGlzIG1lYW50IHRoYXQgdGhlIHZhbHVlIHdlJ3JlCisgICAgICAgIHZlcmlmeWluZyB3aXRoIGF0 IE9TUiBlbnRyeSBlZmZlY3RpdmVseSBoYXMgYW4gaW5maW5pdGUgc3RydWN0dXJlIHNldCBiZWNh dXNlCisgICAgICAgIGl0J3MgY2xvYmJlcmVkLiBTbywgaW1hZ2luZSB3ZSBoYXZlIGNvZGUgbGlr ZSB0aGlzOgorICAgICAgICBgYGAKKyAgICAgICAgLS0tPiBXZSBPU1IgZW50ZXIgaGVyZSwgYW5k IHdlJ3JlIGNsb2JiZXJlZCBoZXJlCisgICAgICAgIEludmFsaWRhdGlvblBvaW50CisgICAgICAg IEdldEJ5T2Zmc2V0KEBiYXNlKQorICAgICAgICBgYGAKKyAgICAgICAgCisgICAgICAgIFRoZSBh YnN0cmFjdCB2YWx1ZSBmb3IgQGJhc2UgaW5zaWRlIGludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0 SGVhZCBoYXMgYQorICAgICAgICBjbG9iYmVycmVkIHN0cnVjdHVyZSBzZXQsIHNvIHdlJ2QgYWxs b3cgYW55IGluY29taW5nIG9iamVjdCB3aXRoIGFueQorICAgICAgICBzdHJ1Y3R1cmUuIEhvd2V2 ZXIsIHRoaXMgaXMgd3JvbmcgYmVjYXVzZSB0aGUgaW52YWxpZGF0aW9uIHBvaW50IGlzIG5vCisg ICAgICAgIGxvbmdlciBmdWxmaWxsaW5nIGl0cyBwcm9taXNlIHRoYXQgaXQgZmlsdGVycyB0aGUg c3RydWN0dXJlIHRoYXQgQGJhc2UgaGFzLgorICAgICAgICAKKyAgICAgICAgV2UgZml4IHRoaXMg YnkgZmlsdGVyaW5nIHRoZSBBYnN0cmFjdFZhbHVlcyBpbiBpbnRlcnNlY3Rpb25PZlBhc3RWYWx1 ZXNBdEhlYWQKKyAgICAgICAgYXMgaWYgdGhlIGluY29taW5nIHZhbHVlIG1heSBiZSBsaXZlIHBh c3QgYW4gSW52YWxpZGF0aW9uUG9pbnQuCisgICAgICAgIFRoaXMgcGxhY2VzIGEgc3RyaWN0ZXIg cmVxdWlyZW1lbnQgdGhhdCB0byBzYWZlbHkgT1NSIGVudGVyIGF0IGFueSBiYXNpYworICAgICAg ICBibG9jaywgYWxsIGluY29taW5nIHZhbHVlcyBtdXN0IGJlIGNvbXBhdGlibGUgYXMgaWYgdGhl eSBsaXZlZCBwYXN0CisgICAgICAgIHRoZSBleGVjdXRpb24gb2YgYW4gaW52YWxpZGF0aW9uIHBv aW50LgorCisgICAgICAgICogZGZnL0RGR0NGQVBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZH OjpDRkFQaGFzZTo6cnVuKToKKwogMjAxOC0wOC0xNyAgWXVzdWtlIFN1enVraSAgPHl1c3VrZXN1 enVraUBzbG93c3RhcnQub3JnPiBhbmQgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KIAogICAgICAgICBbSlNDXSBBZGQgR1BSUmVnOjpJbnZhbGlkR1BSUmVnIGFuZCBG UFJSZWc6OkludmFsaWRGUFJSZWcKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Q0ZBUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Q0ZBUGhhc2UuY3BwCShyZXZpc2lvbiAyMzQ5OTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0NGQVBoYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxLDggKzE0MSwxNSBAQCBw dWJsaWM6CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIAog ICAgICAgICAgICAgICAgIGJsb2NrLT5pbnRlcnNlY3Rpb25PZkNGQUhhc1Zpc2l0ZWQgJj0gYmxv Y2stPmNmYUhhc1Zpc2l0ZWQ7Ci0gICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gYmxv Y2stPmludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZC5zaXplKCk7IGktLTspCi0gICAgICAg ICAgICAgICAgICAgIGJsb2NrLT5pbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWRbaV0uZmls dGVyKGJsb2NrLT52YWx1ZXNBdEhlYWRbaV0pOworICAgICAgICAgICAgICAgIGZvciAodW5zaWdu ZWQgaSA9IGJsb2NrLT5pbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWQuc2l6ZSgpOyBpLS07 KSB7CisgICAgICAgICAgICAgICAgICAgIEFic3RyYWN0VmFsdWUgdmFsdWUgPSBibG9jay0+dmFs dWVzQXRIZWFkW2ldOworICAgICAgICAgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIGd1YXJhbnRl ZSB0aGF0IHdoZW4gd2UgZG8gYW4gT1NSIGVudHJ5LCB3ZSB2YWxpZGF0ZSB0aGUgaW5jb21pbmcK KyAgICAgICAgICAgICAgICAgICAgLy8gdmFsdWUgYXMgaWYgaXQgY291bGQgYmUgbGl2ZSBwYXN0 IGFuIGludmFsaWRhdGlvbiBwb2ludC4gT3RoZXJ3aXNlLCB3ZSBtYXkKKyAgICAgICAgICAgICAg ICAgICAgLy8gT1NSIGVudGVyIHdpdGggYSB2YWx1ZSB3aXRoIHRoZSB3cm9uZyBzdHJ1Y3R1cmUs IGFuZCBhbiBJbnZhbGlkYXRpb25Qb2ludCdzCisgICAgICAgICAgICAgICAgICAgIC8vIHByb21p c2Ugb2YgZmlsdGVyaW5nIHRoZSBzdHJ1Y3R1cmUgc2V0IG9mIGNlcnRhaW4gdmFsdWVzIGlzIG5v IGxvbmdlciB1cGhlbGQuCisgICAgICAgICAgICAgICAgICAgIHZhbHVlLm1fc3RydWN0dXJlLm9i c2VydmVJbnZhbGlkYXRpb25Qb2ludCgpOworICAgICAgICAgICAgICAgICAgICBibG9jay0+aW50 ZXJzZWN0aW9uT2ZQYXN0VmFsdWVzQXRIZWFkW2ldLmZpbHRlcih2YWx1ZSk7CisgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIAo= 347414 2018-08-17 16:49:48 -0700 2018-08-17 18:56:55 -0700 patch for landing a-backup.diff text/plain 5287 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzQ5OTYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE2IEBACisyMDE4LTA4LTE3ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIGludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZCBtdXN0IGZpbHRl ciB2YWx1ZXMgYWZ0ZXIgdGhleSd2ZSBvYnNlcnZlZCBhbiBpbnZhbGlkYXRpb24gcG9pbnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODcwNworICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNDMwMTU0NDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3MvY2ZhLWV4cGVjdGVkLXZhbHVlcy1tdXN0 LXNldC1jbG9iYmVyZWQtdG8tZmFsc2UuanM6IEFkZGVkLgorICAgICAgICAoZm9vKToKKyAgICAg ICAgKGxldC5jb21wLnZhbHVlT2YpOgorICAgICAgICAocmVzdWx0KToKKwogMjAxOC0wOC0xMCAg S2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBTbGljaW5n IGFuIEFycmF5QnVmZmVyIHdpdGggYSBsb25nIG51bWJlciByZXR1cm5zIGFuIEFycmF5QnVmZmVy IHdpdGggYnl0ZUxlbmd0aCB6ZXJvCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQt dmFsdWVzLW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxzZS5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKU1Rl c3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQtdmFsdWVzLW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxz ZS5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9jZmEtZXhwZWN0ZWQtdmFsdWVz LW11c3Qtc2V0LWNsb2JiZXJlZC10by1mYWxzZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsx LDM4IEBACisvL0AgcnVuRGVmYXVsdCgiLS11c2VGVExKSVQ9MCIsICItLXVzZUNvbmN1cnJlbnRK SVQ9ZmFsc2UiKQorCitsZXQgbnVtID0gMTUwOworCitmdW5jdGlvbiBmb28oY29tcCwgbywgYikg eworICAgIGxldCBzdW0gPSBvLmY7CisgICAgaWYgKGIpCisgICAgICAgIE9TUkV4aXQoKTsKKyAg ICBmb3IgKGxldCBpID0gMDsgaSA8IGNvbXA7ICsraSkgeworICAgICAgICBzdW0gKz0gby5mOwor ICAgIH0KKyAgICByZXR1cm4gc3VtOworfQorbm9JbmxpbmUoZm9vKTsKKworbGV0IG8gPSB7Zjoy NX07CitsZXQgbzIgPSB7ZjoyNSwgZzo0NH07CitvMi5mID0gNDU7CitvMi5mID0gNDU7CitvMi5m ID0gNDU7CitvMi5mID0gNDU7CitsZXQgY29tcCA9IHsKKyAgICB2YWx1ZU9mKCkgeyByZXR1cm4g bnVtOyB9Cit9CisKK2Zvbyhjb21wLCBvMiwgdHJ1ZSk7Citmb28oY29tcCwgbzIsIHRydWUpOwor Zm9yIChsZXQgaSA9IDA7IGkgPCA1MDA7ICsraSkgeworICAgIGZvbyhjb21wLCBvMiwgZmFsc2Up OworfQorCitsZXQgbzMgPSB7ZzoyNCwgZjo3M307CitudW0gPSAxMDAwMDAwMDsKK2xldCByZXN1 bHQgPSBmb28oY29tcCwgbzMsIGZhbHNlKTsKKworaWYgKHJlc3VsdCAhPT0gKG51bSArIDEpKjcz KSB7CisgICAgdGhyb3cgbmV3IEVycm9yKCJCYWQ6ICIgKyByZXN1bHQpOworfQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzQ5OTEpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTgtMDgt MTcgIFNhYW0gYmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CisKKyAgICAgICAgaW50ZXJzZWN0 aW9uT2ZQYXN0VmFsdWVzQXRIZWFkIG11c3QgZmlsdGVyIHZhbHVlcyBhZnRlciB0aGV5J3ZlIG9i c2VydmVkIGFuIGludmFsaWRhdGlvbiBwb2ludAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4NzA3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MzAx NTQ0Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBNYXJrIExhbS4KKworICAgICAgICBXZSB1c2Ug dGhlIHZhbHVlcyBpbiBpbnRlcnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWQgdG8gdmVyaWZ5IHRo YXQgaXQgaXMgc2FmZSB0bworICAgICAgICBPU1IgZW50ZXIgYXQgdGhlIGhlYWQgb2YgYSBibG9j ay4gV2UgdmVyaWZ5IGl0J3Mgc2FmZSB0byBPU1IgZW50ZXIgYnkgY2hlY2tpbmcKKyAgICAgICAg dGhhdCBlYWNoIGluY29taW5nIHZhbHVlIGlzIGNvbXBhdGlibGUgd2l0aCBpdHMgY29ycmVzcG9u ZGluZyBBYnN0cmFjdFZhbHVlLgorICAgICAgICAKKyAgICAgICAgVGhlIGJ1ZyBpcyB0aGF0IHdl IHdlcmUgc29tZXRpbWVzIGZpbHRlcmluZyB0aGUgaW50ZXJzZWN0aW9uT2ZQYXN0VmFsdWVzQXRI ZWFkCisgICAgICAgIHdpdGggYWJzdHJhY3QgdmFsdWVzIHRoYXQgd2VyZSBjbG9iYmVyZXJkLiBU aGlzIG1lYW50IHRoYXQgdGhlIHZhbHVlIHdlJ3JlCisgICAgICAgIHZlcmlmeWluZyB3aXRoIGF0 IE9TUiBlbnRyeSBlZmZlY3RpdmVseSBoYXMgYW4gaW5maW5pdGUgc3RydWN0dXJlIHNldCBiZWNh dXNlCisgICAgICAgIGl0J3MgY2xvYmJlcmVkLiBTbywgaW1hZ2luZSB3ZSBoYXZlIGNvZGUgbGlr ZSB0aGlzOgorICAgICAgICBgYGAKKyAgICAgICAgLS0tPiBXZSBPU1IgZW50ZXIgaGVyZSwgYW5k IHdlJ3JlIGNsb2JiZXJlZCBoZXJlCisgICAgICAgIEludmFsaWRhdGlvblBvaW50CisgICAgICAg IEdldEJ5T2Zmc2V0KEBiYXNlKQorICAgICAgICBgYGAKKyAgICAgICAgCisgICAgICAgIFRoZSBh YnN0cmFjdCB2YWx1ZSBmb3IgQGJhc2UgaW5zaWRlIGludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0 SGVhZCBoYXMgYQorICAgICAgICBjbG9iYmVycmVkIHN0cnVjdHVyZSBzZXQsIHNvIHdlJ2QgYWxs b3cgYW4gaW5jb21pbmcgb2JqZWN0IHdpdGggYW55CisgICAgICAgIHN0cnVjdHVyZS4gSG93ZXZl ciwgdGhpcyBpcyB3cm9uZyBiZWNhdXNlIHRoZSBpbnZhbGlkYXRpb24gcG9pbnQgaXMgbm8KKyAg ICAgICAgbG9uZ2VyIGZ1bGZpbGxpbmcgaXRzIHByb21pc2UgdGhhdCBpdCBmaWx0ZXJzIHRoZSBz dHJ1Y3R1cmUgdGhhdCBAYmFzZSBoYXMuCisgICAgICAgIAorICAgICAgICBXZSBmaXggdGhpcyBi eSBmaWx0ZXJpbmcgdGhlIEFic3RyYWN0VmFsdWVzIGluIGludGVyc2VjdGlvbk9mUGFzdFZhbHVl c0F0SGVhZAorICAgICAgICBhcyBpZiB0aGUgaW5jb21pbmcgdmFsdWUgbWF5IGJlIGxpdmUgcGFz dCBhbiBJbnZhbGlkYXRpb25Qb2ludC4KKyAgICAgICAgVGhpcyBwbGFjZXMgYSBzdHJpY3RlciBy ZXF1aXJlbWVudCB0aGF0IHRvIHNhZmVseSBPU1IgZW50ZXIgYXQgYW55IGJhc2ljCisgICAgICAg IGJsb2NrLCBhbGwgaW5jb21pbmcgdmFsdWVzIG11c3QgYmUgY29tcGF0aWJsZSBhcyBpZiB0aGV5 IGxpdmVkIHBhc3QKKyAgICAgICAgdGhlIGV4ZWN1dGlvbiBvZiBhbiBpbnZhbGlkYXRpb24gcG9p bnQuCisKKyAgICAgICAgKiBkZmcvREZHQ0ZBUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6 OkNGQVBoYXNlOjpydW4pOgorCiAyMDE4LTA4LTE3ICBZdXN1a2UgU3V6dWtpICA8eXVzdWtlc3V6 dWtpQHNsb3dzdGFydC5vcmc+IGFuZCBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNv bnkuY29tPgogCiAgICAgICAgIFtKU0NdIEFkZCBHUFJSZWc6OkludmFsaWRHUFJSZWcgYW5kIEZQ UlJlZzo6SW52YWxpZEZQUlJlZwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdD RkFQaGFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdD RkFQaGFzZS5jcHAJKHJldmlzaW9uIDIzNDk5MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHQ0ZBUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDEsOCArMTQxLDE1IEBAIHB1 YmxpYzoKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICAgCiAg ICAgICAgICAgICAgICAgYmxvY2stPmludGVyc2VjdGlvbk9mQ0ZBSGFzVmlzaXRlZCAmPSBibG9j ay0+Y2ZhSGFzVmlzaXRlZDsKLSAgICAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSBibG9j ay0+aW50ZXJzZWN0aW9uT2ZQYXN0VmFsdWVzQXRIZWFkLnNpemUoKTsgaS0tOykKLSAgICAgICAg ICAgICAgICAgICAgYmxvY2stPmludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZFtpXS5maWx0 ZXIoYmxvY2stPnZhbHVlc0F0SGVhZFtpXSk7CisgICAgICAgICAgICAgICAgZm9yICh1bnNpZ25l ZCBpID0gYmxvY2stPmludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZC5zaXplKCk7IGktLTsp IHsKKyAgICAgICAgICAgICAgICAgICAgQWJzdHJhY3RWYWx1ZSB2YWx1ZSA9IGJsb2NrLT52YWx1 ZXNBdEhlYWRbaV07CisgICAgICAgICAgICAgICAgICAgIC8vIFdlIG5lZWQgdG8gZ3VhcmFudGVl IHRoYXQgd2hlbiB3ZSBkbyBhbiBPU1IgZW50cnksIHdlIHZhbGlkYXRlIHRoZSBpbmNvbWluZwor ICAgICAgICAgICAgICAgICAgICAvLyB2YWx1ZSBhcyBpZiBpdCBjb3VsZCBiZSBsaXZlIHBhc3Qg YW4gaW52YWxpZGF0aW9uIHBvaW50LiBPdGhlcndpc2UsIHdlIG1heQorICAgICAgICAgICAgICAg ICAgICAvLyBPU1IgZW50ZXIgd2l0aCBhIHZhbHVlIHdpdGggdGhlIHdyb25nIHN0cnVjdHVyZSwg YW5kIGFuIEludmFsaWRhdGlvblBvaW50J3MKKyAgICAgICAgICAgICAgICAgICAgLy8gcHJvbWlz ZSBvZiBmaWx0ZXJpbmcgdGhlIHN0cnVjdHVyZSBzZXQgb2YgY2VydGFpbiB2YWx1ZXMgaXMgbm8g bG9uZ2VyIHVwaGVsZC4KKyAgICAgICAgICAgICAgICAgICAgdmFsdWUubV9zdHJ1Y3R1cmUub2Jz ZXJ2ZUludmFsaWRhdGlvblBvaW50KCk7CisgICAgICAgICAgICAgICAgICAgIGJsb2NrLT5pbnRl cnNlY3Rpb25PZlBhc3RWYWx1ZXNBdEhlYWRbaV0uZmlsdGVyKHZhbHVlKTsKKyAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgCg==