203693 2019-10-31 13:19:59 -0700 Refactor uses of StructureStubInfo 'thisGPR' to a union for thisGPR and prototypeGPR 2019-11-01 16:08:20 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 202767 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov guijemont keith_miller mark.lam msaboff rmorisset ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1586041 0 saam 2019-10-31 13:19:59 -0700 ... 1586095 1 382508 saam 2019-10-31 15:23:37 -0700 Created attachment 382508 patch 1586096 2 382508 mark.lam 2019-10-31 15:26:16 -0700 Comment on attachment 382508 patch r=me 1586099 3 ysuzuki 2019-10-31 15:27:26 -0700 r=me too. 1586110 4 382508 saam 2019-10-31 15:44:03 -0700 Comment on attachment 382508 patch View in context: https://bugs.webkit.org/attachment.cgi?id=382508&action=review > Source/JavaScriptCore/ChangeLog:10 > + I'm going to be adding a third overload for this field in when making > + GetByVal inline caching part of StructureStubInfo. It's nicer to for > + each use case of this field to use it by the proper name. will fix my grammar here 1586112 5 382512 saam 2019-10-31 15:45:31 -0700 Created attachment 382512 patch for landing 1586132 6 382512 commit-queue 2019-10-31 16:28:35 -0700 Comment on attachment 382512 patch for landing Rejecting attachment 382512 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 382512, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=382512&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=203693&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 382512 from bug 203693. Fetching: https://bugs.webkit.org/attachment.cgi?id=382512 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/JavaScriptCore/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/JavaScriptCore/ChangeLog' is out of date W: f82ed8988558dd43ce74c8f948960772bc8b551d and refs/remotes/origin/master differ, using rebase: :040000 040000 e06719e00928207ae2c36bc5b6e6f36490faf557 cca23a7465956a33eb7813e95dd65142fe89dc36 M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/JavaScriptCore/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/JavaScriptCore/ChangeLog' is out of date W: f82ed8988558dd43ce74c8f948960772bc8b551d and refs/remotes/origin/master differ, using rebase: :040000 040000 e06719e00928207ae2c36bc5b6e6f36490faf557 cca23a7465956a33eb7813e95dd65142fe89dc36 M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From https://git.webkit.org/git/WebKit a5d593eee80..e4a4400a954 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 251888 = a5d593eee8055920956dc57f2edab7b5a3d7eda2 r251889 = e4a4400a954b3c07e7948ef869d88c22f29091a6 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/13197188 1586437 7 382593 saam 2019-11-01 10:45:41 -0700 Created attachment 382593 patch for landing 1586474 8 commit-queue 2019-11-01 11:48:39 -0700 The commit-queue encountered the following flaky tests while processing attachment 382593: imported/w3c/web-platform-tests/websockets/bufferedAmount-unchanged-by-sync-xhr.any.worker.html bug 202003 (author: youennf@gmail.com) The commit-queue is continuing to process your patch. 1586475 9 commit-queue 2019-11-01 11:48:40 -0700 The commit-queue encountered the following flaky tests while processing attachment 382593: The commit-queue is continuing to process your patch. 1586527 10 commit-queue 2019-11-01 13:52:06 -0700 The commit-queue encountered the following flaky tests while processing attachment 382593: requestidlecallback/requestidlecallback-document-gc.html bug 203745 (author: rniwa@webkit.org) The commit-queue is continuing to process your patch. 1586530 11 commit-queue 2019-11-01 13:52:13 -0700 The commit-queue encountered the following flaky tests while processing attachment 382593: imported/w3c/web-platform-tests/content-security-policy/style-src/style-src-injected-stylesheet-blocked.sub.html bug 203757 (author: dbates@webkit.org) The commit-queue is continuing to process your patch. 1586624 12 382593 commit-queue 2019-11-01 16:07:41 -0700 Comment on attachment 382593 patch for landing Clearing flags on attachment: 382593 Committed r251951: <https://trac.webkit.org/changeset/251951> 1586625 13 commit-queue 2019-11-01 16:07:43 -0700 All reviewed patches have been landed. Closing bug. 1586627 14 webkit-bug-importer 2019-11-01 16:08:20 -0700 <rdar://problem/56831736> 382508 2019-10-31 15:23:37 -0700 2019-10-31 15:45:31 -0700 patch c-backup.diff text/plain 7969 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjUxODg0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDE5LTEwLTMxICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFJlZmFjdG9yIHVzZXMgb2YgU3RydWN0dXJlU3R1YkluZm8gJ3RoaXNHUFInIHRvIGEgdW5pb24g Zm9yIHRoaXNHUFIgYW5kIHByb3RvdHlwZUdQUgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzNjkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgSSdtIGdvaW5nIHRvIGJlIGFkZGluZyBhIHRoaXJkIG92ZXJs b2FkIGZvciB0aGlzIGZpZWxkIGluIHdoZW4gbWFraW5nCisgICAgICAgIEdldEJ5VmFsIGlubGlu ZSBjYWNoaW5nIHBhcnQgb2YgU3RydWN0dXJlU3R1YkluZm8uIEl0J3MgbmljZXIgdG8gZm9yCisg ICAgICAgIGVhY2ggdXNlIGNhc2Ugb2YgdGhpcyBmaWVsZCB0byB1c2UgaXQgYnkgdGhlIHByb3Bl ciBuYW1lLgorCisgICAgICAgICogYnl0ZWNvZGUvQWNjZXNzQ2FzZS5jcHA6CisgICAgICAgIChK U0M6OkFjY2Vzc0Nhc2U6OmdlbmVyYXRlV2l0aEd1YXJkKToKKyAgICAgICAgKEpTQzo6QWNjZXNz Q2FzZTo6Z2VuZXJhdGVJbXBsKToKKyAgICAgICAgKiBieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vz cy5jcHA6CisgICAgICAgIChKU0M6OlBvbHltb3JwaGljQWNjZXNzOjpyZWdlbmVyYXRlKToKKyAg ICAgICAgKiBieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oOgorICAgICAgICAoSlNDOjpBY2Nl c3NHZW5lcmF0aW9uU3RhdGU6OkFjY2Vzc0dlbmVyYXRpb25TdGF0ZSk6CisgICAgICAgICogYnl0 ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uaDoKKyAgICAgICAgKiBqaXQvSklUSW5saW5lQ2FjaGVH ZW5lcmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpKSVRCeUlkR2VuZXJhdG9yOjpKSVRCeUlkR2Vu ZXJhdG9yKToKKyAgICAgICAgKEpTQzo6SklUR2V0QnlJZFdpdGhUaGlzR2VuZXJhdG9yOjpKSVRH ZXRCeUlkV2l0aFRoaXNHZW5lcmF0b3IpOgorICAgICAgICAoSlNDOjpKSVRJbnN0YW5jZU9mR2Vu ZXJhdG9yOjpKSVRJbnN0YW5jZU9mR2VuZXJhdG9yKToKKwogMjAxOS0xMC0zMSAgWXVzdWtlIFN1 enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIE1ha2UgU3RyaW5nI2xv Y2FsZUNvbXBhcmUgZmFzdGVyIGJ5IGlubGluaW5nIEpTR2xvYmFsT2JqZWN0OjpkZWZhdWx0Q29s bGF0b3IKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9BY2Nlc3NDYXNlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQWNjZXNzQ2Fz ZS5jcHAJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9BY2Nlc3NDYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDY1LDcgKzQ2NSw2IEBAIHZvaWQg QWNjZXNzQ2FzZTo6Z2VuZXJhdGVXaXRoR3VhcmQoCiAgICAgVk0mIHZtID0gc3RhdGUubV92bTsK ICAgICBKU1ZhbHVlUmVncyB2YWx1ZVJlZ3MgPSBzdGF0ZS52YWx1ZVJlZ3M7CiAgICAgR1BSUmVn IGJhc2VHUFIgPSBzdGF0ZS5iYXNlR1BSOwotICAgIEdQUlJlZyB0aGlzR1BSID0gc3RhdGUudGhp c0dQUiAhPSBJbnZhbGlkR1BSUmVnID8gc3RhdGUudGhpc0dQUiA6IGJhc2VHUFI7CiAgICAgR1BS UmVnIHNjcmF0Y2hHUFIgPSBzdGF0ZS5zY3JhdGNoR1BSOwogCiAgICAgVU5VU0VEX1BBUkFNKHZt KTsKQEAgLTYwMywyNSArNjAyLDI2IEBAIHZvaWQgQWNjZXNzQ2FzZTo6Z2VuZXJhdGVXaXRoR3Vh cmQoCiAgICAgICAgIAogICAgICAgICBmYWxsVGhyb3VnaC5hcHBlbmQoCiAgICAgICAgICAgICBq aXQuYnJhbmNoUHRyKAotICAgICAgICAgICAgICAgIENDYWxsSGVscGVyczo6Tm90RXF1YWwsIHRo aXNHUFIsCisgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpOb3RFcXVhbCwgc3RhdGUudS5w cm90b3R5cGVHUFIsCiAgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tUHRy KGFzPEluc3RhbmNlT2ZBY2Nlc3NDYXNlPigpLnByb3RvdHlwZSgpKSkpOwogICAgICAgICBicmVh azsKICAgICAgICAgCiAgICAgY2FzZSBJbnN0YW5jZU9mR2VuZXJpYzogewotICAgICAgICAvLyBM ZWdlbmQ6IHZhbHVlID0gYGJhc2UgaW5zdGFuY2VvZiB0aGlzYC4KKyAgICAgICAgR1BSUmVnIHBy b3RvdHlwZUdQUiA9IHN0YXRlLnUucHJvdG90eXBlR1BSOworICAgICAgICAvLyBMZWdlbmQ6IHZh bHVlID0gYGJhc2UgaW5zdGFuY2VvZiBwcm90b3R5cGVHUFJgLgogICAgICAgICAKICAgICAgICAg R1BSUmVnIHZhbHVlR1BSID0gdmFsdWVSZWdzLnBheWxvYWRHUFIoKTsKICAgICAgICAgCiAgICAg ICAgIFNjcmF0Y2hSZWdpc3RlckFsbG9jYXRvciBhbGxvY2F0b3Ioc3R1YkluZm8ucGF0Y2gudXNl ZFJlZ2lzdGVycyk7CiAgICAgICAgIGFsbG9jYXRvci5sb2NrKGJhc2VHUFIpOwogICAgICAgICBh bGxvY2F0b3IubG9jayh2YWx1ZUdQUik7Ci0gICAgICAgIGFsbG9jYXRvci5sb2NrKHRoaXNHUFIp OworICAgICAgICBhbGxvY2F0b3IubG9jayhwcm90b3R5cGVHUFIpOwogICAgICAgICBhbGxvY2F0 b3IubG9jayhzY3JhdGNoR1BSKTsKICAgICAgICAgCiAgICAgICAgIEdQUlJlZyBzY3JhdGNoMkdQ UiA9IGFsbG9jYXRvci5hbGxvY2F0ZVNjcmF0Y2hHUFIoKTsKICAgICAgICAgCiAgICAgICAgIGlm ICghc3RhdGUuc3R1YkluZm8tPnByb3RvdHlwZUlzS25vd25PYmplY3QpCi0gICAgICAgICAgICBz dGF0ZS5mYWlsQW5kSWdub3JlLmFwcGVuZChqaXQuYnJhbmNoSWZOb3RPYmplY3QodGhpc0dQUikp OworICAgICAgICAgICAgc3RhdGUuZmFpbEFuZElnbm9yZS5hcHBlbmQoaml0LmJyYW5jaElmTm90 T2JqZWN0KHByb3RvdHlwZUdQUikpOwogICAgICAgICAKICAgICAgICAgU2NyYXRjaFJlZ2lzdGVy QWxsb2NhdG9yOjpQcmVzZXJ2ZWRTdGF0ZSBwcmVzZXJ2ZWRTdGF0ZSA9CiAgICAgICAgICAgICBh bGxvY2F0b3IucHJlc2VydmVSZXVzZWRSZWdpc3RlcnNCeVB1c2hpbmcoCkBAIC02NTksNyArNjU5 LDcgQEAgdm9pZCBBY2Nlc3NDYXNlOjpnZW5lcmF0ZVdpdGhHdWFyZCgKICNlbmRpZgogICAgICAg ICBqaXQubW92ZShzY3JhdGNoMkdQUiwgdmFsdWVHUFIpOwogICAgICAgICAKLSAgICAgICAgQ0Nh bGxIZWxwZXJzOjpKdW1wIGlzSW5zdGFuY2UgPSBqaXQuYnJhbmNoUHRyKENDYWxsSGVscGVyczo6 RXF1YWwsIHZhbHVlR1BSLCB0aGlzR1BSKTsKKyAgICAgICAgQ0NhbGxIZWxwZXJzOjpKdW1wIGlz SW5zdGFuY2UgPSBqaXQuYnJhbmNoUHRyKENDYWxsSGVscGVyczo6RXF1YWwsIHZhbHVlR1BSLCBw cm90b3R5cGVHUFIpOwogCiAjaWYgVVNFKEpTVkFMVUU2NCkKICAgICAgICAgaml0LmJyYW5jaElm Q2VsbChKU1ZhbHVlUmVncyh2YWx1ZUdQUikpLmxpbmtUbyhsb29wLCAmaml0KTsKQEAgLTcxNiw3 ICs3MTYsNyBAQCB2b2lkIEFjY2Vzc0Nhc2U6OmdlbmVyYXRlSW1wbChBY2Nlc3NHZW5lCiAgICAg Y29uc3QgSWRlbnRpZmllciYgaWRlbnQgPSAqc3RhdGUuaWRlbnQ7CiAgICAgSlNWYWx1ZVJlZ3Mg dmFsdWVSZWdzID0gc3RhdGUudmFsdWVSZWdzOwogICAgIEdQUlJlZyBiYXNlR1BSID0gc3RhdGUu YmFzZUdQUjsKLSAgICBHUFJSZWcgdGhpc0dQUiA9IHN0YXRlLnRoaXNHUFIgIT0gSW52YWxpZEdQ UlJlZyA/IHN0YXRlLnRoaXNHUFIgOiBiYXNlR1BSOworICAgIEdQUlJlZyB0aGlzR1BSID0gc3Rh dGUudS50aGlzR1BSICE9IEludmFsaWRHUFJSZWcgPyBzdGF0ZS51LnRoaXNHUFIgOiBiYXNlR1BS OwogICAgIEdQUlJlZyBzY3JhdGNoR1BSID0gc3RhdGUuc2NyYXRjaEdQUjsKIAogICAgIGZvciAo Y29uc3QgT2JqZWN0UHJvcGVydHlDb25kaXRpb24mIGNvbmRpdGlvbiA6IG1fY29uZGl0aW9uU2V0 KSB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nl c3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5 bW9ycGhpY0FjY2Vzcy5jcHAJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5 NSwxNCArMzk1LDE0IEBAIEFjY2Vzc0dlbmVyYXRpb25SZXN1bHQgUG9seW1vcnBoaWNBY2Nlc3MK ICAgICBzdGF0ZS5pZGVudCA9ICZpZGVudDsKICAgICAKICAgICBzdGF0ZS5iYXNlR1BSID0gc3R1 YkluZm8uYmFzZUdQUigpOwotICAgIHN0YXRlLnRoaXNHUFIgPSBzdHViSW5mby5wYXRjaC50aGlz R1BSOworICAgIHN0YXRlLnUudGhpc0dQUiA9IHN0dWJJbmZvLnBhdGNoLnUudGhpc0dQUjsKICAg ICBzdGF0ZS52YWx1ZVJlZ3MgPSBzdHViSW5mby52YWx1ZVJlZ3MoKTsKIAogICAgIFNjcmF0Y2hS ZWdpc3RlckFsbG9jYXRvciBhbGxvY2F0b3Ioc3R1YkluZm8ucGF0Y2gudXNlZFJlZ2lzdGVycyk7 CiAgICAgc3RhdGUuYWxsb2NhdG9yID0gJmFsbG9jYXRvcjsKICAgICBhbGxvY2F0b3IubG9jayhz dGF0ZS5iYXNlR1BSKTsKLSAgICBpZiAoc3RhdGUudGhpc0dQUiAhPSBJbnZhbGlkR1BSUmVnKQot ICAgICAgICBhbGxvY2F0b3IubG9jayhzdGF0ZS50aGlzR1BSKTsKKyAgICBpZiAoc3RhdGUudS50 aGlzR1BSICE9IEludmFsaWRHUFJSZWcpCisgICAgICAgIGFsbG9jYXRvci5sb2NrKHN0YXRlLnUu dGhpc0dQUik7CiAgICAgYWxsb2NhdG9yLmxvY2soc3RhdGUudmFsdWVSZWdzKTsKICNpZiBVU0Uo SlNWQUxVRTMyXzY0KQogICAgIGFsbG9jYXRvci5sb2NrKHN0dWJJbmZvLnBhdGNoLmJhc2VUYWdH UFIpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNj ZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHlt b3JwaGljQWNjZXNzLmgJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOTMsNiAr MTkzLDcgQEAgc3RydWN0IEFjY2Vzc0dlbmVyYXRpb25TdGF0ZSB7CiAgICAgICAgICwgbV9uZWVk c1RvUmVzdG9yZVJlZ2lzdGVyc0lmRXhjZXB0aW9uKGZhbHNlKQogICAgICAgICAsIG1fY2FsY3Vs YXRlZENhbGxTaXRlSW5kZXgoZmFsc2UpCiAgICAgeworICAgICAgICB1LnRoaXNHUFIgPSBJbnZh bGlkR1BSUmVnOwogICAgIH0KICAgICBWTSYgbV92bTsKICAgICBKU0dsb2JhbE9iamVjdCogbV9n bG9iYWxPYmplY3Q7CkBAIC0yMDUsNyArMjA2LDEwIEBAIHN0cnVjdCBBY2Nlc3NHZW5lcmF0aW9u U3RhdGUgewogICAgIE1hY3JvQXNzZW1ibGVyOjpKdW1wTGlzdCBmYWlsQW5kUmVwYXRjaDsKICAg ICBNYWNyb0Fzc2VtYmxlcjo6SnVtcExpc3QgZmFpbEFuZElnbm9yZTsKICAgICBHUFJSZWcgYmFz ZUdQUiB7IEludmFsaWRHUFJSZWcgfTsKLSAgICBHUFJSZWcgdGhpc0dQUiB7IEludmFsaWRHUFJS ZWcgfTsKKyAgICB1bmlvbiB7CisgICAgICAgIEdQUlJlZyB0aGlzR1BSOworICAgICAgICBHUFJS ZWcgcHJvdG90eXBlR1BSOworICAgIH0gdTsKICAgICBKU1ZhbHVlUmVncyB2YWx1ZVJlZ3M7CiAg ICAgR1BSUmVnIHNjcmF0Y2hHUFIgeyBJbnZhbGlkR1BSUmVnIH07CiAgICAgY29uc3QgSWRlbnRp ZmllciogaWRlbnQ7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0 dXJlU3R1YkluZm8uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv ZGUvU3RydWN0dXJlU3R1YkluZm8uaAkocmV2aXNpb24gMjUxODcxKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmgJKHdvcmtpbmcgY29weSkKQEAg LTIwMSw3ICsyMDEsMTAgQEAgcHVibGljOgogCiAgICAgICAgIEdQUlJlZyBiYXNlR1BSOwogICAg ICAgICBHUFJSZWcgdmFsdWVHUFI7Ci0gICAgICAgIEdQUlJlZyB0aGlzR1BSOworICAgICAgICB1 bmlvbiB7CisgICAgICAgICAgICBHUFJSZWcgdGhpc0dQUjsKKyAgICAgICAgICAgIEdQUlJlZyBw cm90b3R5cGVHUFI7CisgICAgICAgIH0gdTsKICNpZiBVU0UoSlNWQUxVRTMyXzY0KQogICAgICAg ICBHUFJSZWcgdmFsdWVUYWdHUFI7CiAgICAgICAgIEdQUlJlZyBiYXNlVGFnR1BSOwpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVDYWNoZUdlbmVyYXRvci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVDYWNoZUdlbmVy YXRvci5jcHAJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv SklUSW5saW5lQ2FjaGVHZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NCw3ICs3NCw3 IEBAIEpJVEJ5SWRHZW5lcmF0b3I6OkpJVEJ5SWRHZW5lcmF0b3IoCiB7CiAgICAgbV9zdHViSW5m by0+cGF0Y2guYmFzZUdQUiA9IGJhc2UucGF5bG9hZEdQUigpOwogICAgIG1fc3R1YkluZm8tPnBh dGNoLnZhbHVlR1BSID0gdmFsdWUucGF5bG9hZEdQUigpOwotICAgIG1fc3R1YkluZm8tPnBhdGNo LnRoaXNHUFIgPSBJbnZhbGlkR1BSUmVnOworICAgIG1fc3R1YkluZm8tPnBhdGNoLnUudGhpc0dQ UiA9IEludmFsaWRHUFJSZWc7CiAjaWYgVVNFKEpTVkFMVUUzMl82NCkKICAgICBtX3N0dWJJbmZv LT5wYXRjaC5iYXNlVGFnR1BSID0gYmFzZS50YWdHUFIoKTsKICAgICBtX3N0dWJJbmZvLT5wYXRj aC52YWx1ZVRhZ0dQUiA9IHZhbHVlLnRhZ0dQUigpOwpAQCAtMTIyLDcgKzEyMiw3IEBAIEpJVEdl dEJ5SWRXaXRoVGhpc0dlbmVyYXRvcjo6SklUR2V0QnlJZFcKIHsKICAgICBSRUxFQVNFX0FTU0VS VCh0aGlzUmVncy5wYXlsb2FkR1BSKCkgIT0gdGhpc1JlZ3MudGFnR1BSKCkpOwogCi0gICAgbV9z dHViSW5mby0+cGF0Y2gudGhpc0dQUiA9IHRoaXNSZWdzLnBheWxvYWRHUFIoKTsKKyAgICBtX3N0 dWJJbmZvLT5wYXRjaC51LnRoaXNHUFIgPSB0aGlzUmVncy5wYXlsb2FkR1BSKCk7CiAjaWYgVVNF KEpTVkFMVUUzMl82NCkKICAgICBtX3N0dWJJbmZvLT5wYXRjaC50aGlzVGFnR1BSID0gdGhpc1Jl Z3MudGFnR1BSKCk7CiAjZW5kaWYKQEAgLTE4Niw3ICsxODYsNyBAQCBKSVRJbnN0YW5jZU9mR2Vu ZXJhdG9yOjpKSVRJbnN0YW5jZU9mR2VuCiB7CiAgICAgbV9zdHViSW5mby0+cGF0Y2guYmFzZUdQ UiA9IHZhbHVlOwogICAgIG1fc3R1YkluZm8tPnBhdGNoLnZhbHVlR1BSID0gcmVzdWx0OwotICAg IG1fc3R1YkluZm8tPnBhdGNoLnRoaXNHUFIgPSBwcm90b3R5cGU7CisgICAgbV9zdHViSW5mby0+ cGF0Y2gudS5wcm90b3R5cGVHUFIgPSBwcm90b3R5cGU7CiAjaWYgVVNFKEpTVkFMVUUzMl82NCkK ICAgICBtX3N0dWJJbmZvLT5wYXRjaC5iYXNlVGFnR1BSID0gSW52YWxpZEdQUlJlZzsKICAgICBt X3N0dWJJbmZvLT5wYXRjaC52YWx1ZVRhZ0dQUiA9IEludmFsaWRHUFJSZWc7Cg== 382512 2019-10-31 15:45:31 -0700 2019-11-01 10:45:41 -0700 patch for landing c-backup.diff text/plain 7975 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjUxODg0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDE5LTEwLTMxICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFJlZmFjdG9yIHVzZXMgb2YgU3RydWN0dXJlU3R1YkluZm8gJ3RoaXNHUFInIHRvIGEgdW5pb24g Zm9yIHRoaXNHUFIgYW5kIHByb3RvdHlwZUdQUgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzNjkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBM YW0gYW5kIFl1c3VrZSBTdXp1a2kuCisKKyAgICAgICAgSSdtIGdvaW5nIHRvIGJlIGFkZGluZyBh IHRoaXJkIG92ZXJsb2FkIGZvciB0aGlzIGZpZWxkIHdoZW4gbWFraW5nCisgICAgICAgIEdldEJ5 VmFsIGlubGluZSBjYWNoaW5nIHBhcnQgb2YgU3RydWN0dXJlU3R1YkluZm8uIEl0J3MgbmljZXIg Zm9yCisgICAgICAgIGVhY2ggdXNlIGNhc2Ugb2YgdGhpcyBmaWVsZCB0byB1c2UgaXQgYnkgdGhl IHByb3BlciBuYW1lLgorCisgICAgICAgICogYnl0ZWNvZGUvQWNjZXNzQ2FzZS5jcHA6CisgICAg ICAgIChKU0M6OkFjY2Vzc0Nhc2U6OmdlbmVyYXRlV2l0aEd1YXJkKToKKyAgICAgICAgKEpTQzo6 QWNjZXNzQ2FzZTo6Z2VuZXJhdGVJbXBsKToKKyAgICAgICAgKiBieXRlY29kZS9Qb2x5bW9ycGhp Y0FjY2Vzcy5jcHA6CisgICAgICAgIChKU0M6OlBvbHltb3JwaGljQWNjZXNzOjpyZWdlbmVyYXRl KToKKyAgICAgICAgKiBieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oOgorICAgICAgICAoSlND OjpBY2Nlc3NHZW5lcmF0aW9uU3RhdGU6OkFjY2Vzc0dlbmVyYXRpb25TdGF0ZSk6CisgICAgICAg ICogYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uaDoKKyAgICAgICAgKiBqaXQvSklUSW5saW5l Q2FjaGVHZW5lcmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpKSVRCeUlkR2VuZXJhdG9yOjpKSVRC eUlkR2VuZXJhdG9yKToKKyAgICAgICAgKEpTQzo6SklUR2V0QnlJZFdpdGhUaGlzR2VuZXJhdG9y OjpKSVRHZXRCeUlkV2l0aFRoaXNHZW5lcmF0b3IpOgorICAgICAgICAoSlNDOjpKSVRJbnN0YW5j ZU9mR2VuZXJhdG9yOjpKSVRJbnN0YW5jZU9mR2VuZXJhdG9yKToKKwogMjAxOS0xMC0zMSAgWXVz dWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIE1ha2UgU3Ry aW5nI2xvY2FsZUNvbXBhcmUgZmFzdGVyIGJ5IGlubGluaW5nIEpTR2xvYmFsT2JqZWN0OjpkZWZh dWx0Q29sbGF0b3IKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9BY2Nlc3ND YXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQWNj ZXNzQ2FzZS5jcHAJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9BY2Nlc3NDYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDY1LDcgKzQ2NSw2IEBA IHZvaWQgQWNjZXNzQ2FzZTo6Z2VuZXJhdGVXaXRoR3VhcmQoCiAgICAgVk0mIHZtID0gc3RhdGUu bV92bTsKICAgICBKU1ZhbHVlUmVncyB2YWx1ZVJlZ3MgPSBzdGF0ZS52YWx1ZVJlZ3M7CiAgICAg R1BSUmVnIGJhc2VHUFIgPSBzdGF0ZS5iYXNlR1BSOwotICAgIEdQUlJlZyB0aGlzR1BSID0gc3Rh dGUudGhpc0dQUiAhPSBJbnZhbGlkR1BSUmVnID8gc3RhdGUudGhpc0dQUiA6IGJhc2VHUFI7CiAg ICAgR1BSUmVnIHNjcmF0Y2hHUFIgPSBzdGF0ZS5zY3JhdGNoR1BSOwogCiAgICAgVU5VU0VEX1BB UkFNKHZtKTsKQEAgLTYwMywyNSArNjAyLDI2IEBAIHZvaWQgQWNjZXNzQ2FzZTo6Z2VuZXJhdGVX aXRoR3VhcmQoCiAgICAgICAgIAogICAgICAgICBmYWxsVGhyb3VnaC5hcHBlbmQoCiAgICAgICAg ICAgICBqaXQuYnJhbmNoUHRyKAotICAgICAgICAgICAgICAgIENDYWxsSGVscGVyczo6Tm90RXF1 YWwsIHRoaXNHUFIsCisgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpOb3RFcXVhbCwgc3Rh dGUudS5wcm90b3R5cGVHUFIsCiAgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpUcnVzdGVk SW1tUHRyKGFzPEluc3RhbmNlT2ZBY2Nlc3NDYXNlPigpLnByb3RvdHlwZSgpKSkpOwogICAgICAg ICBicmVhazsKICAgICAgICAgCiAgICAgY2FzZSBJbnN0YW5jZU9mR2VuZXJpYzogewotICAgICAg ICAvLyBMZWdlbmQ6IHZhbHVlID0gYGJhc2UgaW5zdGFuY2VvZiB0aGlzYC4KKyAgICAgICAgR1BS UmVnIHByb3RvdHlwZUdQUiA9IHN0YXRlLnUucHJvdG90eXBlR1BSOworICAgICAgICAvLyBMZWdl bmQ6IHZhbHVlID0gYGJhc2UgaW5zdGFuY2VvZiBwcm90b3R5cGVHUFJgLgogICAgICAgICAKICAg ICAgICAgR1BSUmVnIHZhbHVlR1BSID0gdmFsdWVSZWdzLnBheWxvYWRHUFIoKTsKICAgICAgICAg CiAgICAgICAgIFNjcmF0Y2hSZWdpc3RlckFsbG9jYXRvciBhbGxvY2F0b3Ioc3R1YkluZm8ucGF0 Y2gudXNlZFJlZ2lzdGVycyk7CiAgICAgICAgIGFsbG9jYXRvci5sb2NrKGJhc2VHUFIpOwogICAg ICAgICBhbGxvY2F0b3IubG9jayh2YWx1ZUdQUik7Ci0gICAgICAgIGFsbG9jYXRvci5sb2NrKHRo aXNHUFIpOworICAgICAgICBhbGxvY2F0b3IubG9jayhwcm90b3R5cGVHUFIpOwogICAgICAgICBh bGxvY2F0b3IubG9jayhzY3JhdGNoR1BSKTsKICAgICAgICAgCiAgICAgICAgIEdQUlJlZyBzY3Jh dGNoMkdQUiA9IGFsbG9jYXRvci5hbGxvY2F0ZVNjcmF0Y2hHUFIoKTsKICAgICAgICAgCiAgICAg ICAgIGlmICghc3RhdGUuc3R1YkluZm8tPnByb3RvdHlwZUlzS25vd25PYmplY3QpCi0gICAgICAg ICAgICBzdGF0ZS5mYWlsQW5kSWdub3JlLmFwcGVuZChqaXQuYnJhbmNoSWZOb3RPYmplY3QodGhp c0dQUikpOworICAgICAgICAgICAgc3RhdGUuZmFpbEFuZElnbm9yZS5hcHBlbmQoaml0LmJyYW5j aElmTm90T2JqZWN0KHByb3RvdHlwZUdQUikpOwogICAgICAgICAKICAgICAgICAgU2NyYXRjaFJl Z2lzdGVyQWxsb2NhdG9yOjpQcmVzZXJ2ZWRTdGF0ZSBwcmVzZXJ2ZWRTdGF0ZSA9CiAgICAgICAg ICAgICBhbGxvY2F0b3IucHJlc2VydmVSZXVzZWRSZWdpc3RlcnNCeVB1c2hpbmcoCkBAIC02NTks NyArNjU5LDcgQEAgdm9pZCBBY2Nlc3NDYXNlOjpnZW5lcmF0ZVdpdGhHdWFyZCgKICNlbmRpZgog ICAgICAgICBqaXQubW92ZShzY3JhdGNoMkdQUiwgdmFsdWVHUFIpOwogICAgICAgICAKLSAgICAg ICAgQ0NhbGxIZWxwZXJzOjpKdW1wIGlzSW5zdGFuY2UgPSBqaXQuYnJhbmNoUHRyKENDYWxsSGVs cGVyczo6RXF1YWwsIHZhbHVlR1BSLCB0aGlzR1BSKTsKKyAgICAgICAgQ0NhbGxIZWxwZXJzOjpK dW1wIGlzSW5zdGFuY2UgPSBqaXQuYnJhbmNoUHRyKENDYWxsSGVscGVyczo6RXF1YWwsIHZhbHVl R1BSLCBwcm90b3R5cGVHUFIpOwogCiAjaWYgVVNFKEpTVkFMVUU2NCkKICAgICAgICAgaml0LmJy YW5jaElmQ2VsbChKU1ZhbHVlUmVncyh2YWx1ZUdQUikpLmxpbmtUbyhsb29wLCAmaml0KTsKQEAg LTcxNiw3ICs3MTYsNyBAQCB2b2lkIEFjY2Vzc0Nhc2U6OmdlbmVyYXRlSW1wbChBY2Nlc3NHZW5l CiAgICAgY29uc3QgSWRlbnRpZmllciYgaWRlbnQgPSAqc3RhdGUuaWRlbnQ7CiAgICAgSlNWYWx1 ZVJlZ3MgdmFsdWVSZWdzID0gc3RhdGUudmFsdWVSZWdzOwogICAgIEdQUlJlZyBiYXNlR1BSID0g c3RhdGUuYmFzZUdQUjsKLSAgICBHUFJSZWcgdGhpc0dQUiA9IHN0YXRlLnRoaXNHUFIgIT0gSW52 YWxpZEdQUlJlZyA/IHN0YXRlLnRoaXNHUFIgOiBiYXNlR1BSOworICAgIEdQUlJlZyB0aGlzR1BS ID0gc3RhdGUudS50aGlzR1BSICE9IEludmFsaWRHUFJSZWcgPyBzdGF0ZS51LnRoaXNHUFIgOiBi YXNlR1BSOwogICAgIEdQUlJlZyBzY3JhdGNoR1BSID0gc3RhdGUuc2NyYXRjaEdQUjsKIAogICAg IGZvciAoY29uc3QgT2JqZWN0UHJvcGVydHlDb25kaXRpb24mIGNvbmRpdGlvbiA6IG1fY29uZGl0 aW9uU2V0KSB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBo aWNBY2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM5NSwxNCArMzk1LDE0IEBAIEFjY2Vzc0dlbmVyYXRpb25SZXN1bHQgUG9seW1vcnBoaWNB Y2Nlc3MKICAgICBzdGF0ZS5pZGVudCA9ICZpZGVudDsKICAgICAKICAgICBzdGF0ZS5iYXNlR1BS ID0gc3R1YkluZm8uYmFzZUdQUigpOwotICAgIHN0YXRlLnRoaXNHUFIgPSBzdHViSW5mby5wYXRj aC50aGlzR1BSOworICAgIHN0YXRlLnUudGhpc0dQUiA9IHN0dWJJbmZvLnBhdGNoLnUudGhpc0dQ UjsKICAgICBzdGF0ZS52YWx1ZVJlZ3MgPSBzdHViSW5mby52YWx1ZVJlZ3MoKTsKIAogICAgIFNj cmF0Y2hSZWdpc3RlckFsbG9jYXRvciBhbGxvY2F0b3Ioc3R1YkluZm8ucGF0Y2gudXNlZFJlZ2lz dGVycyk7CiAgICAgc3RhdGUuYWxsb2NhdG9yID0gJmFsbG9jYXRvcjsKICAgICBhbGxvY2F0b3Iu bG9jayhzdGF0ZS5iYXNlR1BSKTsKLSAgICBpZiAoc3RhdGUudGhpc0dQUiAhPSBJbnZhbGlkR1BS UmVnKQotICAgICAgICBhbGxvY2F0b3IubG9jayhzdGF0ZS50aGlzR1BSKTsKKyAgICBpZiAoc3Rh dGUudS50aGlzR1BSICE9IEludmFsaWRHUFJSZWcpCisgICAgICAgIGFsbG9jYXRvci5sb2NrKHN0 YXRlLnUudGhpc0dQUik7CiAgICAgYWxsb2NhdG9yLmxvY2soc3RhdGUudmFsdWVSZWdzKTsKICNp ZiBVU0UoSlNWQUxVRTMyXzY0KQogICAgIGFsbG9jYXRvci5sb2NrKHN0dWJJbmZvLnBhdGNoLmJh c2VUYWdHUFIpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3Jw aGljQWNjZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L1BvbHltb3JwaGljQWNjZXNzLmgJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0x OTMsNiArMTkzLDcgQEAgc3RydWN0IEFjY2Vzc0dlbmVyYXRpb25TdGF0ZSB7CiAgICAgICAgICwg bV9uZWVkc1RvUmVzdG9yZVJlZ2lzdGVyc0lmRXhjZXB0aW9uKGZhbHNlKQogICAgICAgICAsIG1f Y2FsY3VsYXRlZENhbGxTaXRlSW5kZXgoZmFsc2UpCiAgICAgeworICAgICAgICB1LnRoaXNHUFIg PSBJbnZhbGlkR1BSUmVnOwogICAgIH0KICAgICBWTSYgbV92bTsKICAgICBKU0dsb2JhbE9iamVj dCogbV9nbG9iYWxPYmplY3Q7CkBAIC0yMDUsNyArMjA2LDEwIEBAIHN0cnVjdCBBY2Nlc3NHZW5l cmF0aW9uU3RhdGUgewogICAgIE1hY3JvQXNzZW1ibGVyOjpKdW1wTGlzdCBmYWlsQW5kUmVwYXRj aDsKICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVtcExpc3QgZmFpbEFuZElnbm9yZTsKICAgICBHUFJS ZWcgYmFzZUdQUiB7IEludmFsaWRHUFJSZWcgfTsKLSAgICBHUFJSZWcgdGhpc0dQUiB7IEludmFs aWRHUFJSZWcgfTsKKyAgICB1bmlvbiB7CisgICAgICAgIEdQUlJlZyB0aGlzR1BSOworICAgICAg ICBHUFJSZWcgcHJvdG90eXBlR1BSOworICAgIH0gdTsKICAgICBKU1ZhbHVlUmVncyB2YWx1ZVJl Z3M7CiAgICAgR1BSUmVnIHNjcmF0Y2hHUFIgeyBJbnZhbGlkR1BSUmVnIH07CiAgICAgY29uc3Qg SWRlbnRpZmllciogaWRlbnQ7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv U3RydWN0dXJlU3R1YkluZm8uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uaAkocmV2aXNpb24gMjUxODcxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmgJKHdvcmtpbmcgY29w eSkKQEAgLTIwMSw3ICsyMDEsMTAgQEAgcHVibGljOgogCiAgICAgICAgIEdQUlJlZyBiYXNlR1BS OwogICAgICAgICBHUFJSZWcgdmFsdWVHUFI7Ci0gICAgICAgIEdQUlJlZyB0aGlzR1BSOworICAg ICAgICB1bmlvbiB7CisgICAgICAgICAgICBHUFJSZWcgdGhpc0dQUjsKKyAgICAgICAgICAgIEdQ UlJlZyBwcm90b3R5cGVHUFI7CisgICAgICAgIH0gdTsKICNpZiBVU0UoSlNWQUxVRTMyXzY0KQog ICAgICAgICBHUFJSZWcgdmFsdWVUYWdHUFI7CiAgICAgICAgIEdQUlJlZyBiYXNlVGFnR1BSOwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVDYWNoZUdlbmVyYXRvci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVDYWNo ZUdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUSW5saW5lQ2FjaGVHZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NCw3 ICs3NCw3IEBAIEpJVEJ5SWRHZW5lcmF0b3I6OkpJVEJ5SWRHZW5lcmF0b3IoCiB7CiAgICAgbV9z dHViSW5mby0+cGF0Y2guYmFzZUdQUiA9IGJhc2UucGF5bG9hZEdQUigpOwogICAgIG1fc3R1Yklu Zm8tPnBhdGNoLnZhbHVlR1BSID0gdmFsdWUucGF5bG9hZEdQUigpOwotICAgIG1fc3R1YkluZm8t PnBhdGNoLnRoaXNHUFIgPSBJbnZhbGlkR1BSUmVnOworICAgIG1fc3R1YkluZm8tPnBhdGNoLnUu dGhpc0dQUiA9IEludmFsaWRHUFJSZWc7CiAjaWYgVVNFKEpTVkFMVUUzMl82NCkKICAgICBtX3N0 dWJJbmZvLT5wYXRjaC5iYXNlVGFnR1BSID0gYmFzZS50YWdHUFIoKTsKICAgICBtX3N0dWJJbmZv LT5wYXRjaC52YWx1ZVRhZ0dQUiA9IHZhbHVlLnRhZ0dQUigpOwpAQCAtMTIyLDcgKzEyMiw3IEBA IEpJVEdldEJ5SWRXaXRoVGhpc0dlbmVyYXRvcjo6SklUR2V0QnlJZFcKIHsKICAgICBSRUxFQVNF X0FTU0VSVCh0aGlzUmVncy5wYXlsb2FkR1BSKCkgIT0gdGhpc1JlZ3MudGFnR1BSKCkpOwogCi0g ICAgbV9zdHViSW5mby0+cGF0Y2gudGhpc0dQUiA9IHRoaXNSZWdzLnBheWxvYWRHUFIoKTsKKyAg ICBtX3N0dWJJbmZvLT5wYXRjaC51LnRoaXNHUFIgPSB0aGlzUmVncy5wYXlsb2FkR1BSKCk7CiAj aWYgVVNFKEpTVkFMVUUzMl82NCkKICAgICBtX3N0dWJJbmZvLT5wYXRjaC50aGlzVGFnR1BSID0g dGhpc1JlZ3MudGFnR1BSKCk7CiAjZW5kaWYKQEAgLTE4Niw3ICsxODYsNyBAQCBKSVRJbnN0YW5j ZU9mR2VuZXJhdG9yOjpKSVRJbnN0YW5jZU9mR2VuCiB7CiAgICAgbV9zdHViSW5mby0+cGF0Y2gu YmFzZUdQUiA9IHZhbHVlOwogICAgIG1fc3R1YkluZm8tPnBhdGNoLnZhbHVlR1BSID0gcmVzdWx0 OwotICAgIG1fc3R1YkluZm8tPnBhdGNoLnRoaXNHUFIgPSBwcm90b3R5cGU7CisgICAgbV9zdHVi SW5mby0+cGF0Y2gudS5wcm90b3R5cGVHUFIgPSBwcm90b3R5cGU7CiAjaWYgVVNFKEpTVkFMVUUz Ml82NCkKICAgICBtX3N0dWJJbmZvLT5wYXRjaC5iYXNlVGFnR1BSID0gSW52YWxpZEdQUlJlZzsK ICAgICBtX3N0dWJJbmZvLT5wYXRjaC52YWx1ZVRhZ0dQUiA9IEludmFsaWRHUFJSZWc7Cg== 382593 2019-11-01 10:45:41 -0700 2019-11-01 16:07:41 -0700 patch for landing patch.diff text/plain 7975 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjUxODg0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDE5LTEwLTMxICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFJlZmFjdG9yIHVzZXMgb2YgU3RydWN0dXJlU3R1YkluZm8gJ3RoaXNHUFInIHRvIGEgdW5pb24g Zm9yIHRoaXNHUFIgYW5kIHByb3RvdHlwZUdQUgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzNjkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBM YW0gYW5kIFl1c3VrZSBTdXp1a2kuCisKKyAgICAgICAgSSdtIGdvaW5nIHRvIGJlIGFkZGluZyBh IHRoaXJkIG92ZXJsb2FkIGZvciB0aGlzIGZpZWxkIHdoZW4gbWFraW5nCisgICAgICAgIEdldEJ5 VmFsIGlubGluZSBjYWNoaW5nIHBhcnQgb2YgU3RydWN0dXJlU3R1YkluZm8uIEl0J3MgbmljZXIg Zm9yCisgICAgICAgIGVhY2ggdXNlIGNhc2Ugb2YgdGhpcyBmaWVsZCB0byB1c2UgaXQgYnkgdGhl IHByb3BlciBuYW1lLgorCisgICAgICAgICogYnl0ZWNvZGUvQWNjZXNzQ2FzZS5jcHA6CisgICAg ICAgIChKU0M6OkFjY2Vzc0Nhc2U6OmdlbmVyYXRlV2l0aEd1YXJkKToKKyAgICAgICAgKEpTQzo6 QWNjZXNzQ2FzZTo6Z2VuZXJhdGVJbXBsKToKKyAgICAgICAgKiBieXRlY29kZS9Qb2x5bW9ycGhp Y0FjY2Vzcy5jcHA6CisgICAgICAgIChKU0M6OlBvbHltb3JwaGljQWNjZXNzOjpyZWdlbmVyYXRl KToKKyAgICAgICAgKiBieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oOgorICAgICAgICAoSlND OjpBY2Nlc3NHZW5lcmF0aW9uU3RhdGU6OkFjY2Vzc0dlbmVyYXRpb25TdGF0ZSk6CisgICAgICAg ICogYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uaDoKKyAgICAgICAgKiBqaXQvSklUSW5saW5l Q2FjaGVHZW5lcmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpKSVRCeUlkR2VuZXJhdG9yOjpKSVRC eUlkR2VuZXJhdG9yKToKKyAgICAgICAgKEpTQzo6SklUR2V0QnlJZFdpdGhUaGlzR2VuZXJhdG9y OjpKSVRHZXRCeUlkV2l0aFRoaXNHZW5lcmF0b3IpOgorICAgICAgICAoSlNDOjpKSVRJbnN0YW5j ZU9mR2VuZXJhdG9yOjpKSVRJbnN0YW5jZU9mR2VuZXJhdG9yKToKKwogMjAxOS0xMC0zMSAgWXVz dWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIE1ha2UgU3Ry aW5nI2xvY2FsZUNvbXBhcmUgZmFzdGVyIGJ5IGlubGluaW5nIEpTR2xvYmFsT2JqZWN0OjpkZWZh dWx0Q29sbGF0b3IKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9BY2Nlc3ND YXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQWNj ZXNzQ2FzZS5jcHAJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9BY2Nlc3NDYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDY1LDcgKzQ2NSw2IEBA IHZvaWQgQWNjZXNzQ2FzZTo6Z2VuZXJhdGVXaXRoR3VhcmQoCiAgICAgVk0mIHZtID0gc3RhdGUu bV92bTsKICAgICBKU1ZhbHVlUmVncyB2YWx1ZVJlZ3MgPSBzdGF0ZS52YWx1ZVJlZ3M7CiAgICAg R1BSUmVnIGJhc2VHUFIgPSBzdGF0ZS5iYXNlR1BSOwotICAgIEdQUlJlZyB0aGlzR1BSID0gc3Rh dGUudGhpc0dQUiAhPSBJbnZhbGlkR1BSUmVnID8gc3RhdGUudGhpc0dQUiA6IGJhc2VHUFI7CiAg ICAgR1BSUmVnIHNjcmF0Y2hHUFIgPSBzdGF0ZS5zY3JhdGNoR1BSOwogCiAgICAgVU5VU0VEX1BB UkFNKHZtKTsKQEAgLTYwMywyNSArNjAyLDI2IEBAIHZvaWQgQWNjZXNzQ2FzZTo6Z2VuZXJhdGVX aXRoR3VhcmQoCiAgICAgICAgIAogICAgICAgICBmYWxsVGhyb3VnaC5hcHBlbmQoCiAgICAgICAg ICAgICBqaXQuYnJhbmNoUHRyKAotICAgICAgICAgICAgICAgIENDYWxsSGVscGVyczo6Tm90RXF1 YWwsIHRoaXNHUFIsCisgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpOb3RFcXVhbCwgc3Rh dGUudS5wcm90b3R5cGVHUFIsCiAgICAgICAgICAgICAgICAgQ0NhbGxIZWxwZXJzOjpUcnVzdGVk SW1tUHRyKGFzPEluc3RhbmNlT2ZBY2Nlc3NDYXNlPigpLnByb3RvdHlwZSgpKSkpOwogICAgICAg ICBicmVhazsKICAgICAgICAgCiAgICAgY2FzZSBJbnN0YW5jZU9mR2VuZXJpYzogewotICAgICAg ICAvLyBMZWdlbmQ6IHZhbHVlID0gYGJhc2UgaW5zdGFuY2VvZiB0aGlzYC4KKyAgICAgICAgR1BS UmVnIHByb3RvdHlwZUdQUiA9IHN0YXRlLnUucHJvdG90eXBlR1BSOworICAgICAgICAvLyBMZWdl bmQ6IHZhbHVlID0gYGJhc2UgaW5zdGFuY2VvZiBwcm90b3R5cGVHUFJgLgogICAgICAgICAKICAg ICAgICAgR1BSUmVnIHZhbHVlR1BSID0gdmFsdWVSZWdzLnBheWxvYWRHUFIoKTsKICAgICAgICAg CiAgICAgICAgIFNjcmF0Y2hSZWdpc3RlckFsbG9jYXRvciBhbGxvY2F0b3Ioc3R1YkluZm8ucGF0 Y2gudXNlZFJlZ2lzdGVycyk7CiAgICAgICAgIGFsbG9jYXRvci5sb2NrKGJhc2VHUFIpOwogICAg ICAgICBhbGxvY2F0b3IubG9jayh2YWx1ZUdQUik7Ci0gICAgICAgIGFsbG9jYXRvci5sb2NrKHRo aXNHUFIpOworICAgICAgICBhbGxvY2F0b3IubG9jayhwcm90b3R5cGVHUFIpOwogICAgICAgICBh bGxvY2F0b3IubG9jayhzY3JhdGNoR1BSKTsKICAgICAgICAgCiAgICAgICAgIEdQUlJlZyBzY3Jh dGNoMkdQUiA9IGFsbG9jYXRvci5hbGxvY2F0ZVNjcmF0Y2hHUFIoKTsKICAgICAgICAgCiAgICAg ICAgIGlmICghc3RhdGUuc3R1YkluZm8tPnByb3RvdHlwZUlzS25vd25PYmplY3QpCi0gICAgICAg ICAgICBzdGF0ZS5mYWlsQW5kSWdub3JlLmFwcGVuZChqaXQuYnJhbmNoSWZOb3RPYmplY3QodGhp c0dQUikpOworICAgICAgICAgICAgc3RhdGUuZmFpbEFuZElnbm9yZS5hcHBlbmQoaml0LmJyYW5j aElmTm90T2JqZWN0KHByb3RvdHlwZUdQUikpOwogICAgICAgICAKICAgICAgICAgU2NyYXRjaFJl Z2lzdGVyQWxsb2NhdG9yOjpQcmVzZXJ2ZWRTdGF0ZSBwcmVzZXJ2ZWRTdGF0ZSA9CiAgICAgICAg ICAgICBhbGxvY2F0b3IucHJlc2VydmVSZXVzZWRSZWdpc3RlcnNCeVB1c2hpbmcoCkBAIC02NTks NyArNjU5LDcgQEAgdm9pZCBBY2Nlc3NDYXNlOjpnZW5lcmF0ZVdpdGhHdWFyZCgKICNlbmRpZgog ICAgICAgICBqaXQubW92ZShzY3JhdGNoMkdQUiwgdmFsdWVHUFIpOwogICAgICAgICAKLSAgICAg ICAgQ0NhbGxIZWxwZXJzOjpKdW1wIGlzSW5zdGFuY2UgPSBqaXQuYnJhbmNoUHRyKENDYWxsSGVs cGVyczo6RXF1YWwsIHZhbHVlR1BSLCB0aGlzR1BSKTsKKyAgICAgICAgQ0NhbGxIZWxwZXJzOjpK dW1wIGlzSW5zdGFuY2UgPSBqaXQuYnJhbmNoUHRyKENDYWxsSGVscGVyczo6RXF1YWwsIHZhbHVl R1BSLCBwcm90b3R5cGVHUFIpOwogCiAjaWYgVVNFKEpTVkFMVUU2NCkKICAgICAgICAgaml0LmJy YW5jaElmQ2VsbChKU1ZhbHVlUmVncyh2YWx1ZUdQUikpLmxpbmtUbyhsb29wLCAmaml0KTsKQEAg LTcxNiw3ICs3MTYsNyBAQCB2b2lkIEFjY2Vzc0Nhc2U6OmdlbmVyYXRlSW1wbChBY2Nlc3NHZW5l CiAgICAgY29uc3QgSWRlbnRpZmllciYgaWRlbnQgPSAqc3RhdGUuaWRlbnQ7CiAgICAgSlNWYWx1 ZVJlZ3MgdmFsdWVSZWdzID0gc3RhdGUudmFsdWVSZWdzOwogICAgIEdQUlJlZyBiYXNlR1BSID0g c3RhdGUuYmFzZUdQUjsKLSAgICBHUFJSZWcgdGhpc0dQUiA9IHN0YXRlLnRoaXNHUFIgIT0gSW52 YWxpZEdQUlJlZyA/IHN0YXRlLnRoaXNHUFIgOiBiYXNlR1BSOworICAgIEdQUlJlZyB0aGlzR1BS ID0gc3RhdGUudS50aGlzR1BSICE9IEludmFsaWRHUFJSZWcgPyBzdGF0ZS51LnRoaXNHUFIgOiBi YXNlR1BSOwogICAgIEdQUlJlZyBzY3JhdGNoR1BSID0gc3RhdGUuc2NyYXRjaEdQUjsKIAogICAg IGZvciAoY29uc3QgT2JqZWN0UHJvcGVydHlDb25kaXRpb24mIGNvbmRpdGlvbiA6IG1fY29uZGl0 aW9uU2V0KSB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBo aWNBY2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM5NSwxNCArMzk1LDE0IEBAIEFjY2Vzc0dlbmVyYXRpb25SZXN1bHQgUG9seW1vcnBoaWNB Y2Nlc3MKICAgICBzdGF0ZS5pZGVudCA9ICZpZGVudDsKICAgICAKICAgICBzdGF0ZS5iYXNlR1BS ID0gc3R1YkluZm8uYmFzZUdQUigpOwotICAgIHN0YXRlLnRoaXNHUFIgPSBzdHViSW5mby5wYXRj aC50aGlzR1BSOworICAgIHN0YXRlLnUudGhpc0dQUiA9IHN0dWJJbmZvLnBhdGNoLnUudGhpc0dQ UjsKICAgICBzdGF0ZS52YWx1ZVJlZ3MgPSBzdHViSW5mby52YWx1ZVJlZ3MoKTsKIAogICAgIFNj cmF0Y2hSZWdpc3RlckFsbG9jYXRvciBhbGxvY2F0b3Ioc3R1YkluZm8ucGF0Y2gudXNlZFJlZ2lz dGVycyk7CiAgICAgc3RhdGUuYWxsb2NhdG9yID0gJmFsbG9jYXRvcjsKICAgICBhbGxvY2F0b3Iu bG9jayhzdGF0ZS5iYXNlR1BSKTsKLSAgICBpZiAoc3RhdGUudGhpc0dQUiAhPSBJbnZhbGlkR1BS UmVnKQotICAgICAgICBhbGxvY2F0b3IubG9jayhzdGF0ZS50aGlzR1BSKTsKKyAgICBpZiAoc3Rh dGUudS50aGlzR1BSICE9IEludmFsaWRHUFJSZWcpCisgICAgICAgIGFsbG9jYXRvci5sb2NrKHN0 YXRlLnUudGhpc0dQUik7CiAgICAgYWxsb2NhdG9yLmxvY2soc3RhdGUudmFsdWVSZWdzKTsKICNp ZiBVU0UoSlNWQUxVRTMyXzY0KQogICAgIGFsbG9jYXRvci5sb2NrKHN0dWJJbmZvLnBhdGNoLmJh c2VUYWdHUFIpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3Jw aGljQWNjZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L1BvbHltb3JwaGljQWNjZXNzLmgJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0x OTMsNiArMTkzLDcgQEAgc3RydWN0IEFjY2Vzc0dlbmVyYXRpb25TdGF0ZSB7CiAgICAgICAgICwg bV9uZWVkc1RvUmVzdG9yZVJlZ2lzdGVyc0lmRXhjZXB0aW9uKGZhbHNlKQogICAgICAgICAsIG1f Y2FsY3VsYXRlZENhbGxTaXRlSW5kZXgoZmFsc2UpCiAgICAgeworICAgICAgICB1LnRoaXNHUFIg PSBJbnZhbGlkR1BSUmVnOwogICAgIH0KICAgICBWTSYgbV92bTsKICAgICBKU0dsb2JhbE9iamVj dCogbV9nbG9iYWxPYmplY3Q7CkBAIC0yMDUsNyArMjA2LDEwIEBAIHN0cnVjdCBBY2Nlc3NHZW5l cmF0aW9uU3RhdGUgewogICAgIE1hY3JvQXNzZW1ibGVyOjpKdW1wTGlzdCBmYWlsQW5kUmVwYXRj aDsKICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVtcExpc3QgZmFpbEFuZElnbm9yZTsKICAgICBHUFJS ZWcgYmFzZUdQUiB7IEludmFsaWRHUFJSZWcgfTsKLSAgICBHUFJSZWcgdGhpc0dQUiB7IEludmFs aWRHUFJSZWcgfTsKKyAgICB1bmlvbiB7CisgICAgICAgIEdQUlJlZyB0aGlzR1BSOworICAgICAg ICBHUFJSZWcgcHJvdG90eXBlR1BSOworICAgIH0gdTsKICAgICBKU1ZhbHVlUmVncyB2YWx1ZVJl Z3M7CiAgICAgR1BSUmVnIHNjcmF0Y2hHUFIgeyBJbnZhbGlkR1BSUmVnIH07CiAgICAgY29uc3Qg SWRlbnRpZmllciogaWRlbnQ7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv U3RydWN0dXJlU3R1YkluZm8uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uaAkocmV2aXNpb24gMjUxODcxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmgJKHdvcmtpbmcgY29w eSkKQEAgLTIwMSw3ICsyMDEsMTAgQEAgcHVibGljOgogCiAgICAgICAgIEdQUlJlZyBiYXNlR1BS OwogICAgICAgICBHUFJSZWcgdmFsdWVHUFI7Ci0gICAgICAgIEdQUlJlZyB0aGlzR1BSOworICAg ICAgICB1bmlvbiB7CisgICAgICAgICAgICBHUFJSZWcgdGhpc0dQUjsKKyAgICAgICAgICAgIEdQ UlJlZyBwcm90b3R5cGVHUFI7CisgICAgICAgIH0gdTsKICNpZiBVU0UoSlNWQUxVRTMyXzY0KQog ICAgICAgICBHUFJSZWcgdmFsdWVUYWdHUFI7CiAgICAgICAgIEdQUlJlZyBiYXNlVGFnR1BSOwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVDYWNoZUdlbmVyYXRvci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVDYWNo ZUdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDI1MTg3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUSW5saW5lQ2FjaGVHZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NCw3 ICs3NCw3IEBAIEpJVEJ5SWRHZW5lcmF0b3I6OkpJVEJ5SWRHZW5lcmF0b3IoCiB7CiAgICAgbV9z dHViSW5mby0+cGF0Y2guYmFzZUdQUiA9IGJhc2UucGF5bG9hZEdQUigpOwogICAgIG1fc3R1Yklu Zm8tPnBhdGNoLnZhbHVlR1BSID0gdmFsdWUucGF5bG9hZEdQUigpOwotICAgIG1fc3R1YkluZm8t PnBhdGNoLnRoaXNHUFIgPSBJbnZhbGlkR1BSUmVnOworICAgIG1fc3R1YkluZm8tPnBhdGNoLnUu dGhpc0dQUiA9IEludmFsaWRHUFJSZWc7CiAjaWYgVVNFKEpTVkFMVUUzMl82NCkKICAgICBtX3N0 dWJJbmZvLT5wYXRjaC5iYXNlVGFnR1BSID0gYmFzZS50YWdHUFIoKTsKICAgICBtX3N0dWJJbmZv LT5wYXRjaC52YWx1ZVRhZ0dQUiA9IHZhbHVlLnRhZ0dQUigpOwpAQCAtMTIyLDcgKzEyMiw3IEBA IEpJVEdldEJ5SWRXaXRoVGhpc0dlbmVyYXRvcjo6SklUR2V0QnlJZFcKIHsKICAgICBSRUxFQVNF X0FTU0VSVCh0aGlzUmVncy5wYXlsb2FkR1BSKCkgIT0gdGhpc1JlZ3MudGFnR1BSKCkpOwogCi0g ICAgbV9zdHViSW5mby0+cGF0Y2gudGhpc0dQUiA9IHRoaXNSZWdzLnBheWxvYWRHUFIoKTsKKyAg ICBtX3N0dWJJbmZvLT5wYXRjaC51LnRoaXNHUFIgPSB0aGlzUmVncy5wYXlsb2FkR1BSKCk7CiAj aWYgVVNFKEpTVkFMVUUzMl82NCkKICAgICBtX3N0dWJJbmZvLT5wYXRjaC50aGlzVGFnR1BSID0g dGhpc1JlZ3MudGFnR1BSKCk7CiAjZW5kaWYKQEAgLTE4Niw3ICsxODYsNyBAQCBKSVRJbnN0YW5j ZU9mR2VuZXJhdG9yOjpKSVRJbnN0YW5jZU9mR2VuCiB7CiAgICAgbV9zdHViSW5mby0+cGF0Y2gu YmFzZUdQUiA9IHZhbHVlOwogICAgIG1fc3R1YkluZm8tPnBhdGNoLnZhbHVlR1BSID0gcmVzdWx0 OwotICAgIG1fc3R1YkluZm8tPnBhdGNoLnRoaXNHUFIgPSBwcm90b3R5cGU7CisgICAgbV9zdHVi SW5mby0+cGF0Y2gudS5wcm90b3R5cGVHUFIgPSBwcm90b3R5cGU7CiAjaWYgVVNFKEpTVkFMVUUz Ml82NCkKICAgICBtX3N0dWJJbmZvLT5wYXRjaC5iYXNlVGFnR1BSID0gSW52YWxpZEdQUlJlZzsK ICAgICBtX3N0dWJJbmZvLT5wYXRjaC52YWx1ZVRhZ0dQUiA9IEludmFsaWRHUFJSZWc7Cg==