197677 2019-05-07 16:14:50 -0700 macro assembler code-pointer tagging has its arguments backwards 2019-05-13 14:35:19 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller saam benjamin commit-queue fpizlo ggaren gskachkov guijemont keith_miller mark.lam msaboff rmorisset saam ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1534154 0 keith_miller 2019-05-07 16:14:50 -0700 Normally, we have the macro assembler code put the destination as the right-most parameter. the code-pointer tagging has the destination on the left. 1534165 1 saam 2019-05-07 16:51:11 -0700 *** Bug 197422 has been marked as a duplicate of this bug. *** 1535730 2 369765 saam 2019-05-13 12:53:07 -0700 Created attachment 369765 patch 1535738 3 369765 msaboff 2019-05-13 13:00:22 -0700 Comment on attachment 369765 patch r=me, but it looks like you need to fix mips. 1535741 4 369769 saam 2019-05-13 13:07:07 -0700 Created attachment 369769 patch for landing 1535761 5 369769 tzagallo 2019-05-13 13:50:24 -0700 Comment on attachment 369769 patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=369769&action=review > Source/JavaScriptCore/assembler/AbstractMacroAssembler.h:980 > ALWAYS_INLINE void tagPtr(RegisterID, PtrTag) { } Shouldn't this be flipped as well? 1535770 6 369769 saam 2019-05-13 14:00:48 -0700 Comment on attachment 369769 patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=369769&action=review >> Source/JavaScriptCore/assembler/AbstractMacroAssembler.h:980 >> ALWAYS_INLINE void tagPtr(RegisterID, PtrTag) { } > > Shouldn't this be flipped as well? yup 1535771 7 369779 saam 2019-05-13 14:01:50 -0700 Created attachment 369779 patch for landing 1535788 8 369779 commit-queue 2019-05-13 14:34:49 -0700 Comment on attachment 369779 patch for landing Clearing flags on attachment: 369779 Committed r245251: <https://trac.webkit.org/changeset/245251> 1535789 9 commit-queue 2019-05-13 14:34:50 -0700 All reviewed patches have been landed. Closing bug. 1535790 10 webkit-bug-importer 2019-05-13 14:35:19 -0700 <rdar://problem/50739261> 369765 2019-05-13 12:53:07 -0700 2019-05-13 13:07:07 -0700 patch a-backup.diff text/plain 10050 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQ1MjQ1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDE5LTA1LTEzICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IG1hY3JvIGFzc2VtYmxlciBjb2RlLXBvaW50ZXIgdGFnZ2luZyBoYXMgaXRzIGFyZ3VtZW50cyBi YWNrd2FyZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NzY3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdlIGhhZCB0aGUgZGVzdGluYXRpb24gYXMgdGhlIGxlZnRtb3N0IGluc3RlYWQgb2YgdGhlIHJp Z2h0bW9zdCBhcmd1bWVudCwKKyAgICAgICAgd2hpY2ggZ29lcyBhZ2FpbnN0IHRoZSBjb252ZW50 aW9uIG9mIGhvdyB3ZSBvcmRlciBhcmd1bWVudHMgaW4gbWFjcm8gYXNzZW1ibGVyCisgICAgICAg IG1ldGhvZHMuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NEUuaDoK KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NEU6OnRhZ1JldHVybkFkZHJlc3MpOgor ICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTY0RTo6dW50YWdSZXR1cm5BZGRyZXNzKToK KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NEU6OnRhZ1B0cik6CisgICAgICAgIChK U0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjRFOjp1bnRhZ1B0cik6CisgICAgICAgICogZGZnL0RGR09T UkV4aXRDb21waWxlckNvbW1vbi5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6cmVpZnlJbmxpbmVk Q2FsbEZyYW1lcyk6CisgICAgICAgICogZnRsL0ZUTFRodW5rcy5jcHA6CisgICAgICAgIChKU0M6 OkZUTDo6Z2VuZXJpY0dlbmVyYXRpb25UaHVua0dlbmVyYXRvcik6CisgICAgICAgICogaml0L0ND YWxsSGVscGVycy5oOgorICAgICAgICAoSlNDOjpDQ2FsbEhlbHBlcnM6OnByZXBhcmVGb3JUYWls Q2FsbFNsb3cpOgorICAgICAgICAqIGppdC9DYWxsRnJhbWVTaHVmZmxlci5jcHA6CisgICAgICAg IChKU0M6OkNhbGxGcmFtZVNodWZmbGVyOjpwcmVwYXJlRm9yVGFpbENhbGwpOgorICAgICAgICAq IGppdC9UaHVua0dlbmVyYXRvcnMuY3BwOgorICAgICAgICAoSlNDOjplbWl0UG9pbnRlclZhbGlk YXRpb24pOgorICAgICAgICAoSlNDOjphcml0eUZpeHVwR2VuZXJhdG9yKToKKyAgICAgICAgKiB3 YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwOgorICAgICAgICAoSlNDOjpXZWJBc3NlbWJs eUZ1bmN0aW9uOjpqc0NhbGxFbnRyeXBvaW50U2xvdyk6CisKIDIwMTktMDUtMTMgIFl1c3VrZSBT dXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBDb21wcmVzcyBtaXNj ZWxhbmVvdXMgSklUIHJlbGF0ZWQgZGF0YSBzdHJ1Y3R1cmVzIHdpdGggUGFja2VkPD4KSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NEUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyQVJNNjRFLmgJKHJldmlzaW9uIDI0NTI0MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NEUuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsMjIg KzQxLDIyIEBAIGNsYXNzIE1hY3JvQXNzZW1ibGVyQVJNNjRFIDogcHVibGljIE1hY3IKIHB1Ymxp YzoKICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdGFnUmV0dXJuQWRkcmVzcygpCiAgICAgewotICAg ICAgICB0YWdQdHIoQVJNNjRSZWdpc3RlcnM6OmxyLCBBUk02NFJlZ2lzdGVyczo6c3ApOworICAg ICAgICB0YWdQdHIoQVJNNjRSZWdpc3RlcnM6OnNwLCBBUk02NFJlZ2lzdGVyczo6bHIpOwogICAg IH0KIAogICAgIEFMV0FZU19JTkxJTkUgdm9pZCB1bnRhZ1JldHVybkFkZHJlc3MoKQogICAgIHsK LSAgICAgICAgdW50YWdQdHIoQVJNNjRSZWdpc3RlcnM6OmxyLCBBUk02NFJlZ2lzdGVyczo6c3Ap OworICAgICAgICB1bnRhZ1B0cihBUk02NFJlZ2lzdGVyczo6c3AsIEFSTTY0UmVnaXN0ZXJzOjps cik7CiAgICAgfQogCi0gICAgQUxXQVlTX0lOTElORSB2b2lkIHRhZ1B0cihSZWdpc3RlcklEIHRh cmdldCwgUHRyVGFnIHRhZykKKyAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdGFnUHRyKFB0clRhZyB0 YWcsIFJlZ2lzdGVySUQgdGFyZ2V0KQogICAgIHsKICAgICAgICAgYXV0byB0YWdHUFIgPSBnZXRD YWNoZWREYXRhVGVtcFJlZ2lzdGVySURBbmRJbnZhbGlkYXRlKCk7CiAgICAgICAgIG1vdmUoVHJ1 c3RlZEltbTY0KHRhZyksIHRhZ0dQUik7CiAgICAgICAgIG1fYXNzZW1ibGVyLnBhY2liKHRhcmdl dCwgdGFnR1BSKTsKICAgICB9CiAKLSAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdGFnUHRyKFJlZ2lz dGVySUQgdGFyZ2V0LCBSZWdpc3RlcklEIHRhZykKKyAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdGFn UHRyKFJlZ2lzdGVySUQgdGFnLCBSZWdpc3RlcklEIHRhcmdldCkKICAgICB7CiAgICAgICAgIGlm ICh0YXJnZXQgPT0gQVJNNjRSZWdpc3RlcnM6OmxyICYmIHRhZyA9PSBBUk02NFJlZ2lzdGVyczo6 c3ApIHsKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLnBhY2lic3AoKTsKQEAgLTY1LDE0ICs2NSwx NCBAQCBwdWJsaWM6CiAgICAgICAgIG1fYXNzZW1ibGVyLnBhY2liKHRhcmdldCwgdGFnKTsKICAg ICB9CiAKLSAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdW50YWdQdHIoUmVnaXN0ZXJJRCB0YXJnZXQs IFB0clRhZyB0YWcpCisgICAgQUxXQVlTX0lOTElORSB2b2lkIHVudGFnUHRyKFB0clRhZyB0YWcs IFJlZ2lzdGVySUQgdGFyZ2V0KQogICAgIHsKICAgICAgICAgYXV0byB0YWdHUFIgPSBnZXRDYWNo ZWREYXRhVGVtcFJlZ2lzdGVySURBbmRJbnZhbGlkYXRlKCk7CiAgICAgICAgIG1vdmUoVHJ1c3Rl ZEltbTY0KHRhZyksIHRhZ0dQUik7CiAgICAgICAgIG1fYXNzZW1ibGVyLmF1dGliKHRhcmdldCwg dGFnR1BSKTsKICAgICB9CiAKLSAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdW50YWdQdHIoUmVnaXN0 ZXJJRCB0YXJnZXQsIFJlZ2lzdGVySUQgdGFnKQorICAgIEFMV0FZU19JTkxJTkUgdm9pZCB1bnRh Z1B0cihSZWdpc3RlcklEIHRhZywgUmVnaXN0ZXJJRCB0YXJnZXQpCiAgICAgewogICAgICAgICBt X2Fzc2VtYmxlci5hdXRpYih0YXJnZXQsIHRhZyk7CiAgICAgfQpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0Q29tcGlsZXJDb21tb24uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdENvbXBpbGVyQ29tbW9uLmNwcAko cmV2aXNpb24gMjQ1MjQzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0 Q29tcGlsZXJDb21tb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTcsOSArMTU3LDkgQEAgdm9p ZCByZWlmeUlubGluZWRDYWxsRnJhbWVzKENDYWxsSGVscGVycwogICAgICAgICAgICAgaml0Lmxv YWRQdHIoQXNzZW1ibHlIZWxwZXJzOjpBZGRyZXNzKEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVy LCBDYWxsRnJhbWU6OnJldHVyblBDT2Zmc2V0KCkpLCBHUFJJbmZvOjpyZWdUMyk7CiAjaWYgQ1BV KEFSTTY0RSkKICAgICAgICAgICAgIGppdC5hZGRQdHIoQXNzZW1ibHlIZWxwZXJzOjpUcnVzdGVk SW1tMzIoc2l6ZW9mKENhbGxlckZyYW1lQW5kUEMpKSwgR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0 ZXIsIEdQUkluZm86OnJlZ1QyKTsKLSAgICAgICAgICAgIGppdC51bnRhZ1B0cihHUFJJbmZvOjpy ZWdUMywgR1BSSW5mbzo6cmVnVDIpOworICAgICAgICAgICAgaml0LnVudGFnUHRyKEdQUkluZm86 OnJlZ1QyLCBHUFJJbmZvOjpyZWdUMyk7CiAgICAgICAgICAgICBqaXQuYWRkUHRyKEFzc2VtYmx5 SGVscGVyczo6VHJ1c3RlZEltbTMyKGlubGluZUNhbGxGcmFtZS0+cmV0dXJuUENPZmZzZXQoKSAr IHNpemVvZih2b2lkKikpLCBHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgR1BSSW5mbzo6cmVn VDIpOwotICAgICAgICAgICAgaml0LnRhZ1B0cihHUFJJbmZvOjpyZWdUMywgR1BSSW5mbzo6cmVn VDIpOworICAgICAgICAgICAgaml0LnRhZ1B0cihHUFJJbmZvOjpyZWdUMiwgR1BSSW5mbzo6cmVn VDMpOwogI2VuZGlmCiAgICAgICAgICAgICBqaXQuc3RvcmVQdHIoR1BSSW5mbzo6cmVnVDMsIEFz c2VtYmx5SGVscGVyczo6YWRkcmVzc0ZvckJ5dGVPZmZzZXQoaW5saW5lQ2FsbEZyYW1lLT5yZXR1 cm5QQ09mZnNldCgpKSk7CiAgICAgICAgICAgICBqaXQubG9hZFB0cihBc3NlbWJseUhlbHBlcnM6 OkFkZHJlc3MoR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIENhbGxGcmFtZTo6Y2FsbGVyRnJh bWVPZmZzZXQoKSksIEdQUkluZm86OnJlZ1QzKTsKQEAgLTIwOSw3ICsyMDksNyBAQCB2b2lkIHJl aWZ5SW5saW5lZENhbGxGcmFtZXMoQ0NhbGxIZWxwZXJzCiAjaWYgQ1BVKEFSTTY0RSkKICAgICAg ICAgICAgIGppdC5hZGRQdHIoQXNzZW1ibHlIZWxwZXJzOjpUcnVzdGVkSW1tMzIoaW5saW5lQ2Fs bEZyYW1lLT5yZXR1cm5QQ09mZnNldCgpICsgc2l6ZW9mKHZvaWQqKSksIEdQUkluZm86OmNhbGxG cmFtZVJlZ2lzdGVyLCBHUFJJbmZvOjpyZWdUMik7CiAgICAgICAgICAgICBqaXQubW92ZShBc3Nl bWJseUhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoanVtcFRhcmdldCksIEdQUkluZm86Om5vbkFyZ0dQ UjApOwotICAgICAgICAgICAgaml0LnRhZ1B0cihHUFJJbmZvOjpub25BcmdHUFIwLCBHUFJJbmZv OjpyZWdUMik7CisgICAgICAgICAgICBqaXQudGFnUHRyKEdQUkluZm86OnJlZ1QyLCBHUFJJbmZv Ojpub25BcmdHUFIwKTsKICAgICAgICAgICAgIGppdC5zdG9yZVB0cihHUFJJbmZvOjpub25BcmdH UFIwLCBBc3NlbWJseUhlbHBlcnM6OmFkZHJlc3NGb3JCeXRlT2Zmc2V0KGlubGluZUNhbGxGcmFt ZS0+cmV0dXJuUENPZmZzZXQoKSkpOwogI2Vsc2UKICAgICAgICAgICAgIGppdC5zdG9yZVB0cihB c3NlbWJseUhlbHBlcnM6OlRydXN0ZWRJbW1QdHIoanVtcFRhcmdldCksIEFzc2VtYmx5SGVscGVy czo6YWRkcmVzc0ZvckJ5dGVPZmZzZXQoaW5saW5lQ2FsbEZyYW1lLT5yZXR1cm5QQ09mZnNldCgp KSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFRodW5rcy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExUaHVua3MuY3BwCShyZXZpc2lv biAyNDUyNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFRodW5rcy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTExNiw3ICsxMTYsNyBAQCBzdGF0aWMgTWFjcm9Bc3NlbWJsZXJDb2Rl UmVmPEpJVFRodW5rUHRyCiAgICAgcmVzdG9yZUFsbFJlZ2lzdGVycyhqaXQsIGJ1ZmZlcik7CiAK ICNpZiBDUFUoQVJNNjRFKQotICAgIGppdC51bnRhZ1B0cihBc3NlbWJseUhlbHBlcnM6OmxpbmtS ZWdpc3RlciwgcmVzdWx0VGFnKTsKKyAgICBqaXQudW50YWdQdHIocmVzdWx0VGFnLCBBc3NlbWJs eUhlbHBlcnM6OmxpbmtSZWdpc3Rlcik7CiAgICAgaml0LnRhZ1JldHVybkFkZHJlc3MoKTsKICNl bHNlCiAgICAgVU5VU0VEX1BBUkFNKHJlc3VsdFRhZyk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0NDYWxsSGVscGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvQ0NhbGxIZWxwZXJzLmgJKHJldmlzaW9uIDI0NTI0MykKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvQ0NhbGxIZWxwZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTgwNyw3ICs4 MDcsNyBAQCBwdWJsaWM6CiAgICAgICAgIHN1YlB0cihUcnVzdGVkSW1tMzIoMiAqIHNpemVvZih2 b2lkKikpLCBuZXdGcmFtZVNpemVHUFIpOwogI2lmIENQVShBUk02NEUpCiAgICAgICAgIGFkZFB0 cihUcnVzdGVkSW1tMzIoc2l6ZW9mKENhbGxlckZyYW1lQW5kUEMpKSwgTWFjcm9Bc3NlbWJsZXI6 OmZyYW1lUG9pbnRlclJlZ2lzdGVyLCB0ZW1wR1BSKTsKLSAgICAgICAgdW50YWdQdHIobGlua1Jl Z2lzdGVyLCB0ZW1wR1BSKTsKKyAgICAgICAgdW50YWdQdHIodGVtcEdQUiwgbGlua1JlZ2lzdGVy KTsKICNlbmRpZgogI2VsaWYgQ1BVKE1JUFMpCiAgICAgICAgIGxvYWRQdHIoQWRkcmVzcyhmcmFt ZVBvaW50ZXJSZWdpc3Rlciwgc2l6ZW9mKHZvaWQqKSksIHJldHVybkFkZHJlc3NSZWdpc3Rlcik7 CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0NhbGxGcmFtZVNodWZmbGVyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0NhbGxGcmFtZVNodWZmbGVy LmNwcAkocmV2aXNpb24gMjQ1MjQzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DYWxs RnJhbWVTaHVmZmxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1Niw3ICs0NTYsNyBAQCB2b2lk IENhbGxGcmFtZVNodWZmbGVyOjpwcmVwYXJlRm9yVGFpbENhCiAgICAgICAgIE1hY3JvQXNzZW1i bGVyOjpsaW5rUmVnaXN0ZXIpOwogI2lmIENQVShBUk02NEUpCiAgICAgbV9qaXQuYWRkUHRyKE1h Y3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tMzIoc2l6ZW9mKENhbGxlckZyYW1lQW5kUEMpKSwgTWFj cm9Bc3NlbWJsZXI6OmZyYW1lUG9pbnRlclJlZ2lzdGVyKTsKLSAgICBtX2ppdC51bnRhZ1B0cihN YWNyb0Fzc2VtYmxlcjo6bGlua1JlZ2lzdGVyLCBNYWNyb0Fzc2VtYmxlcjo6ZnJhbWVQb2ludGVy UmVnaXN0ZXIpOworICAgIG1faml0LnVudGFnUHRyKE1hY3JvQXNzZW1ibGVyOjpmcmFtZVBvaW50 ZXJSZWdpc3RlciwgTWFjcm9Bc3NlbWJsZXI6OmxpbmtSZWdpc3Rlcik7CiAgICAgbV9qaXQuc3Vi UHRyKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tMzIoc2l6ZW9mKENhbGxlckZyYW1lQW5kUEMp KSwgTWFjcm9Bc3NlbWJsZXI6OmZyYW1lUG9pbnRlclJlZ2lzdGVyKTsKICNlbmRpZgogCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1RodW5rR2VuZXJhdG9ycy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVyYXRvcnMuY3BwCShyZXZp c2lvbiAyNDUyNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1RodW5rR2VuZXJhdG9y cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUzLDcgKzUzLDcgQEAgaW5saW5lIHZvaWQgZW1pdFBv aW50ZXJWYWxpZGF0aW9uKENDYWxsSAogICAgIGppdC5hYm9ydFdpdGhSZWFzb24oVEdJbnZhbGlk UG9pbnRlcik7CiAgICAgaXNOb25aZXJvLmxpbmsoJmppdCk7CiAgICAgaml0LnB1c2hUb1NhdmUo cG9pbnRlckdQUik7Ci0gICAgaml0LnVudGFnUHRyKHBvaW50ZXJHUFIsIHRhZyk7CisgICAgaml0 LnVudGFnUHRyKHRhZywgcG9pbnRlckdQUik7CiAgICAgaml0LmxvYWQ4KHBvaW50ZXJHUFIsIHBv aW50ZXJHUFIpOwogICAgIGppdC5wb3BUb1Jlc3RvcmUocG9pbnRlckdQUik7CiB9CkBAIC00NTks MTAgKzQ1OSwxMCBAQCBNYWNyb0Fzc2VtYmxlckNvZGVSZWY8SklUVGh1bmtQdHJUYWc+IGFyCiAj aWYgQ1BVKEFSTTY0RSkKICAgICBqaXQubG9hZFB0cihKU0ludGVyZmFjZUpJVDo6QWRkcmVzcyhH UFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgQ2FsbEZyYW1lOjpyZXR1cm5QQ09mZnNldCgpKSwg R1BSSW5mbzo6cmVnVDMpOwogICAgIGppdC5hZGRQdHIoSlNJbnRlcmZhY2VKSVQ6OlRydXN0ZWRJ bW0zMihzaXplb2YoQ2FsbGVyRnJhbWVBbmRQQykpLCBHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3Rl ciwgZXh0cmFUZW1wKTsKLSAgICBqaXQudW50YWdQdHIoR1BSSW5mbzo6cmVnVDMsIGV4dHJhVGVt cCk7CisgICAgaml0LnVudGFnUHRyKGV4dHJhVGVtcCwgR1BSSW5mbzo6cmVnVDMpOwogICAgIFB0 clRhZyB0ZW1wUmV0dXJuUENUYWcgPSBzdGF0aWNfY2FzdDxQdHJUYWc+KHJhbmRvbSgpKTsKICAg ICBqaXQubW92ZShKU0ludGVyZmFjZUpJVDo6VHJ1c3RlZEltbVB0cih0ZW1wUmV0dXJuUENUYWcp LCBleHRyYVRlbXApOwotICAgIGppdC50YWdQdHIoR1BSSW5mbzo6cmVnVDMsIGV4dHJhVGVtcCk7 CisgICAgaml0LnRhZ1B0cihleHRyYVRlbXAsIEdQUkluZm86OnJlZ1QzKTsKICAgICBqaXQuc3Rv cmVQdHIoR1BSSW5mbzo6cmVnVDMsIEpTSW50ZXJmYWNlSklUOjpBZGRyZXNzKEdQUkluZm86OmNh bGxGcmFtZVJlZ2lzdGVyLCBDYWxsRnJhbWU6OnJldHVyblBDT2Zmc2V0KCkpKTsKICNlbmRpZgog ICAgIGppdC5tb3ZlKEpTSW50ZXJmYWNlSklUOjpjYWxsRnJhbWVSZWdpc3RlciwgSlNJbnRlcmZh Y2VKSVQ6OnJlZ1QzKTsKQEAgLTUxNSw5ICs1MTUsOSBAQCBNYWNyb0Fzc2VtYmxlckNvZGVSZWY8 SklUVGh1bmtQdHJUYWc+IGFyCiAjaWYgQ1BVKEFSTTY0RSkKICAgICBqaXQubG9hZFB0cihKU0lu dGVyZmFjZUpJVDo6QWRkcmVzcyhHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgQ2FsbEZyYW1l OjpyZXR1cm5QQ09mZnNldCgpKSwgR1BSSW5mbzo6cmVnVDMpOwogICAgIGppdC5tb3ZlKEpTSW50 ZXJmYWNlSklUOjpUcnVzdGVkSW1tUHRyKHRlbXBSZXR1cm5QQ1RhZyksIGV4dHJhVGVtcCk7Ci0g ICAgaml0LnVudGFnUHRyKEdQUkluZm86OnJlZ1QzLCBleHRyYVRlbXApOworICAgIGppdC51bnRh Z1B0cihleHRyYVRlbXAsIEdQUkluZm86OnJlZ1QzKTsKICAgICBqaXQuYWRkUHRyKEpTSW50ZXJm YWNlSklUOjpUcnVzdGVkSW1tMzIoc2l6ZW9mKENhbGxlckZyYW1lQW5kUEMpKSwgR1BSSW5mbzo6 Y2FsbEZyYW1lUmVnaXN0ZXIsIGV4dHJhVGVtcCk7Ci0gICAgaml0LnRhZ1B0cihHUFJJbmZvOjpy ZWdUMywgZXh0cmFUZW1wKTsKKyAgICBqaXQudGFnUHRyKGV4dHJhVGVtcCwgR1BSSW5mbzo6cmVn VDMpOwogICAgIGppdC5zdG9yZVB0cihHUFJJbmZvOjpyZWdUMywgSlNJbnRlcmZhY2VKSVQ6OkFk ZHJlc3MoR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIENhbGxGcmFtZTo6cmV0dXJuUENPZmZz ZXQoKSkpOwogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dl YkFzc2VtYmx5RnVuY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS93YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwCShyZXZpc2lvbiAyNDUyNDMpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUZ1bmN0aW9uLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDgwLDcgKzQ4MCw3IEBAIE1hY3JvQXNzZW1ibGVyQ29kZVB0cjxKU0Vu dHJ5UHRyVGFnPiBXZWIKICAgICBqaXQubW92ZShDQ2FsbEhlbHBlcnM6OlRydXN0ZWRJbW1QdHIo dGhpcyksIEdQUkluZm86OnJlZ1QwKTsKICAgICBqaXQuZW1pdEZ1bmN0aW9uRXBpbG9ndWUoKTsK ICNpZiBDUFUoQVJNNjRFKQotICAgIGppdC51bnRhZ1B0cihNYWNyb0Fzc2VtYmxlcjo6bGlua1Jl Z2lzdGVyLCBNYWNyb0Fzc2VtYmxlcjo6c3RhY2tQb2ludGVyUmVnaXN0ZXIpOworICAgIGppdC51 bnRhZ1JldHVybkFkZHJlc3MoKTsKICNlbmRpZgogICAgIGF1dG8ganVtcFRvSG9zdENhbGxUaHVu ayA9IGppdC5qdW1wKCk7CiAK 369769 2019-05-13 13:07:07 -0700 2019-05-13 14:01:50 -0700 patch for landing a-backup.diff text/plain 10711 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQ1MjQ1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDE5LTA1LTEzICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IG1hY3JvIGFzc2VtYmxlciBjb2RlLXBvaW50ZXIgdGFnZ2luZyBoYXMgaXRzIGFyZ3VtZW50cyBi YWNrd2FyZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NzY3NworCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgU2Fib2ZmLgorCisgICAgICAg IFdlIGhhZCB0aGUgZGVzdGluYXRpb24gYXMgdGhlIGxlZnRtb3N0IGluc3RlYWQgb2YgdGhlIHJp Z2h0bW9zdCBhcmd1bWVudCwKKyAgICAgICAgd2hpY2ggZ29lcyBhZ2FpbnN0IHRoZSBjb252ZW50 aW9uIG9mIGhvdyB3ZSBvcmRlciBhcmd1bWVudHMgaW4gbWFjcm8gYXNzZW1ibGVyCisgICAgICAg IG1ldGhvZHMuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NEUuaDoK KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NEU6OnRhZ1JldHVybkFkZHJlc3MpOgor ICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTY0RTo6dW50YWdSZXR1cm5BZGRyZXNzKToK KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NEU6OnRhZ1B0cik6CisgICAgICAgIChK U0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjRFOjp1bnRhZ1B0cik6CisgICAgICAgICogZGZnL0RGR09T UkV4aXRDb21waWxlckNvbW1vbi5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6cmVpZnlJbmxpbmVk Q2FsbEZyYW1lcyk6CisgICAgICAgICogZnRsL0ZUTFRodW5rcy5jcHA6CisgICAgICAgIChKU0M6 OkZUTDo6Z2VuZXJpY0dlbmVyYXRpb25UaHVua0dlbmVyYXRvcik6CisgICAgICAgICogaml0L0ND YWxsSGVscGVycy5oOgorICAgICAgICAoSlNDOjpDQ2FsbEhlbHBlcnM6OnByZXBhcmVGb3JUYWls Q2FsbFNsb3cpOgorICAgICAgICAqIGppdC9DYWxsRnJhbWVTaHVmZmxlci5jcHA6CisgICAgICAg IChKU0M6OkNhbGxGcmFtZVNodWZmbGVyOjpwcmVwYXJlRm9yVGFpbENhbGwpOgorICAgICAgICAq IGppdC9UaHVua0dlbmVyYXRvcnMuY3BwOgorICAgICAgICAoSlNDOjplbWl0UG9pbnRlclZhbGlk YXRpb24pOgorICAgICAgICAoSlNDOjphcml0eUZpeHVwR2VuZXJhdG9yKToKKyAgICAgICAgKiB3 YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwOgorICAgICAgICAoSlNDOjpXZWJBc3NlbWJs eUZ1bmN0aW9uOjpqc0NhbGxFbnRyeXBvaW50U2xvdyk6CisKIDIwMTktMDUtMTMgIFl1c3VrZSBT dXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBDb21wcmVzcyBtaXNj ZWxhbmVvdXMgSklUIHJlbGF0ZWQgZGF0YSBzdHJ1Y3R1cmVzIHdpdGggUGFja2VkPD4KSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQWJzdHJhY3RNYWNyb0Fzc2VtYmxlci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQWJzdHJhY3RN YWNyb0Fzc2VtYmxlci5oCShyZXZpc2lvbiAyNDUyNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYXNzZW1ibGVyL0Fic3RyYWN0TWFjcm9Bc3NlbWJsZXIuaAkod29ya2luZyBjb3B5KQpAQCAt OTc5LDcgKzk3OSw3IEBAIHB1YmxpYzoKIAogICAgIEFMV0FZU19JTkxJTkUgdm9pZCB0YWdQdHIo UmVnaXN0ZXJJRCwgUHRyVGFnKSB7IH0KICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdGFnUHRyKFJl Z2lzdGVySUQsIFJlZ2lzdGVySUQpIHsgfQotICAgIEFMV0FZU19JTkxJTkUgdm9pZCB1bnRhZ1B0 cihSZWdpc3RlcklELCBQdHJUYWcpIHsgfQorICAgIEFMV0FZU19JTkxJTkUgdm9pZCB1bnRhZ1B0 cihQdHJUYWcsIFJlZ2lzdGVySUQpIHsgfQogICAgIEFMV0FZU19JTkxJTkUgdm9pZCB1bnRhZ1B0 cihSZWdpc3RlcklELCBSZWdpc3RlcklEKSB7IH0KICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgcmVt b3ZlUHRyVGFnKFJlZ2lzdGVySUQpIHsgfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjRFLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0RS5oCShyZXZpc2lvbiAy NDUyNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVy QVJNNjRFLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDIyICs0MSwyMiBAQCBjbGFzcyBNYWNyb0Fz c2VtYmxlckFSTTY0RSA6IHB1YmxpYyBNYWNyCiBwdWJsaWM6CiAgICAgQUxXQVlTX0lOTElORSB2 b2lkIHRhZ1JldHVybkFkZHJlc3MoKQogICAgIHsKLSAgICAgICAgdGFnUHRyKEFSTTY0UmVnaXN0 ZXJzOjpsciwgQVJNNjRSZWdpc3RlcnM6OnNwKTsKKyAgICAgICAgdGFnUHRyKEFSTTY0UmVnaXN0 ZXJzOjpzcCwgQVJNNjRSZWdpc3RlcnM6OmxyKTsKICAgICB9CiAKICAgICBBTFdBWVNfSU5MSU5F IHZvaWQgdW50YWdSZXR1cm5BZGRyZXNzKCkKICAgICB7Ci0gICAgICAgIHVudGFnUHRyKEFSTTY0 UmVnaXN0ZXJzOjpsciwgQVJNNjRSZWdpc3RlcnM6OnNwKTsKKyAgICAgICAgdW50YWdQdHIoQVJN NjRSZWdpc3RlcnM6OnNwLCBBUk02NFJlZ2lzdGVyczo6bHIpOwogICAgIH0KIAotICAgIEFMV0FZ U19JTkxJTkUgdm9pZCB0YWdQdHIoUmVnaXN0ZXJJRCB0YXJnZXQsIFB0clRhZyB0YWcpCisgICAg QUxXQVlTX0lOTElORSB2b2lkIHRhZ1B0cihQdHJUYWcgdGFnLCBSZWdpc3RlcklEIHRhcmdldCkK ICAgICB7CiAgICAgICAgIGF1dG8gdGFnR1BSID0gZ2V0Q2FjaGVkRGF0YVRlbXBSZWdpc3RlcklE QW5kSW52YWxpZGF0ZSgpOwogICAgICAgICBtb3ZlKFRydXN0ZWRJbW02NCh0YWcpLCB0YWdHUFIp OwogICAgICAgICBtX2Fzc2VtYmxlci5wYWNpYih0YXJnZXQsIHRhZ0dQUik7CiAgICAgfQogCi0g ICAgQUxXQVlTX0lOTElORSB2b2lkIHRhZ1B0cihSZWdpc3RlcklEIHRhcmdldCwgUmVnaXN0ZXJJ RCB0YWcpCisgICAgQUxXQVlTX0lOTElORSB2b2lkIHRhZ1B0cihSZWdpc3RlcklEIHRhZywgUmVn aXN0ZXJJRCB0YXJnZXQpCiAgICAgewogICAgICAgICBpZiAodGFyZ2V0ID09IEFSTTY0UmVnaXN0 ZXJzOjpsciAmJiB0YWcgPT0gQVJNNjRSZWdpc3RlcnM6OnNwKSB7CiAgICAgICAgICAgICBtX2Fz c2VtYmxlci5wYWNpYnNwKCk7CkBAIC02NSwxNCArNjUsMTQgQEAgcHVibGljOgogICAgICAgICBt X2Fzc2VtYmxlci5wYWNpYih0YXJnZXQsIHRhZyk7CiAgICAgfQogCi0gICAgQUxXQVlTX0lOTElO RSB2b2lkIHVudGFnUHRyKFJlZ2lzdGVySUQgdGFyZ2V0LCBQdHJUYWcgdGFnKQorICAgIEFMV0FZ U19JTkxJTkUgdm9pZCB1bnRhZ1B0cihQdHJUYWcgdGFnLCBSZWdpc3RlcklEIHRhcmdldCkKICAg ICB7CiAgICAgICAgIGF1dG8gdGFnR1BSID0gZ2V0Q2FjaGVkRGF0YVRlbXBSZWdpc3RlcklEQW5k SW52YWxpZGF0ZSgpOwogICAgICAgICBtb3ZlKFRydXN0ZWRJbW02NCh0YWcpLCB0YWdHUFIpOwog ICAgICAgICBtX2Fzc2VtYmxlci5hdXRpYih0YXJnZXQsIHRhZ0dQUik7CiAgICAgfQogCi0gICAg QUxXQVlTX0lOTElORSB2b2lkIHVudGFnUHRyKFJlZ2lzdGVySUQgdGFyZ2V0LCBSZWdpc3RlcklE IHRhZykKKyAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdW50YWdQdHIoUmVnaXN0ZXJJRCB0YWcsIFJl Z2lzdGVySUQgdGFyZ2V0KQogICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIuYXV0aWIodGFyZ2V0 LCB0YWcpOwogICAgIH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhp dENvbXBpbGVyQ29tbW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR09TUkV4aXRDb21waWxlckNvbW1vbi5jcHAJKHJldmlzaW9uIDI0NTI0MykKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdENvbXBpbGVyQ29tbW9uLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTU3LDkgKzE1Nyw5IEBAIHZvaWQgcmVpZnlJbmxpbmVkQ2FsbEZyYW1l cyhDQ2FsbEhlbHBlcnMKICAgICAgICAgICAgIGppdC5sb2FkUHRyKEFzc2VtYmx5SGVscGVyczo6 QWRkcmVzcyhHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgQ2FsbEZyYW1lOjpyZXR1cm5QQ09m ZnNldCgpKSwgR1BSSW5mbzo6cmVnVDMpOwogI2lmIENQVShBUk02NEUpCiAgICAgICAgICAgICBq aXQuYWRkUHRyKEFzc2VtYmx5SGVscGVyczo6VHJ1c3RlZEltbTMyKHNpemVvZihDYWxsZXJGcmFt ZUFuZFBDKSksIEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBHUFJJbmZvOjpyZWdUMik7Ci0g ICAgICAgICAgICBqaXQudW50YWdQdHIoR1BSSW5mbzo6cmVnVDMsIEdQUkluZm86OnJlZ1QyKTsK KyAgICAgICAgICAgIGppdC51bnRhZ1B0cihHUFJJbmZvOjpyZWdUMiwgR1BSSW5mbzo6cmVnVDMp OwogICAgICAgICAgICAgaml0LmFkZFB0cihBc3NlbWJseUhlbHBlcnM6OlRydXN0ZWRJbW0zMihp bmxpbmVDYWxsRnJhbWUtPnJldHVyblBDT2Zmc2V0KCkgKyBzaXplb2Yodm9pZCopKSwgR1BSSW5m bzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIEdQUkluZm86OnJlZ1QyKTsKLSAgICAgICAgICAgIGppdC50 YWdQdHIoR1BSSW5mbzo6cmVnVDMsIEdQUkluZm86OnJlZ1QyKTsKKyAgICAgICAgICAgIGppdC50 YWdQdHIoR1BSSW5mbzo6cmVnVDIsIEdQUkluZm86OnJlZ1QzKTsKICNlbmRpZgogICAgICAgICAg ICAgaml0LnN0b3JlUHRyKEdQUkluZm86OnJlZ1QzLCBBc3NlbWJseUhlbHBlcnM6OmFkZHJlc3NG b3JCeXRlT2Zmc2V0KGlubGluZUNhbGxGcmFtZS0+cmV0dXJuUENPZmZzZXQoKSkpOwogICAgICAg ICAgICAgaml0LmxvYWRQdHIoQXNzZW1ibHlIZWxwZXJzOjpBZGRyZXNzKEdQUkluZm86OmNhbGxG cmFtZVJlZ2lzdGVyLCBDYWxsRnJhbWU6OmNhbGxlckZyYW1lT2Zmc2V0KCkpLCBHUFJJbmZvOjpy ZWdUMyk7CkBAIC0yMDksNyArMjA5LDcgQEAgdm9pZCByZWlmeUlubGluZWRDYWxsRnJhbWVzKEND YWxsSGVscGVycwogI2lmIENQVShBUk02NEUpCiAgICAgICAgICAgICBqaXQuYWRkUHRyKEFzc2Vt Ymx5SGVscGVyczo6VHJ1c3RlZEltbTMyKGlubGluZUNhbGxGcmFtZS0+cmV0dXJuUENPZmZzZXQo KSArIHNpemVvZih2b2lkKikpLCBHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgR1BSSW5mbzo6 cmVnVDIpOwogICAgICAgICAgICAgaml0Lm1vdmUoQXNzZW1ibHlIZWxwZXJzOjpUcnVzdGVkSW1t UHRyKGp1bXBUYXJnZXQpLCBHUFJJbmZvOjpub25BcmdHUFIwKTsKLSAgICAgICAgICAgIGppdC50 YWdQdHIoR1BSSW5mbzo6bm9uQXJnR1BSMCwgR1BSSW5mbzo6cmVnVDIpOworICAgICAgICAgICAg aml0LnRhZ1B0cihHUFJJbmZvOjpyZWdUMiwgR1BSSW5mbzo6bm9uQXJnR1BSMCk7CiAgICAgICAg ICAgICBqaXQuc3RvcmVQdHIoR1BSSW5mbzo6bm9uQXJnR1BSMCwgQXNzZW1ibHlIZWxwZXJzOjph ZGRyZXNzRm9yQnl0ZU9mZnNldChpbmxpbmVDYWxsRnJhbWUtPnJldHVyblBDT2Zmc2V0KCkpKTsK ICNlbHNlCiAgICAgICAgICAgICBqaXQuc3RvcmVQdHIoQXNzZW1ibHlIZWxwZXJzOjpUcnVzdGVk SW1tUHRyKGp1bXBUYXJnZXQpLCBBc3NlbWJseUhlbHBlcnM6OmFkZHJlc3NGb3JCeXRlT2Zmc2V0 KGlubGluZUNhbGxGcmFtZS0+cmV0dXJuUENPZmZzZXQoKSkpOwpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2Z0bC9GVExUaHVua3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9mdGwvRlRMVGh1bmtzLmNwcAkocmV2aXNpb24gMjQ1MjQzKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2Z0bC9GVExUaHVua3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTYsNyAr MTE2LDcgQEAgc3RhdGljIE1hY3JvQXNzZW1ibGVyQ29kZVJlZjxKSVRUaHVua1B0cgogICAgIHJl c3RvcmVBbGxSZWdpc3RlcnMoaml0LCBidWZmZXIpOwogCiAjaWYgQ1BVKEFSTTY0RSkKLSAgICBq aXQudW50YWdQdHIoQXNzZW1ibHlIZWxwZXJzOjpsaW5rUmVnaXN0ZXIsIHJlc3VsdFRhZyk7Cisg ICAgaml0LnVudGFnUHRyKHJlc3VsdFRhZywgQXNzZW1ibHlIZWxwZXJzOjpsaW5rUmVnaXN0ZXIp OwogICAgIGppdC50YWdSZXR1cm5BZGRyZXNzKCk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShy ZXN1bHRUYWcpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhlbHBlcnMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0NDYWxsSGVscGVycy5o CShyZXZpc2lvbiAyNDUyNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0NDYWxsSGVs cGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC04MDcsNyArODA3LDcgQEAgcHVibGljOgogICAgICAg ICBzdWJQdHIoVHJ1c3RlZEltbTMyKDIgKiBzaXplb2Yodm9pZCopKSwgbmV3RnJhbWVTaXplR1BS KTsKICNpZiBDUFUoQVJNNjRFKQogICAgICAgICBhZGRQdHIoVHJ1c3RlZEltbTMyKHNpemVvZihD YWxsZXJGcmFtZUFuZFBDKSksIE1hY3JvQXNzZW1ibGVyOjpmcmFtZVBvaW50ZXJSZWdpc3Rlciwg dGVtcEdQUik7Ci0gICAgICAgIHVudGFnUHRyKGxpbmtSZWdpc3RlciwgdGVtcEdQUik7CisgICAg ICAgIHVudGFnUHRyKHRlbXBHUFIsIGxpbmtSZWdpc3Rlcik7CiAjZW5kaWYKICNlbGlmIENQVShN SVBTKQogICAgICAgICBsb2FkUHRyKEFkZHJlc3MoZnJhbWVQb2ludGVyUmVnaXN0ZXIsIHNpemVv Zih2b2lkKikpLCByZXR1cm5BZGRyZXNzUmVnaXN0ZXIpOwpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9DYWxsRnJhbWVTaHVmZmxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2ppdC9DYWxsRnJhbWVTaHVmZmxlci5jcHAJKHJldmlzaW9uIDI0NTI0MykK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ2FsbEZyYW1lU2h1ZmZsZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00NTYsNyArNDU2LDcgQEAgdm9pZCBDYWxsRnJhbWVTaHVmZmxlcjo6cHJl cGFyZUZvclRhaWxDYQogICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6bGlua1JlZ2lzdGVyKTsKICNp ZiBDUFUoQVJNNjRFKQogICAgIG1faml0LmFkZFB0cihNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZElt bTMyKHNpemVvZihDYWxsZXJGcmFtZUFuZFBDKSksIE1hY3JvQXNzZW1ibGVyOjpmcmFtZVBvaW50 ZXJSZWdpc3Rlcik7Ci0gICAgbV9qaXQudW50YWdQdHIoTWFjcm9Bc3NlbWJsZXI6OmxpbmtSZWdp c3RlciwgTWFjcm9Bc3NlbWJsZXI6OmZyYW1lUG9pbnRlclJlZ2lzdGVyKTsKKyAgICBtX2ppdC51 bnRhZ1B0cihNYWNyb0Fzc2VtYmxlcjo6ZnJhbWVQb2ludGVyUmVnaXN0ZXIsIE1hY3JvQXNzZW1i bGVyOjpsaW5rUmVnaXN0ZXIpOwogICAgIG1faml0LnN1YlB0cihNYWNyb0Fzc2VtYmxlcjo6VHJ1 c3RlZEltbTMyKHNpemVvZihDYWxsZXJGcmFtZUFuZFBDKSksIE1hY3JvQXNzZW1ibGVyOjpmcmFt ZVBvaW50ZXJSZWdpc3Rlcik7CiAjZW5kaWYKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9UaHVua0dlbmVyYXRvcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvVGh1bmtHZW5lcmF0b3JzLmNwcAkocmV2aXNpb24gMjQ1MjQzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVyYXRvcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC01Myw3ICs1Myw3IEBAIGlubGluZSB2b2lkIGVtaXRQb2ludGVyVmFsaWRhdGlvbihDQ2FsbEgK ICAgICBqaXQuYWJvcnRXaXRoUmVhc29uKFRHSW52YWxpZFBvaW50ZXIpOwogICAgIGlzTm9uWmVy by5saW5rKCZqaXQpOwogICAgIGppdC5wdXNoVG9TYXZlKHBvaW50ZXJHUFIpOwotICAgIGppdC51 bnRhZ1B0cihwb2ludGVyR1BSLCB0YWcpOworICAgIGppdC51bnRhZ1B0cih0YWcsIHBvaW50ZXJH UFIpOwogICAgIGppdC5sb2FkOChwb2ludGVyR1BSLCBwb2ludGVyR1BSKTsKICAgICBqaXQucG9w VG9SZXN0b3JlKHBvaW50ZXJHUFIpOwogfQpAQCAtNDU5LDEwICs0NTksMTAgQEAgTWFjcm9Bc3Nl bWJsZXJDb2RlUmVmPEpJVFRodW5rUHRyVGFnPiBhcgogI2lmIENQVShBUk02NEUpCiAgICAgaml0 LmxvYWRQdHIoSlNJbnRlcmZhY2VKSVQ6OkFkZHJlc3MoR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0 ZXIsIENhbGxGcmFtZTo6cmV0dXJuUENPZmZzZXQoKSksIEdQUkluZm86OnJlZ1QzKTsKICAgICBq aXQuYWRkUHRyKEpTSW50ZXJmYWNlSklUOjpUcnVzdGVkSW1tMzIoc2l6ZW9mKENhbGxlckZyYW1l QW5kUEMpKSwgR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIGV4dHJhVGVtcCk7Ci0gICAgaml0 LnVudGFnUHRyKEdQUkluZm86OnJlZ1QzLCBleHRyYVRlbXApOworICAgIGppdC51bnRhZ1B0cihl eHRyYVRlbXAsIEdQUkluZm86OnJlZ1QzKTsKICAgICBQdHJUYWcgdGVtcFJldHVyblBDVGFnID0g c3RhdGljX2Nhc3Q8UHRyVGFnPihyYW5kb20oKSk7CiAgICAgaml0Lm1vdmUoSlNJbnRlcmZhY2VK SVQ6OlRydXN0ZWRJbW1QdHIodGVtcFJldHVyblBDVGFnKSwgZXh0cmFUZW1wKTsKLSAgICBqaXQu dGFnUHRyKEdQUkluZm86OnJlZ1QzLCBleHRyYVRlbXApOworICAgIGppdC50YWdQdHIoZXh0cmFU ZW1wLCBHUFJJbmZvOjpyZWdUMyk7CiAgICAgaml0LnN0b3JlUHRyKEdQUkluZm86OnJlZ1QzLCBK U0ludGVyZmFjZUpJVDo6QWRkcmVzcyhHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgQ2FsbEZy YW1lOjpyZXR1cm5QQ09mZnNldCgpKSk7CiAjZW5kaWYKICAgICBqaXQubW92ZShKU0ludGVyZmFj ZUpJVDo6Y2FsbEZyYW1lUmVnaXN0ZXIsIEpTSW50ZXJmYWNlSklUOjpyZWdUMyk7CkBAIC01MTUs OSArNTE1LDkgQEAgTWFjcm9Bc3NlbWJsZXJDb2RlUmVmPEpJVFRodW5rUHRyVGFnPiBhcgogI2lm IENQVShBUk02NEUpCiAgICAgaml0LmxvYWRQdHIoSlNJbnRlcmZhY2VKSVQ6OkFkZHJlc3MoR1BS SW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIENhbGxGcmFtZTo6cmV0dXJuUENPZmZzZXQoKSksIEdQ UkluZm86OnJlZ1QzKTsKICAgICBqaXQubW92ZShKU0ludGVyZmFjZUpJVDo6VHJ1c3RlZEltbVB0 cih0ZW1wUmV0dXJuUENUYWcpLCBleHRyYVRlbXApOwotICAgIGppdC51bnRhZ1B0cihHUFJJbmZv OjpyZWdUMywgZXh0cmFUZW1wKTsKKyAgICBqaXQudW50YWdQdHIoZXh0cmFUZW1wLCBHUFJJbmZv OjpyZWdUMyk7CiAgICAgaml0LmFkZFB0cihKU0ludGVyZmFjZUpJVDo6VHJ1c3RlZEltbTMyKHNp emVvZihDYWxsZXJGcmFtZUFuZFBDKSksIEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBleHRy YVRlbXApOwotICAgIGppdC50YWdQdHIoR1BSSW5mbzo6cmVnVDMsIGV4dHJhVGVtcCk7CisgICAg aml0LnRhZ1B0cihleHRyYVRlbXAsIEdQUkluZm86OnJlZ1QzKTsKICAgICBqaXQuc3RvcmVQdHIo R1BSSW5mbzo6cmVnVDMsIEpTSW50ZXJmYWNlSklUOjpBZGRyZXNzKEdQUkluZm86OmNhbGxGcmFt ZVJlZ2lzdGVyLCBDYWxsRnJhbWU6OnJldHVyblBDT2Zmc2V0KCkpKTsKICNlbmRpZgogCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUZ1bmN0aW9uLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUZ1 bmN0aW9uLmNwcAkocmV2aXNpb24gMjQ1MjQzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3dh c20vanMvV2ViQXNzZW1ibHlGdW5jdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4MCw3ICs0 ODAsNyBAQCBNYWNyb0Fzc2VtYmxlckNvZGVQdHI8SlNFbnRyeVB0clRhZz4gV2ViCiAgICAgaml0 Lm1vdmUoQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tUHRyKHRoaXMpLCBHUFJJbmZvOjpyZWdUMCk7 CiAgICAgaml0LmVtaXRGdW5jdGlvbkVwaWxvZ3VlKCk7CiAjaWYgQ1BVKEFSTTY0RSkKLSAgICBq aXQudW50YWdQdHIoTWFjcm9Bc3NlbWJsZXI6OmxpbmtSZWdpc3RlciwgTWFjcm9Bc3NlbWJsZXI6 OnN0YWNrUG9pbnRlclJlZ2lzdGVyKTsKKyAgICBqaXQudW50YWdSZXR1cm5BZGRyZXNzKCk7CiAj ZW5kaWYKICAgICBhdXRvIGp1bXBUb0hvc3RDYWxsVGh1bmsgPSBqaXQuanVtcCgpOwogCg== 369779 2019-05-13 14:01:50 -0700 2019-05-13 14:34:49 -0700 patch for landing a-backup.diff text/plain 10862 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQ1MjQ1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDE5LTA1LTEzICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IG1hY3JvIGFzc2VtYmxlciBjb2RlLXBvaW50ZXIgdGFnZ2luZyBoYXMgaXRzIGFyZ3VtZW50cyBi YWNrd2FyZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NzY3NworCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgU2Fib2ZmLgorCisgICAgICAg IFdlIGhhZCB0aGUgZGVzdGluYXRpb24gYXMgdGhlIGxlZnRtb3N0IGluc3RlYWQgb2YgdGhlIHJp Z2h0bW9zdCBhcmd1bWVudCwKKyAgICAgICAgd2hpY2ggZ29lcyBhZ2FpbnN0IHRoZSBjb252ZW50 aW9uIG9mIGhvdyB3ZSBvcmRlciBhcmd1bWVudHMgaW4gbWFjcm8gYXNzZW1ibGVyCisgICAgICAg IG1ldGhvZHMuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NEUuaDoK KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NEU6OnRhZ1JldHVybkFkZHJlc3MpOgor ICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTY0RTo6dW50YWdSZXR1cm5BZGRyZXNzKToK KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk02NEU6OnRhZ1B0cik6CisgICAgICAgIChK U0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjRFOjp1bnRhZ1B0cik6CisgICAgICAgICogZGZnL0RGR09T UkV4aXRDb21waWxlckNvbW1vbi5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6cmVpZnlJbmxpbmVk Q2FsbEZyYW1lcyk6CisgICAgICAgICogZnRsL0ZUTFRodW5rcy5jcHA6CisgICAgICAgIChKU0M6 OkZUTDo6Z2VuZXJpY0dlbmVyYXRpb25UaHVua0dlbmVyYXRvcik6CisgICAgICAgICogaml0L0ND YWxsSGVscGVycy5oOgorICAgICAgICAoSlNDOjpDQ2FsbEhlbHBlcnM6OnByZXBhcmVGb3JUYWls Q2FsbFNsb3cpOgorICAgICAgICAqIGppdC9DYWxsRnJhbWVTaHVmZmxlci5jcHA6CisgICAgICAg IChKU0M6OkNhbGxGcmFtZVNodWZmbGVyOjpwcmVwYXJlRm9yVGFpbENhbGwpOgorICAgICAgICAq IGppdC9UaHVua0dlbmVyYXRvcnMuY3BwOgorICAgICAgICAoSlNDOjplbWl0UG9pbnRlclZhbGlk YXRpb24pOgorICAgICAgICAoSlNDOjphcml0eUZpeHVwR2VuZXJhdG9yKToKKyAgICAgICAgKiB3 YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwOgorICAgICAgICAoSlNDOjpXZWJBc3NlbWJs eUZ1bmN0aW9uOjpqc0NhbGxFbnRyeXBvaW50U2xvdyk6CisKIDIwMTktMDUtMTMgIFl1c3VrZSBT dXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBDb21wcmVzcyBtaXNj ZWxhbmVvdXMgSklUIHJlbGF0ZWQgZGF0YSBzdHJ1Y3R1cmVzIHdpdGggUGFja2VkPD4KSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQWJzdHJhY3RNYWNyb0Fzc2VtYmxlci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQWJzdHJhY3RN YWNyb0Fzc2VtYmxlci5oCShyZXZpc2lvbiAyNDUyNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYXNzZW1ibGVyL0Fic3RyYWN0TWFjcm9Bc3NlbWJsZXIuaAkod29ya2luZyBjb3B5KQpAQCAt OTc3LDkgKzk3Nyw5IEBAIHB1YmxpYzoKICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdGFnUmV0dXJu QWRkcmVzcygpIHsgfQogICAgIEFMV0FZU19JTkxJTkUgdm9pZCB1bnRhZ1JldHVybkFkZHJlc3Mo KSB7IH0KIAotICAgIEFMV0FZU19JTkxJTkUgdm9pZCB0YWdQdHIoUmVnaXN0ZXJJRCwgUHRyVGFn KSB7IH0KKyAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdGFnUHRyKFB0clRhZywgUmVnaXN0ZXJJRCkg eyB9CiAgICAgQUxXQVlTX0lOTElORSB2b2lkIHRhZ1B0cihSZWdpc3RlcklELCBSZWdpc3RlcklE KSB7IH0KLSAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdW50YWdQdHIoUmVnaXN0ZXJJRCwgUHRyVGFn KSB7IH0KKyAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdW50YWdQdHIoUHRyVGFnLCBSZWdpc3RlcklE KSB7IH0KICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdW50YWdQdHIoUmVnaXN0ZXJJRCwgUmVnaXN0 ZXJJRCkgeyB9CiAgICAgQUxXQVlTX0lOTElORSB2b2lkIHJlbW92ZVB0clRhZyhSZWdpc3RlcklE KSB7IH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2Vt YmxlckFSTTY0RS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTWFjcm9Bc3NlbWJsZXJBUk02NEUuaAkocmV2aXNpb24gMjQ1MjQzKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0RS5oCSh3b3JraW5nIGNv cHkpCkBAIC00MSwyMiArNDEsMjIgQEAgY2xhc3MgTWFjcm9Bc3NlbWJsZXJBUk02NEUgOiBwdWJs aWMgTWFjcgogcHVibGljOgogICAgIEFMV0FZU19JTkxJTkUgdm9pZCB0YWdSZXR1cm5BZGRyZXNz KCkKICAgICB7Ci0gICAgICAgIHRhZ1B0cihBUk02NFJlZ2lzdGVyczo6bHIsIEFSTTY0UmVnaXN0 ZXJzOjpzcCk7CisgICAgICAgIHRhZ1B0cihBUk02NFJlZ2lzdGVyczo6c3AsIEFSTTY0UmVnaXN0 ZXJzOjpscik7CiAgICAgfQogCiAgICAgQUxXQVlTX0lOTElORSB2b2lkIHVudGFnUmV0dXJuQWRk cmVzcygpCiAgICAgewotICAgICAgICB1bnRhZ1B0cihBUk02NFJlZ2lzdGVyczo6bHIsIEFSTTY0 UmVnaXN0ZXJzOjpzcCk7CisgICAgICAgIHVudGFnUHRyKEFSTTY0UmVnaXN0ZXJzOjpzcCwgQVJN NjRSZWdpc3RlcnM6OmxyKTsKICAgICB9CiAKLSAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdGFnUHRy KFJlZ2lzdGVySUQgdGFyZ2V0LCBQdHJUYWcgdGFnKQorICAgIEFMV0FZU19JTkxJTkUgdm9pZCB0 YWdQdHIoUHRyVGFnIHRhZywgUmVnaXN0ZXJJRCB0YXJnZXQpCiAgICAgewogICAgICAgICBhdXRv IHRhZ0dQUiA9IGdldENhY2hlZERhdGFUZW1wUmVnaXN0ZXJJREFuZEludmFsaWRhdGUoKTsKICAg ICAgICAgbW92ZShUcnVzdGVkSW1tNjQodGFnKSwgdGFnR1BSKTsKICAgICAgICAgbV9hc3NlbWJs ZXIucGFjaWIodGFyZ2V0LCB0YWdHUFIpOwogICAgIH0KIAotICAgIEFMV0FZU19JTkxJTkUgdm9p ZCB0YWdQdHIoUmVnaXN0ZXJJRCB0YXJnZXQsIFJlZ2lzdGVySUQgdGFnKQorICAgIEFMV0FZU19J TkxJTkUgdm9pZCB0YWdQdHIoUmVnaXN0ZXJJRCB0YWcsIFJlZ2lzdGVySUQgdGFyZ2V0KQogICAg IHsKICAgICAgICAgaWYgKHRhcmdldCA9PSBBUk02NFJlZ2lzdGVyczo6bHIgJiYgdGFnID09IEFS TTY0UmVnaXN0ZXJzOjpzcCkgewogICAgICAgICAgICAgbV9hc3NlbWJsZXIucGFjaWJzcCgpOwpA QCAtNjUsMTQgKzY1LDE0IEBAIHB1YmxpYzoKICAgICAgICAgbV9hc3NlbWJsZXIucGFjaWIodGFy Z2V0LCB0YWcpOwogICAgIH0KIAotICAgIEFMV0FZU19JTkxJTkUgdm9pZCB1bnRhZ1B0cihSZWdp c3RlcklEIHRhcmdldCwgUHRyVGFnIHRhZykKKyAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdW50YWdQ dHIoUHRyVGFnIHRhZywgUmVnaXN0ZXJJRCB0YXJnZXQpCiAgICAgewogICAgICAgICBhdXRvIHRh Z0dQUiA9IGdldENhY2hlZERhdGFUZW1wUmVnaXN0ZXJJREFuZEludmFsaWRhdGUoKTsKICAgICAg ICAgbW92ZShUcnVzdGVkSW1tNjQodGFnKSwgdGFnR1BSKTsKICAgICAgICAgbV9hc3NlbWJsZXIu YXV0aWIodGFyZ2V0LCB0YWdHUFIpOwogICAgIH0KIAotICAgIEFMV0FZU19JTkxJTkUgdm9pZCB1 bnRhZ1B0cihSZWdpc3RlcklEIHRhcmdldCwgUmVnaXN0ZXJJRCB0YWcpCisgICAgQUxXQVlTX0lO TElORSB2b2lkIHVudGFnUHRyKFJlZ2lzdGVySUQgdGFnLCBSZWdpc3RlcklEIHRhcmdldCkKICAg ICB7CiAgICAgICAgIG1fYXNzZW1ibGVyLmF1dGliKHRhcmdldCwgdGFnKTsKICAgICB9CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkV4aXRDb21waWxlckNvbW1vbi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0Q29tcGls ZXJDb21tb24uY3BwCShyZXZpc2lvbiAyNDUyNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR09TUkV4aXRDb21waWxlckNvbW1vbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1Nyw5 ICsxNTcsOSBAQCB2b2lkIHJlaWZ5SW5saW5lZENhbGxGcmFtZXMoQ0NhbGxIZWxwZXJzCiAgICAg ICAgICAgICBqaXQubG9hZFB0cihBc3NlbWJseUhlbHBlcnM6OkFkZHJlc3MoR1BSSW5mbzo6Y2Fs bEZyYW1lUmVnaXN0ZXIsIENhbGxGcmFtZTo6cmV0dXJuUENPZmZzZXQoKSksIEdQUkluZm86OnJl Z1QzKTsKICNpZiBDUFUoQVJNNjRFKQogICAgICAgICAgICAgaml0LmFkZFB0cihBc3NlbWJseUhl bHBlcnM6OlRydXN0ZWRJbW0zMihzaXplb2YoQ2FsbGVyRnJhbWVBbmRQQykpLCBHUFJJbmZvOjpj YWxsRnJhbWVSZWdpc3RlciwgR1BSSW5mbzo6cmVnVDIpOwotICAgICAgICAgICAgaml0LnVudGFn UHRyKEdQUkluZm86OnJlZ1QzLCBHUFJJbmZvOjpyZWdUMik7CisgICAgICAgICAgICBqaXQudW50 YWdQdHIoR1BSSW5mbzo6cmVnVDIsIEdQUkluZm86OnJlZ1QzKTsKICAgICAgICAgICAgIGppdC5h ZGRQdHIoQXNzZW1ibHlIZWxwZXJzOjpUcnVzdGVkSW1tMzIoaW5saW5lQ2FsbEZyYW1lLT5yZXR1 cm5QQ09mZnNldCgpICsgc2l6ZW9mKHZvaWQqKSksIEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVy LCBHUFJJbmZvOjpyZWdUMik7Ci0gICAgICAgICAgICBqaXQudGFnUHRyKEdQUkluZm86OnJlZ1Qz LCBHUFJJbmZvOjpyZWdUMik7CisgICAgICAgICAgICBqaXQudGFnUHRyKEdQUkluZm86OnJlZ1Qy LCBHUFJJbmZvOjpyZWdUMyk7CiAjZW5kaWYKICAgICAgICAgICAgIGppdC5zdG9yZVB0cihHUFJJ bmZvOjpyZWdUMywgQXNzZW1ibHlIZWxwZXJzOjphZGRyZXNzRm9yQnl0ZU9mZnNldChpbmxpbmVD YWxsRnJhbWUtPnJldHVyblBDT2Zmc2V0KCkpKTsKICAgICAgICAgICAgIGppdC5sb2FkUHRyKEFz c2VtYmx5SGVscGVyczo6QWRkcmVzcyhHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgQ2FsbEZy YW1lOjpjYWxsZXJGcmFtZU9mZnNldCgpKSwgR1BSSW5mbzo6cmVnVDMpOwpAQCAtMjA5LDcgKzIw OSw3IEBAIHZvaWQgcmVpZnlJbmxpbmVkQ2FsbEZyYW1lcyhDQ2FsbEhlbHBlcnMKICNpZiBDUFUo QVJNNjRFKQogICAgICAgICAgICAgaml0LmFkZFB0cihBc3NlbWJseUhlbHBlcnM6OlRydXN0ZWRJ bW0zMihpbmxpbmVDYWxsRnJhbWUtPnJldHVyblBDT2Zmc2V0KCkgKyBzaXplb2Yodm9pZCopKSwg R1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIEdQUkluZm86OnJlZ1QyKTsKICAgICAgICAgICAg IGppdC5tb3ZlKEFzc2VtYmx5SGVscGVyczo6VHJ1c3RlZEltbVB0cihqdW1wVGFyZ2V0KSwgR1BS SW5mbzo6bm9uQXJnR1BSMCk7Ci0gICAgICAgICAgICBqaXQudGFnUHRyKEdQUkluZm86Om5vbkFy Z0dQUjAsIEdQUkluZm86OnJlZ1QyKTsKKyAgICAgICAgICAgIGppdC50YWdQdHIoR1BSSW5mbzo6 cmVnVDIsIEdQUkluZm86Om5vbkFyZ0dQUjApOwogICAgICAgICAgICAgaml0LnN0b3JlUHRyKEdQ UkluZm86Om5vbkFyZ0dQUjAsIEFzc2VtYmx5SGVscGVyczo6YWRkcmVzc0ZvckJ5dGVPZmZzZXQo aW5saW5lQ2FsbEZyYW1lLT5yZXR1cm5QQ09mZnNldCgpKSk7CiAjZWxzZQogICAgICAgICAgICAg aml0LnN0b3JlUHRyKEFzc2VtYmx5SGVscGVyczo6VHJ1c3RlZEltbVB0cihqdW1wVGFyZ2V0KSwg QXNzZW1ibHlIZWxwZXJzOjphZGRyZXNzRm9yQnl0ZU9mZnNldChpbmxpbmVDYWxsRnJhbWUtPnJl dHVyblBDT2Zmc2V0KCkpKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMVGh1 bmtzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFRodW5r cy5jcHAJKHJldmlzaW9uIDI0NTI0MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRM VGh1bmtzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDcgKzExNiw3IEBAIHN0YXRpYyBNYWNy b0Fzc2VtYmxlckNvZGVSZWY8SklUVGh1bmtQdHIKICAgICByZXN0b3JlQWxsUmVnaXN0ZXJzKGpp dCwgYnVmZmVyKTsKIAogI2lmIENQVShBUk02NEUpCi0gICAgaml0LnVudGFnUHRyKEFzc2VtYmx5 SGVscGVyczo6bGlua1JlZ2lzdGVyLCByZXN1bHRUYWcpOworICAgIGppdC51bnRhZ1B0cihyZXN1 bHRUYWcsIEFzc2VtYmx5SGVscGVyczo6bGlua1JlZ2lzdGVyKTsKICAgICBqaXQudGFnUmV0dXJu QWRkcmVzcygpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0ocmVzdWx0VGFnKTsKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ0NhbGxIZWxwZXJzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhlbHBlcnMuaAkocmV2aXNpb24gMjQ1MjQzKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9DQ2FsbEhlbHBlcnMuaAkod29ya2luZyBjb3B5 KQpAQCAtODA3LDcgKzgwNyw3IEBAIHB1YmxpYzoKICAgICAgICAgc3ViUHRyKFRydXN0ZWRJbW0z MigyICogc2l6ZW9mKHZvaWQqKSksIG5ld0ZyYW1lU2l6ZUdQUik7CiAjaWYgQ1BVKEFSTTY0RSkK ICAgICAgICAgYWRkUHRyKFRydXN0ZWRJbW0zMihzaXplb2YoQ2FsbGVyRnJhbWVBbmRQQykpLCBN YWNyb0Fzc2VtYmxlcjo6ZnJhbWVQb2ludGVyUmVnaXN0ZXIsIHRlbXBHUFIpOwotICAgICAgICB1 bnRhZ1B0cihsaW5rUmVnaXN0ZXIsIHRlbXBHUFIpOworICAgICAgICB1bnRhZ1B0cih0ZW1wR1BS LCBsaW5rUmVnaXN0ZXIpOwogI2VuZGlmCiAjZWxpZiBDUFUoTUlQUykKICAgICAgICAgbG9hZFB0 cihBZGRyZXNzKGZyYW1lUG9pbnRlclJlZ2lzdGVyLCBzaXplb2Yodm9pZCopKSwgcmV0dXJuQWRk cmVzc1JlZ2lzdGVyKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ2FsbEZyYW1l U2h1ZmZsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ2Fs bEZyYW1lU2h1ZmZsZXIuY3BwCShyZXZpc2lvbiAyNDUyNDMpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0NhbGxGcmFtZVNodWZmbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDU2LDcg KzQ1Niw3IEBAIHZvaWQgQ2FsbEZyYW1lU2h1ZmZsZXI6OnByZXBhcmVGb3JUYWlsQ2EKICAgICAg ICAgTWFjcm9Bc3NlbWJsZXI6OmxpbmtSZWdpc3Rlcik7CiAjaWYgQ1BVKEFSTTY0RSkKICAgICBt X2ppdC5hZGRQdHIoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW0zMihzaXplb2YoQ2FsbGVyRnJh bWVBbmRQQykpLCBNYWNyb0Fzc2VtYmxlcjo6ZnJhbWVQb2ludGVyUmVnaXN0ZXIpOwotICAgIG1f aml0LnVudGFnUHRyKE1hY3JvQXNzZW1ibGVyOjpsaW5rUmVnaXN0ZXIsIE1hY3JvQXNzZW1ibGVy OjpmcmFtZVBvaW50ZXJSZWdpc3Rlcik7CisgICAgbV9qaXQudW50YWdQdHIoTWFjcm9Bc3NlbWJs ZXI6OmZyYW1lUG9pbnRlclJlZ2lzdGVyLCBNYWNyb0Fzc2VtYmxlcjo6bGlua1JlZ2lzdGVyKTsK ICAgICBtX2ppdC5zdWJQdHIoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW0zMihzaXplb2YoQ2Fs bGVyRnJhbWVBbmRQQykpLCBNYWNyb0Fzc2VtYmxlcjo6ZnJhbWVQb2ludGVyUmVnaXN0ZXIpOwog I2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvVGh1bmtHZW5lcmF0b3Jz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1RodW5rR2VuZXJh dG9ycy5jcHAJKHJldmlzaW9uIDI0NTI0MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv VGh1bmtHZW5lcmF0b3JzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTMsNyArNTMsNyBAQCBpbmxp bmUgdm9pZCBlbWl0UG9pbnRlclZhbGlkYXRpb24oQ0NhbGxICiAgICAgaml0LmFib3J0V2l0aFJl YXNvbihUR0ludmFsaWRQb2ludGVyKTsKICAgICBpc05vblplcm8ubGluaygmaml0KTsKICAgICBq aXQucHVzaFRvU2F2ZShwb2ludGVyR1BSKTsKLSAgICBqaXQudW50YWdQdHIocG9pbnRlckdQUiwg dGFnKTsKKyAgICBqaXQudW50YWdQdHIodGFnLCBwb2ludGVyR1BSKTsKICAgICBqaXQubG9hZDgo cG9pbnRlckdQUiwgcG9pbnRlckdQUik7CiAgICAgaml0LnBvcFRvUmVzdG9yZShwb2ludGVyR1BS KTsKIH0KQEAgLTQ1OSwxMCArNDU5LDEwIEBAIE1hY3JvQXNzZW1ibGVyQ29kZVJlZjxKSVRUaHVu a1B0clRhZz4gYXIKICNpZiBDUFUoQVJNNjRFKQogICAgIGppdC5sb2FkUHRyKEpTSW50ZXJmYWNl SklUOjpBZGRyZXNzKEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBDYWxsRnJhbWU6OnJldHVy blBDT2Zmc2V0KCkpLCBHUFJJbmZvOjpyZWdUMyk7CiAgICAgaml0LmFkZFB0cihKU0ludGVyZmFj ZUpJVDo6VHJ1c3RlZEltbTMyKHNpemVvZihDYWxsZXJGcmFtZUFuZFBDKSksIEdQUkluZm86OmNh bGxGcmFtZVJlZ2lzdGVyLCBleHRyYVRlbXApOwotICAgIGppdC51bnRhZ1B0cihHUFJJbmZvOjpy ZWdUMywgZXh0cmFUZW1wKTsKKyAgICBqaXQudW50YWdQdHIoZXh0cmFUZW1wLCBHUFJJbmZvOjpy ZWdUMyk7CiAgICAgUHRyVGFnIHRlbXBSZXR1cm5QQ1RhZyA9IHN0YXRpY19jYXN0PFB0clRhZz4o cmFuZG9tKCkpOwogICAgIGppdC5tb3ZlKEpTSW50ZXJmYWNlSklUOjpUcnVzdGVkSW1tUHRyKHRl bXBSZXR1cm5QQ1RhZyksIGV4dHJhVGVtcCk7Ci0gICAgaml0LnRhZ1B0cihHUFJJbmZvOjpyZWdU MywgZXh0cmFUZW1wKTsKKyAgICBqaXQudGFnUHRyKGV4dHJhVGVtcCwgR1BSSW5mbzo6cmVnVDMp OwogICAgIGppdC5zdG9yZVB0cihHUFJJbmZvOjpyZWdUMywgSlNJbnRlcmZhY2VKSVQ6OkFkZHJl c3MoR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIENhbGxGcmFtZTo6cmV0dXJuUENPZmZzZXQo KSkpOwogI2VuZGlmCiAgICAgaml0Lm1vdmUoSlNJbnRlcmZhY2VKSVQ6OmNhbGxGcmFtZVJlZ2lz dGVyLCBKU0ludGVyZmFjZUpJVDo6cmVnVDMpOwpAQCAtNTE1LDkgKzUxNSw5IEBAIE1hY3JvQXNz ZW1ibGVyQ29kZVJlZjxKSVRUaHVua1B0clRhZz4gYXIKICNpZiBDUFUoQVJNNjRFKQogICAgIGpp dC5sb2FkUHRyKEpTSW50ZXJmYWNlSklUOjpBZGRyZXNzKEdQUkluZm86OmNhbGxGcmFtZVJlZ2lz dGVyLCBDYWxsRnJhbWU6OnJldHVyblBDT2Zmc2V0KCkpLCBHUFJJbmZvOjpyZWdUMyk7CiAgICAg aml0Lm1vdmUoSlNJbnRlcmZhY2VKSVQ6OlRydXN0ZWRJbW1QdHIodGVtcFJldHVyblBDVGFnKSwg ZXh0cmFUZW1wKTsKLSAgICBqaXQudW50YWdQdHIoR1BSSW5mbzo6cmVnVDMsIGV4dHJhVGVtcCk7 CisgICAgaml0LnVudGFnUHRyKGV4dHJhVGVtcCwgR1BSSW5mbzo6cmVnVDMpOwogICAgIGppdC5h ZGRQdHIoSlNJbnRlcmZhY2VKSVQ6OlRydXN0ZWRJbW0zMihzaXplb2YoQ2FsbGVyRnJhbWVBbmRQ QykpLCBHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgZXh0cmFUZW1wKTsKLSAgICBqaXQudGFn UHRyKEdQUkluZm86OnJlZ1QzLCBleHRyYVRlbXApOworICAgIGppdC50YWdQdHIoZXh0cmFUZW1w LCBHUFJJbmZvOjpyZWdUMyk7CiAgICAgaml0LnN0b3JlUHRyKEdQUkluZm86OnJlZ1QzLCBKU0lu dGVyZmFjZUpJVDo6QWRkcmVzcyhHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgQ2FsbEZyYW1l OjpyZXR1cm5QQ09mZnNldCgpKSk7CiAjZW5kaWYKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL3dhc20vanMvV2ViQXNzZW1ibHlGdW5jdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlGdW5jdGlvbi5jcHAJKHJldmlzaW9u IDI0NTI0MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5RnVu Y3Rpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00ODAsNyArNDgwLDcgQEAgTWFjcm9Bc3NlbWJs ZXJDb2RlUHRyPEpTRW50cnlQdHJUYWc+IFdlYgogICAgIGppdC5tb3ZlKENDYWxsSGVscGVyczo6 VHJ1c3RlZEltbVB0cih0aGlzKSwgR1BSSW5mbzo6cmVnVDApOwogICAgIGppdC5lbWl0RnVuY3Rp b25FcGlsb2d1ZSgpOwogI2lmIENQVShBUk02NEUpCi0gICAgaml0LnVudGFnUHRyKE1hY3JvQXNz ZW1ibGVyOjpsaW5rUmVnaXN0ZXIsIE1hY3JvQXNzZW1ibGVyOjpzdGFja1BvaW50ZXJSZWdpc3Rl cik7CisgICAgaml0LnVudGFnUmV0dXJuQWRkcmVzcygpOwogI2VuZGlmCiAgICAgYXV0byBqdW1w VG9Ib3N0Q2FsbFRodW5rID0gaml0Lmp1bXAoKTsKIAo=