233005 2021-11-11 11:09:51 -0800 Rename Heap::isCurrentThreadBusy() to Heap::currentThreadIsDoingGCWork(). 2021-11-11 13:24:46 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 232849 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1814127 0 mark.lam 2021-11-11 11:09:51 -0800 This rename clarifies what the "busy" part is about. Also remove some unused code. 1814128 1 webkit-bug-importer 2021-11-11 11:10:42 -0800 <rdar://problem/85307204> 1814131 2 443978 mark.lam 2021-11-11 11:15:21 -0800 Created attachment 443978 proposed patch. 1814139 3 443982 mark.lam 2021-11-11 11:24:37 -0800 Created attachment 443982 proposed patch. 1814167 4 443989 mark.lam 2021-11-11 12:48:05 -0800 Created attachment 443989 proposed patch. 1814187 5 mark.lam 2021-11-11 13:24:46 -0800 Thanks for the review. Landed in r285653: <http://trac.webkit.org/r285653>. 443978 2021-11-11 11:15:21 -0800 2021-11-11 11:24:37 -0800 proposed patch. bug-233005.patch text/plain 8851 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjg1NjQwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDIxLTExLTExICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgSGVhcDo6IHZtLmhlYXAuaXNDdXJyZW50VGhyZWFkQnVzeSgpIHRvIEhlYXA6OiB2bS5o ZWFwLmlzQnVzeURvaW5nR0NSZWxhdGVkV29ya09uQ3VycmVudFRocmVhZCgpLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMDA1CisgICAgICAgIHJk YXI6Ly84NTMwNzIwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgcmVuYW1lIGNsYXJpZmllcyB3aGF0IHRoZSAiYnVzeSIgcGFydCBpcyBhYm91 dC4gIEFsc28gcmVtb3ZlIHNvbWUgdW51c2VkIGNvZGU6CisgICAgICAgIEhlYXA6OmlzVmFsaWRB bGxvY2F0aW9uKCksIGlzVmFsaWRUaHJlYWRTdGF0ZSgpLCBhbmQgaXNWYWxpZFNoYXJlZEluc3Rh bmNlVGhyZWFkU3RhdGUoKS4KKworICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6Cisg ICAgICAgIChKU0M6OkNvZGVCbG9jazo6amV0dGlzb24pOgorICAgICAgICAqIGhlYXAvSGVhcC5j cHA6CisgICAgICAgIChKU0M6OkhlYXA6OmlzQnVzeURvaW5nR0NSZWxhdGVkV29ya09uQ3VycmVu dFRocmVhZCk6CisgICAgICAgIChKU0M6OkhlYXA6OmlzVmFsaWRBbGxvY2F0aW9uKTogRGVsZXRl ZC4KKyAgICAgICAgKEpTQzo6SGVhcDo6aXNDdXJyZW50VGhyZWFkQnVzeSk6IERlbGV0ZWQuCisg ICAgICAgICogaGVhcC9IZWFwLmg6CisgICAgICAgICoganNjLmNwcDoKKyAgICAgICAgKGpzY21h aW4pOgorICAgICAgICAqIHJ1bnRpbWUvVk0uaDoKKyAgICAgICAgKEpTQzo6Vk06OmlzQ29sbGVj dG9yQnVzeU9uQ3VycmVudFRocmVhZCk6CisKIDIwMjEtMTEtMTAgIE1hcmsgTGFtICA8bWFyay5s YW1AYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgbV9kb2VzR0MgZnJvbSBIZWFwIHRvIFZNLgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2pzYy5jcHAJKHJldmlzaW9uIDI4NTYzNikKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9qc2MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzY1LDcgKzM3NjUsNyBAQCBp bnQganNjbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAgICAgICAgIFdURjo6cmVsZWFzZUZh c3RNYWxsb2NGcmVlTWVtb3J5KCk7CiAgICAgICAgIHZtLmRlbGV0ZUFsbENvZGUoRGVsZXRlQWxs Q29kZUlmTm90Q29sbGVjdGluZyk7CiAKLSAgICAgICAgaWYgKCF2bS5oZWFwLmlzQ3VycmVudFRo cmVhZEJ1c3koKSkgeworICAgICAgICBpZiAoIXZtLmhlYXAuaXNCdXN5RG9pbmdHQ1JlbGF0ZWRX b3JrT25DdXJyZW50VGhyZWFkKCkpIHsKICAgICAgICAgICAgIGlmIChpc1N5bmNocm9ub3VzKSB7 CiAgICAgICAgICAgICAgICAgdm0uaGVhcC5jb2xsZWN0Tm93KFN5bmMsIENvbGxlY3Rpb25TY29w ZTo6RnVsbCk7CiAgICAgICAgICAgICAgICAgV1RGOjpyZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1v cnkoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2su Y3BwCShyZXZpc2lvbiAyODU2MzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Q29kZUJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI5NCw3ICsyMjk0LDcgQEAgdm9pZCBD b2RlQmxvY2s6OmpldHRpc29uKFByb2ZpbGVyOjpKZXR0aQogICAgICAgICAvLyBUaGlzIGFjY29t cGxpc2hlcyAoMSksIGFuZCBkb2VzIGl0cyBvd24gYm9vay1rZWVwaW5nIGFib3V0IHdoZXRoZXIg aXQgaGFzIGFscmVhZHkgaGFwcGVuZWQuCiAgICAgICAgIGlmICghaml0Q29kZSgpLT5kZmdDb21t b24oKS0+aW52YWxpZGF0ZSgpKSB7CiAgICAgICAgICAgICAvLyBXZSd2ZSBhbHJlYWR5IGJlZW4g aW52YWxpZGF0ZWQuCi0gICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCh0aGlzICE9IHJlcGxhY2Vt ZW50KCkgfHwgKHZtLmhlYXAuaXNDdXJyZW50VGhyZWFkQnVzeSgpICYmICF2bS5oZWFwLmlzTWFy a2VkKG93bmVyRXhlY3V0YWJsZSgpKSkpOworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQodGhp cyAhPSByZXBsYWNlbWVudCgpIHx8ICh2bS5oZWFwLmlzQnVzeURvaW5nR0NSZWxhdGVkV29ya09u Q3VycmVudFRocmVhZCgpICYmICF2bS5oZWFwLmlzTWFya2VkKG93bmVyRXhlY3V0YWJsZSgpKSkp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMjMyNiw3ICsyMzI2 LDcgQEAgdm9pZCBDb2RlQmxvY2s6OmpldHRpc29uKFByb2ZpbGVyOjpKZXR0aQogCiAgICAgLy8g SmV0dGlzb24gY2FuIGhhcHBlbiBkdXJpbmcgR0MuIFdlIGRvbid0IHdhbnQgdG8gaW5zdGFsbCBj b2RlIHRvIGEgZGVhZCBleGVjdXRhYmxlCiAgICAgLy8gYmVjYXVzZSB0aGF0IHdvdWxkIGFkZCBh IGRlYWQgb2JqZWN0IHRvIHRoZSByZW1lbWJlcmVkIHNldC4KLSAgICBpZiAodm0uaGVhcC5pc0N1 cnJlbnRUaHJlYWRCdXN5KCkgJiYgIXZtLmhlYXAuaXNNYXJrZWQob3duZXJFeGVjdXRhYmxlKCkp KQorICAgIGlmICh2bS5oZWFwLmlzQnVzeURvaW5nR0NSZWxhdGVkV29ya09uQ3VycmVudFRocmVh ZCgpICYmICF2bS5oZWFwLmlzTWFya2VkKG93bmVyRXhlY3V0YWJsZSgpKSkKICAgICAgICAgcmV0 dXJuOwogCiAjaWYgRU5BQkxFKEpJVCkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L0hlYXAuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAu Y3BwCShyZXZpc2lvbiAyODU2MzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFw LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM4LDIyICsxMzgsNiBAQCBzaXplX3QgcHJvcG9ydGlv bmFsSGVhcFNpemUoc2l6ZV90IGhlYXBTCiAgICAgcmV0dXJuIE9wdGlvbnM6OmxhcmdlSGVhcEdy b3d0aEZhY3RvcigpICogaGVhcFNpemU7CiB9CiAKLWJvb2wgaXNWYWxpZFNoYXJlZEluc3RhbmNl VGhyZWFkU3RhdGUoVk0mIHZtKQotewotICAgIHJldHVybiB2bS5jdXJyZW50VGhyZWFkSXNIb2xk aW5nQVBJTG9jaygpOwotfQotCi1ib29sIGlzVmFsaWRUaHJlYWRTdGF0ZShWTSYgdm0pCi17Ci0g ICAgaWYgKHZtLmF0b21TdHJpbmdUYWJsZSgpICE9IFRocmVhZDo6Y3VycmVudCgpLmF0b21TdHJp bmdUYWJsZSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAodm0uaXNTaGFyZWRJ bnN0YW5jZSgpICYmICFpc1ZhbGlkU2hhcmVkSW5zdGFuY2VUaHJlYWRTdGF0ZSh2bSkpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiB0cnVlOwotfQotCiB2b2lkIHJlY29yZFR5 cGUoVk0mIHZtLCBUeXBlQ291bnRTZXQmIHNldCwgSlNDZWxsKiBjZWxsKQogewogICAgIGNvbnN0 IGNoYXIqIHR5cGVOYW1lID0gIlt1bmtub3duXSI7CkBAIC0yMzc5LDE3ICsyMzYzLDYgQEAgdm9p ZCBIZWFwOjpkaWRBbGxvY2F0ZShzaXplX3QgYnl0ZXMpCiAgICAgcGVyZm9ybUluY3JlbWVudChi eXRlcyk7CiB9CiAKLWJvb2wgSGVhcDo6aXNWYWxpZEFsbG9jYXRpb24oc2l6ZV90KQotewotICAg IGlmICghaXNWYWxpZFRocmVhZFN0YXRlKHZtKCkpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICBpZiAoaXNDdXJyZW50VGhyZWFkQnVzeSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0g ICAgCi0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIHZvaWQgSGVhcDo6YWRkRmluYWxpemVyKEpTQ2Vs bCogY2VsbCwgQ0ZpbmFsaXplciBmaW5hbGl6ZXIpCiB7CiAgICAgV2Vha1NldDo6YWxsb2NhdGUo Y2VsbCwgJm1fY0ZpbmFsaXplck93bmVyLCBiaXR3aXNlX2Nhc3Q8dm9pZCo+KGZpbmFsaXplcikp OyAvLyBCYWxhbmNlZCBieSBDRmluYWxpemVyT3duZXI6OmZpbmFsaXplKCkuCkBAIC0yNTM2LDcg KzI1MDksNyBAQCB2b2lkIEhlYXA6OndyaXRlQmFycmllclNsb3dQYXRoKGNvbnN0IEpTCiAgICAg YWRkVG9SZW1lbWJlcmVkU2V0KGZyb20pOwogfQogCi1ib29sIEhlYXA6OmlzQ3VycmVudFRocmVh ZEJ1c3koKQorYm9vbCBIZWFwOjppc0J1c3lEb2luZ0dDUmVsYXRlZFdvcmtPbkN1cnJlbnRUaHJl YWQoKQogewogICAgIHJldHVybiBUaHJlYWQ6Om1heUJlR0NUaHJlYWQoKSB8fCBtdXRhdG9yU3Rh dGUoKSAhPSBNdXRhdG9yU3RhdGU6OlJ1bm5pbmc7CiB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaGVhcC9IZWFwLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvSGVhcC5oCShyZXZpc2lvbiAyODU2MzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVh cC9IZWFwLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2NCw3ICsxNjQsNyBAQCBwdWJsaWM6CiAKICAg ICAvLyBXZSdyZSBhbHdheXMgYnVzeSBvbiB0aGUgY29sbGVjdGlvbiB0aHJlYWRzLiBPbiB0aGUg bWFpbiB0aHJlYWQsIHRoaXMgcmV0dXJucyB0cnVlIGlmIHdlJ3JlCiAgICAgLy8gaGVscGluZyBo ZWFwLgotICAgIEpTX0VYUE9SVF9QUklWQVRFIGJvb2wgaXNDdXJyZW50VGhyZWFkQnVzeSgpOwor ICAgIEpTX0VYUE9SVF9QUklWQVRFIGJvb2wgaXNCdXN5RG9pbmdHQ1JlbGF0ZWRXb3JrT25DdXJy ZW50VGhyZWFkKCk7CiAgICAgCiAgICAgdHlwZWRlZiB2b2lkICgqQ0ZpbmFsaXplcikoSlNDZWxs Kik7CiAgICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCBhZGRGaW5hbGl6ZXIoSlNDZWxsKiwgQ0Zp bmFsaXplcik7CkBAIC00MjYsNyArNDI2LDYgQEAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBmaW5h bGl6ZShIYW5kbGU8VW5rbm93bj4sIHZvaWQqIGNvbnRleHQpIGZpbmFsOwogICAgIH07CiAKLSAg ICBKU19FWFBPUlRfUFJJVkFURSBib29sIGlzVmFsaWRBbGxvY2F0aW9uKHNpemVfdCk7CiAgICAg SlNfRVhQT1JUX1BSSVZBVEUgdm9pZCByZXBvcnRFeHRyYU1lbW9yeUFsbG9jYXRlZFNsb3dDYXNl KHNpemVfdCk7CiAgICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZXByZWNhdGVkUmVwb3J0RXh0 cmFNZW1vcnlTbG93Q2FzZShzaXplX3QpOwogICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvVk0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9WTS5oCShyZXZpc2lvbiAyODU2MzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9WTS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDg2LDcgKzEwODYsNyBAQCBwdWJsaWM6CiAj ZW5kaWYKICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkIGR1bXBSZWdFeHBUcmFjZSgpOwogCi0g ICAgYm9vbCBpc0NvbGxlY3RvckJ1c3lPbkN1cnJlbnRUaHJlYWQoKSB7IHJldHVybiBoZWFwLmlz Q3VycmVudFRocmVhZEJ1c3koKTsgfQorICAgIGJvb2wgaXNDb2xsZWN0b3JCdXN5T25DdXJyZW50 VGhyZWFkKCkgeyByZXR1cm4gaGVhcC5pc0J1c3lEb2luZ0dDUmVsYXRlZFdvcmtPbkN1cnJlbnRU aHJlYWQoKTsgfQogCiAjaWYgRU5BQkxFKEdDX1ZBTElEQVRJT04pCiAgICAgYm9vbCBpc0luaXRp YWxpemluZ09iamVjdCgpIGNvbnN0OyAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4NTYzNikK KysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3 IEBACisyMDIxLTExLTExICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAg ICBSZW5hbWUgSGVhcDo6IHZtLmhlYXAuaXNDdXJyZW50VGhyZWFkQnVzeSgpIHRvIEhlYXA6OiB2 bS5oZWFwLmlzQnVzeURvaW5nR0NSZWxhdGVkV29ya09uQ3VycmVudFRocmVhZCgpLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMDA1CisgICAgICAg IHJkYXI6Ly84NTMwNzIwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogYmluZGluZ3MvanMvR0NDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkdDQ29udHJvbGxlcjo6Z2FyYmFnZUNvbGxlY3ROb3cpOgorICAgICAgICAoV2ViQ29yZTo6 R0NDb250cm9sbGVyOjpnYXJiYWdlQ29sbGVjdE5vd0lmTm90RG9uZVJlY2VudGx5KToKKyAgICAg ICAgKiB3b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oldv cmtlckdsb2JhbFNjb3BlOjpkZWxldGVKU0NvZGVBbmRHQyk6CisKIDIwMjEtMTEtMTAgIE1hcmsg TGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgbV9kb2VzR0MgZnJvbSBI ZWFwIHRvIFZNLgpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvR0NDb250cm9sbGVy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9HQ0NvbnRyb2xs ZXIuY3BwCShyZXZpc2lvbiAyODU2MzYpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9H Q0NvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Miw3ICs5Miw3IEBAIHZvaWQgR0ND b250cm9sbGVyOjpnY1RpbWVyRmlyZWQoKQogdm9pZCBHQ0NvbnRyb2xsZXI6OmdhcmJhZ2VDb2xs ZWN0Tm93KCkKIHsKICAgICBKU0xvY2tIb2xkZXIgbG9jayhjb21tb25WTSgpKTsKLSAgICBpZiAo IWNvbW1vblZNKCkuaGVhcC5pc0N1cnJlbnRUaHJlYWRCdXN5KCkpIHsKKyAgICBpZiAoIWNvbW1v blZNKCkuaGVhcC5pc0J1c3lEb2luZ0dDUmVsYXRlZFdvcmtPbkN1cnJlbnRUaHJlYWQoKSkgewog ICAgICAgICBjb21tb25WTSgpLmhlYXAuY29sbGVjdE5vdyhTeW5jLCBDb2xsZWN0aW9uU2NvcGU6 OkZ1bGwpOwogICAgICAgICBXVEY6OnJlbGVhc2VGYXN0TWFsbG9jRnJlZU1lbW9yeSgpOwogICAg IH0KQEAgLTEwMiw3ICsxMDIsNyBAQCB2b2lkIEdDQ29udHJvbGxlcjo6Z2FyYmFnZUNvbGxlY3RO b3dJZk5vCiB7CiAjaWYgVVNFKENGKSB8fCBVU0UoR0xJQikKICAgICBKU0xvY2tIb2xkZXIgbG9j ayhjb21tb25WTSgpKTsKLSAgICBpZiAoIWNvbW1vblZNKCkuaGVhcC5pc0N1cnJlbnRUaHJlYWRC dXN5KCkpCisgICAgaWYgKCFjb21tb25WTSgpLmhlYXAuaXNCdXN5RG9pbmdHQ1JlbGF0ZWRXb3Jr T25DdXJyZW50VGhyZWFkKCkpCiAgICAgICAgIGNvbW1vblZNKCkuaGVhcC5jb2xsZWN0Tm93RnVs bElmTm90RG9uZVJlY2VudGx5KEFzeW5jKTsKICNlbHNlCiAgICAgZ2FyYmFnZUNvbGxlY3RTb29u KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmNw cAkocmV2aXNpb24gMjg1NjM2KQorKysgU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJHbG9i YWxTY29wZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU3NSwxNCArNTc1LDE0IEBAIHZvaWQgV29y a2VyR2xvYmFsU2NvcGU6OmRlbGV0ZUpTQ29kZUFuZEcKICAgICB2bSgpLmRlbGV0ZUFsbENvZGUo SlNDOjpEZWxldGVBbGxDb2RlSWZOb3RDb2xsZWN0aW5nKTsKIAogICAgIGlmIChzeW5jaHJvbm91 cyA9PSBTeW5jaHJvbm91czo6WWVzKSB7Ci0gICAgICAgIGlmICghdm0oKS5oZWFwLmlzQ3VycmVu dFRocmVhZEJ1c3koKSkgeworICAgICAgICBpZiAoIXZtKCkuaGVhcC5pc0J1c3lEb2luZ0dDUmVs YXRlZFdvcmtPbkN1cnJlbnRUaHJlYWQoKSkgewogICAgICAgICAgICAgdm0oKS5oZWFwLmNvbGxl Y3ROb3coSlNDOjpTeW5jLCBKU0M6OkNvbGxlY3Rpb25TY29wZTo6RnVsbCk7CiAgICAgICAgICAg ICBXVEY6OnJlbGVhc2VGYXN0TWFsbG9jRnJlZU1lbW9yeSgpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAgICAgfQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgaWYgKCF2 bSgpLmhlYXAuaXNDdXJyZW50VGhyZWFkQnVzeSgpKSB7CisgICAgaWYgKCF2bSgpLmhlYXAuaXNC dXN5RG9pbmdHQ1JlbGF0ZWRXb3JrT25DdXJyZW50VGhyZWFkKCkpIHsKICAgICAgICAgdm0oKS5o ZWFwLmNvbGxlY3ROb3dGdWxsSWZOb3REb25lUmVjZW50bHkoSlNDOjpBc3luYyk7CiAgICAgICAg IHJldHVybjsKICAgICB9Cg== 443982 2021-11-11 11:24:37 -0800 2021-11-11 12:48:05 -0800 proposed patch. bug-233005.patch text/plain 8815 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjg1NjQwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDIxLTExLTExICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgSGVhcDo6aXNDdXJyZW50VGhyZWFkQnVzeSgpIHRvIEhlYXA6OmlzQnVzeURvaW5nR0NS ZWxhdGVkV29ya09uQ3VycmVudFRocmVhZCgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMDA1CisgICAgICAgIHJkYXI6Ly84NTMwNzIwNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcmVuYW1l IGNsYXJpZmllcyB3aGF0IHRoZSAiYnVzeSIgcGFydCBpcyBhYm91dC4gIEFsc28gcmVtb3ZlIHNv bWUgdW51c2VkIGNvZGU6CisgICAgICAgIEhlYXA6OmlzVmFsaWRBbGxvY2F0aW9uKCksIGlzVmFs aWRUaHJlYWRTdGF0ZSgpLCBhbmQgaXNWYWxpZFNoYXJlZEluc3RhbmNlVGhyZWFkU3RhdGUoKS4K KworICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVC bG9jazo6amV0dGlzb24pOgorICAgICAgICAqIGhlYXAvSGVhcC5jcHA6CisgICAgICAgIChKU0M6 OkhlYXA6OmlzQnVzeURvaW5nR0NSZWxhdGVkV29ya09uQ3VycmVudFRocmVhZCk6CisgICAgICAg IChKU0M6OkhlYXA6OmlzVmFsaWRBbGxvY2F0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6 SGVhcDo6aXNDdXJyZW50VGhyZWFkQnVzeSk6IERlbGV0ZWQuCisgICAgICAgICogaGVhcC9IZWFw Lmg6CisgICAgICAgICoganNjLmNwcDoKKyAgICAgICAgKGpzY21haW4pOgorICAgICAgICAqIHJ1 bnRpbWUvVk0uaDoKKyAgICAgICAgKEpTQzo6Vk06OmlzQ29sbGVjdG9yQnVzeU9uQ3VycmVudFRo cmVhZCk6CisKIDIwMjEtMTEtMTAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAg ICAgICAgIE1vdmUgbV9kb2VzR0MgZnJvbSBIZWFwIHRvIFZNLgpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2pzYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2pz Yy5jcHAJKHJldmlzaW9uIDI4NTYzNikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zNzY1LDcgKzM3NjUsNyBAQCBpbnQganNjbWFpbihpbnQgYXJn YywgY2hhcioqIGFyZ3YpCiAgICAgICAgIFdURjo6cmVsZWFzZUZhc3RNYWxsb2NGcmVlTWVtb3J5 KCk7CiAgICAgICAgIHZtLmRlbGV0ZUFsbENvZGUoRGVsZXRlQWxsQ29kZUlmTm90Q29sbGVjdGlu Zyk7CiAKLSAgICAgICAgaWYgKCF2bS5oZWFwLmlzQ3VycmVudFRocmVhZEJ1c3koKSkgeworICAg ICAgICBpZiAoIXZtLmhlYXAuaXNCdXN5RG9pbmdHQ1JlbGF0ZWRXb3JrT25DdXJyZW50VGhyZWFk KCkpIHsKICAgICAgICAgICAgIGlmIChpc1N5bmNocm9ub3VzKSB7CiAgICAgICAgICAgICAgICAg dm0uaGVhcC5jb2xsZWN0Tm93KFN5bmMsIENvbGxlY3Rpb25TY29wZTo6RnVsbCk7CiAgICAgICAg ICAgICAgICAgV1RGOjpyZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1vcnkoKTsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCShyZXZpc2lvbiAyODU2 MzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjI5NCw3ICsyMjk0LDcgQEAgdm9pZCBDb2RlQmxvY2s6OmpldHRpc29u KFByb2ZpbGVyOjpKZXR0aQogICAgICAgICAvLyBUaGlzIGFjY29tcGxpc2hlcyAoMSksIGFuZCBk b2VzIGl0cyBvd24gYm9vay1rZWVwaW5nIGFib3V0IHdoZXRoZXIgaXQgaGFzIGFscmVhZHkgaGFw cGVuZWQuCiAgICAgICAgIGlmICghaml0Q29kZSgpLT5kZmdDb21tb24oKS0+aW52YWxpZGF0ZSgp KSB7CiAgICAgICAgICAgICAvLyBXZSd2ZSBhbHJlYWR5IGJlZW4gaW52YWxpZGF0ZWQuCi0gICAg ICAgICAgICBSRUxFQVNFX0FTU0VSVCh0aGlzICE9IHJlcGxhY2VtZW50KCkgfHwgKHZtLmhlYXAu aXNDdXJyZW50VGhyZWFkQnVzeSgpICYmICF2bS5oZWFwLmlzTWFya2VkKG93bmVyRXhlY3V0YWJs ZSgpKSkpOworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQodGhpcyAhPSByZXBsYWNlbWVudCgp IHx8ICh2bS5oZWFwLmlzQnVzeURvaW5nR0NSZWxhdGVkV29ya09uQ3VycmVudFRocmVhZCgpICYm ICF2bS5oZWFwLmlzTWFya2VkKG93bmVyRXhlY3V0YWJsZSgpKSkpOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMjMyNiw3ICsyMzI2LDcgQEAgdm9pZCBDb2RlQmxv Y2s6OmpldHRpc29uKFByb2ZpbGVyOjpKZXR0aQogCiAgICAgLy8gSmV0dGlzb24gY2FuIGhhcHBl biBkdXJpbmcgR0MuIFdlIGRvbid0IHdhbnQgdG8gaW5zdGFsbCBjb2RlIHRvIGEgZGVhZCBleGVj dXRhYmxlCiAgICAgLy8gYmVjYXVzZSB0aGF0IHdvdWxkIGFkZCBhIGRlYWQgb2JqZWN0IHRvIHRo ZSByZW1lbWJlcmVkIHNldC4KLSAgICBpZiAodm0uaGVhcC5pc0N1cnJlbnRUaHJlYWRCdXN5KCkg JiYgIXZtLmhlYXAuaXNNYXJrZWQob3duZXJFeGVjdXRhYmxlKCkpKQorICAgIGlmICh2bS5oZWFw LmlzQnVzeURvaW5nR0NSZWxhdGVkV29ya09uQ3VycmVudFRocmVhZCgpICYmICF2bS5oZWFwLmlz TWFya2VkKG93bmVyRXhlY3V0YWJsZSgpKSkKICAgICAgICAgcmV0dXJuOwogCiAjaWYgRU5BQkxF KEpJVCkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwCShyZXZpc2lvbiAyODU2 MzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTM4LDIyICsxMzgsNiBAQCBzaXplX3QgcHJvcG9ydGlvbmFsSGVhcFNpemUoc2l6ZV90 IGhlYXBTCiAgICAgcmV0dXJuIE9wdGlvbnM6OmxhcmdlSGVhcEdyb3d0aEZhY3RvcigpICogaGVh cFNpemU7CiB9CiAKLWJvb2wgaXNWYWxpZFNoYXJlZEluc3RhbmNlVGhyZWFkU3RhdGUoVk0mIHZt KQotewotICAgIHJldHVybiB2bS5jdXJyZW50VGhyZWFkSXNIb2xkaW5nQVBJTG9jaygpOwotfQot Ci1ib29sIGlzVmFsaWRUaHJlYWRTdGF0ZShWTSYgdm0pCi17Ci0gICAgaWYgKHZtLmF0b21TdHJp bmdUYWJsZSgpICE9IFRocmVhZDo6Y3VycmVudCgpLmF0b21TdHJpbmdUYWJsZSgpKQotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAodm0uaXNTaGFyZWRJbnN0YW5jZSgpICYmICFpc1Zh bGlkU2hhcmVkSW5zdGFuY2VUaHJlYWRTdGF0ZSh2bSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsK LQotICAgIHJldHVybiB0cnVlOwotfQotCiB2b2lkIHJlY29yZFR5cGUoVk0mIHZtLCBUeXBlQ291 bnRTZXQmIHNldCwgSlNDZWxsKiBjZWxsKQogewogICAgIGNvbnN0IGNoYXIqIHR5cGVOYW1lID0g Ilt1bmtub3duXSI7CkBAIC0yMzc5LDE3ICsyMzYzLDYgQEAgdm9pZCBIZWFwOjpkaWRBbGxvY2F0 ZShzaXplX3QgYnl0ZXMpCiAgICAgcGVyZm9ybUluY3JlbWVudChieXRlcyk7CiB9CiAKLWJvb2wg SGVhcDo6aXNWYWxpZEFsbG9jYXRpb24oc2l6ZV90KQotewotICAgIGlmICghaXNWYWxpZFRocmVh ZFN0YXRlKHZtKCkpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoaXNDdXJyZW50 VGhyZWFkQnVzeSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCi0gICAgcmV0dXJuIHRy dWU7Ci19Ci0KIHZvaWQgSGVhcDo6YWRkRmluYWxpemVyKEpTQ2VsbCogY2VsbCwgQ0ZpbmFsaXpl ciBmaW5hbGl6ZXIpCiB7CiAgICAgV2Vha1NldDo6YWxsb2NhdGUoY2VsbCwgJm1fY0ZpbmFsaXpl ck93bmVyLCBiaXR3aXNlX2Nhc3Q8dm9pZCo+KGZpbmFsaXplcikpOyAvLyBCYWxhbmNlZCBieSBD RmluYWxpemVyT3duZXI6OmZpbmFsaXplKCkuCkBAIC0yNTM2LDcgKzI1MDksNyBAQCB2b2lkIEhl YXA6OndyaXRlQmFycmllclNsb3dQYXRoKGNvbnN0IEpTCiAgICAgYWRkVG9SZW1lbWJlcmVkU2V0 KGZyb20pOwogfQogCi1ib29sIEhlYXA6OmlzQ3VycmVudFRocmVhZEJ1c3koKQorYm9vbCBIZWFw Ojppc0J1c3lEb2luZ0dDUmVsYXRlZFdvcmtPbkN1cnJlbnRUaHJlYWQoKQogewogICAgIHJldHVy biBUaHJlYWQ6Om1heUJlR0NUaHJlYWQoKSB8fCBtdXRhdG9yU3RhdGUoKSAhPSBNdXRhdG9yU3Rh dGU6OlJ1bm5pbmc7CiB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCShyZXZpc2lv biAyODU2MzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE2NCw3ICsxNjQsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBXZSdyZSBhbHdheXMg YnVzeSBvbiB0aGUgY29sbGVjdGlvbiB0aHJlYWRzLiBPbiB0aGUgbWFpbiB0aHJlYWQsIHRoaXMg cmV0dXJucyB0cnVlIGlmIHdlJ3JlCiAgICAgLy8gaGVscGluZyBoZWFwLgotICAgIEpTX0VYUE9S VF9QUklWQVRFIGJvb2wgaXNDdXJyZW50VGhyZWFkQnVzeSgpOworICAgIEpTX0VYUE9SVF9QUklW QVRFIGJvb2wgaXNCdXN5RG9pbmdHQ1JlbGF0ZWRXb3JrT25DdXJyZW50VGhyZWFkKCk7CiAgICAg CiAgICAgdHlwZWRlZiB2b2lkICgqQ0ZpbmFsaXplcikoSlNDZWxsKik7CiAgICAgSlNfRVhQT1JU X1BSSVZBVEUgdm9pZCBhZGRGaW5hbGl6ZXIoSlNDZWxsKiwgQ0ZpbmFsaXplcik7CkBAIC00MjYs NyArNDI2LDYgQEAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBmaW5hbGl6ZShIYW5kbGU8VW5rbm93 bj4sIHZvaWQqIGNvbnRleHQpIGZpbmFsOwogICAgIH07CiAKLSAgICBKU19FWFBPUlRfUFJJVkFU RSBib29sIGlzVmFsaWRBbGxvY2F0aW9uKHNpemVfdCk7CiAgICAgSlNfRVhQT1JUX1BSSVZBVEUg dm9pZCByZXBvcnRFeHRyYU1lbW9yeUFsbG9jYXRlZFNsb3dDYXNlKHNpemVfdCk7CiAgICAgSlNf RVhQT1JUX1BSSVZBVEUgdm9pZCBkZXByZWNhdGVkUmVwb3J0RXh0cmFNZW1vcnlTbG93Q2FzZShz aXplX3QpOwogICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5oCShyZXZpc2lv biAyODU2MzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5oCSh3b3JraW5n IGNvcHkpCkBAIC0xMDg2LDcgKzEwODYsNyBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICBKU19FWFBP UlRfUFJJVkFURSB2b2lkIGR1bXBSZWdFeHBUcmFjZSgpOwogCi0gICAgYm9vbCBpc0NvbGxlY3Rv ckJ1c3lPbkN1cnJlbnRUaHJlYWQoKSB7IHJldHVybiBoZWFwLmlzQ3VycmVudFRocmVhZEJ1c3ko KTsgfQorICAgIGJvb2wgaXNDb2xsZWN0b3JCdXN5T25DdXJyZW50VGhyZWFkKCkgeyByZXR1cm4g aGVhcC5pc0J1c3lEb2luZ0dDUmVsYXRlZFdvcmtPbkN1cnJlbnRUaHJlYWQoKTsgfQogCiAjaWYg RU5BQkxFKEdDX1ZBTElEQVRJT04pCiAgICAgYm9vbCBpc0luaXRpYWxpemluZ09iamVjdCgpIGNv bnN0OyAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4NTYzNikKKysrIFNvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIxLTExLTExICBN YXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgSGVhcDo6aXND dXJyZW50VGhyZWFkQnVzeSgpIHRvIEhlYXA6OmlzQnVzeURvaW5nR0NSZWxhdGVkV29ya09uQ3Vy cmVudFRocmVhZCgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjMzMDA1CisgICAgICAgIHJkYXI6Ly84NTMwNzIwNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYmluZGluZ3MvanMvR0NDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdDQ29udHJvbGxlcjo6Z2FyYmFnZUNvbGxlY3ROb3cp OgorICAgICAgICAoV2ViQ29yZTo6R0NDb250cm9sbGVyOjpnYXJiYWdlQ29sbGVjdE5vd0lmTm90 RG9uZVJlY2VudGx5KToKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Oldvcmtlckdsb2JhbFNjb3BlOjpkZWxldGVKU0NvZGVBbmRHQyk6 CisKIDIwMjEtMTEtMTAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAg IE1vdmUgbV9kb2VzR0MgZnJvbSBIZWFwIHRvIFZNLgpJbmRleDogU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvR0NDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9HQ0NvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAyODU2MzYpCisrKyBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9HQ0NvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05 Miw3ICs5Miw3IEBAIHZvaWQgR0NDb250cm9sbGVyOjpnY1RpbWVyRmlyZWQoKQogdm9pZCBHQ0Nv bnRyb2xsZXI6OmdhcmJhZ2VDb2xsZWN0Tm93KCkKIHsKICAgICBKU0xvY2tIb2xkZXIgbG9jayhj b21tb25WTSgpKTsKLSAgICBpZiAoIWNvbW1vblZNKCkuaGVhcC5pc0N1cnJlbnRUaHJlYWRCdXN5 KCkpIHsKKyAgICBpZiAoIWNvbW1vblZNKCkuaGVhcC5pc0J1c3lEb2luZ0dDUmVsYXRlZFdvcmtP bkN1cnJlbnRUaHJlYWQoKSkgewogICAgICAgICBjb21tb25WTSgpLmhlYXAuY29sbGVjdE5vdyhT eW5jLCBDb2xsZWN0aW9uU2NvcGU6OkZ1bGwpOwogICAgICAgICBXVEY6OnJlbGVhc2VGYXN0TWFs bG9jRnJlZU1lbW9yeSgpOwogICAgIH0KQEAgLTEwMiw3ICsxMDIsNyBAQCB2b2lkIEdDQ29udHJv bGxlcjo6Z2FyYmFnZUNvbGxlY3ROb3dJZk5vCiB7CiAjaWYgVVNFKENGKSB8fCBVU0UoR0xJQikK ICAgICBKU0xvY2tIb2xkZXIgbG9jayhjb21tb25WTSgpKTsKLSAgICBpZiAoIWNvbW1vblZNKCku aGVhcC5pc0N1cnJlbnRUaHJlYWRCdXN5KCkpCisgICAgaWYgKCFjb21tb25WTSgpLmhlYXAuaXNC dXN5RG9pbmdHQ1JlbGF0ZWRXb3JrT25DdXJyZW50VGhyZWFkKCkpCiAgICAgICAgIGNvbW1vblZN KCkuaGVhcC5jb2xsZWN0Tm93RnVsbElmTm90RG9uZVJlY2VudGx5KEFzeW5jKTsKICNlbHNlCiAg ICAgZ2FyYmFnZUNvbGxlY3RTb29uKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dv cmtlckdsb2JhbFNjb3BlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS93b3JrZXJz L1dvcmtlckdsb2JhbFNjb3BlLmNwcAkocmV2aXNpb24gMjg1NjM2KQorKysgU291cmNlL1dlYkNv cmUvd29ya2Vycy9Xb3JrZXJHbG9iYWxTY29wZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU3NSwx NCArNTc1LDE0IEBAIHZvaWQgV29ya2VyR2xvYmFsU2NvcGU6OmRlbGV0ZUpTQ29kZUFuZEcKICAg ICB2bSgpLmRlbGV0ZUFsbENvZGUoSlNDOjpEZWxldGVBbGxDb2RlSWZOb3RDb2xsZWN0aW5nKTsK IAogICAgIGlmIChzeW5jaHJvbm91cyA9PSBTeW5jaHJvbm91czo6WWVzKSB7Ci0gICAgICAgIGlm ICghdm0oKS5oZWFwLmlzQ3VycmVudFRocmVhZEJ1c3koKSkgeworICAgICAgICBpZiAoIXZtKCku aGVhcC5pc0J1c3lEb2luZ0dDUmVsYXRlZFdvcmtPbkN1cnJlbnRUaHJlYWQoKSkgewogICAgICAg ICAgICAgdm0oKS5oZWFwLmNvbGxlY3ROb3coSlNDOjpTeW5jLCBKU0M6OkNvbGxlY3Rpb25TY29w ZTo6RnVsbCk7CiAgICAgICAgICAgICBXVEY6OnJlbGVhc2VGYXN0TWFsbG9jRnJlZU1lbW9yeSgp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQogI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCi0gICAgaWYgKCF2bSgpLmhlYXAuaXNDdXJyZW50VGhyZWFkQnVzeSgpKSB7Cisg ICAgaWYgKCF2bSgpLmhlYXAuaXNCdXN5RG9pbmdHQ1JlbGF0ZWRXb3JrT25DdXJyZW50VGhyZWFk KCkpIHsKICAgICAgICAgdm0oKS5oZWFwLmNvbGxlY3ROb3dGdWxsSWZOb3REb25lUmVjZW50bHko SlNDOjpBc3luYyk7CiAgICAgICAgIHJldHVybjsKICAgICB9Cg== 443989 2021-11-11 12:48:05 -0800 2021-11-11 12:50:36 -0800 proposed patch. bug-233005.patch text/plain 8646 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjg1NjQwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDIxLTExLTExICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgSGVhcDo6aXNDdXJyZW50VGhyZWFkQnVzeSgpIHRvIEhlYXA6OmN1cnJlbnRUaHJlYWRJ c0RvaW5nR0NXb3JrKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzMwMDUKKyAgICAgICAgcmRhcjovLzg1MzA3MjA0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyByZW5hbWUgY2xhcmlmaWVzIHdo YXQgdGhlICJidXN5IiBwYXJ0IGlzIGFib3V0LiAgQWxzbyByZW1vdmUgc29tZSB1bnVzZWQgY29k ZToKKyAgICAgICAgSGVhcDo6aXNWYWxpZEFsbG9jYXRpb24oKSwgaXNWYWxpZFRocmVhZFN0YXRl KCksIGFuZCBpc1ZhbGlkU2hhcmVkSW5zdGFuY2VUaHJlYWRTdGF0ZSgpLgorCisgICAgICAgICog Ynl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpqZXR0aXNv bik6CisgICAgICAgICogaGVhcC9IZWFwLmNwcDoKKyAgICAgICAgKEpTQzo6SGVhcDo6Y3VycmVu dFRocmVhZElzRG9pbmdHQ1dvcmspOgorICAgICAgICAoSlNDOjpIZWFwOjppc1ZhbGlkQWxsb2Nh dGlvbik6IERlbGV0ZWQuCisgICAgICAgIChKU0M6OkhlYXA6OmlzQ3VycmVudFRocmVhZEJ1c3kp OiBEZWxldGVkLgorICAgICAgICAqIGhlYXAvSGVhcC5oOgorICAgICAgICAqIGpzYy5jcHA6Cisg ICAgICAgIChqc2NtYWluKToKKyAgICAgICAgKiBydW50aW1lL1ZNLmg6CisgICAgICAgIChKU0M6 OlZNOjppc0NvbGxlY3RvckJ1c3lPbkN1cnJlbnRUaHJlYWQpOgorCiAyMDIxLTExLTEwICBNYXJr IExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIG1fZG9lc0dDIGZyb20g SGVhcCB0byBWTS4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCShyZXZpc2lvbiAyODU2MzYpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzc2NSw3 ICszNzY1LDcgQEAgaW50IGpzY21haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgICAgICBX VEY6OnJlbGVhc2VGYXN0TWFsbG9jRnJlZU1lbW9yeSgpOwogICAgICAgICB2bS5kZWxldGVBbGxD b2RlKERlbGV0ZUFsbENvZGVJZk5vdENvbGxlY3RpbmcpOwogCi0gICAgICAgIGlmICghdm0uaGVh cC5pc0N1cnJlbnRUaHJlYWRCdXN5KCkpIHsKKyAgICAgICAgaWYgKCF2bS5oZWFwLmN1cnJlbnRU aHJlYWRJc0RvaW5nR0NXb3JrKCkpIHsKICAgICAgICAgICAgIGlmIChpc1N5bmNocm9ub3VzKSB7 CiAgICAgICAgICAgICAgICAgdm0uaGVhcC5jb2xsZWN0Tm93KFN5bmMsIENvbGxlY3Rpb25TY29w ZTo6RnVsbCk7CiAgICAgICAgICAgICAgICAgV1RGOjpyZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1v cnkoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2su Y3BwCShyZXZpc2lvbiAyODU2MzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Q29kZUJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI5NCw3ICsyMjk0LDcgQEAgdm9pZCBD b2RlQmxvY2s6OmpldHRpc29uKFByb2ZpbGVyOjpKZXR0aQogICAgICAgICAvLyBUaGlzIGFjY29t cGxpc2hlcyAoMSksIGFuZCBkb2VzIGl0cyBvd24gYm9vay1rZWVwaW5nIGFib3V0IHdoZXRoZXIg aXQgaGFzIGFscmVhZHkgaGFwcGVuZWQuCiAgICAgICAgIGlmICghaml0Q29kZSgpLT5kZmdDb21t b24oKS0+aW52YWxpZGF0ZSgpKSB7CiAgICAgICAgICAgICAvLyBXZSd2ZSBhbHJlYWR5IGJlZW4g aW52YWxpZGF0ZWQuCi0gICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCh0aGlzICE9IHJlcGxhY2Vt ZW50KCkgfHwgKHZtLmhlYXAuaXNDdXJyZW50VGhyZWFkQnVzeSgpICYmICF2bS5oZWFwLmlzTWFy a2VkKG93bmVyRXhlY3V0YWJsZSgpKSkpOworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQodGhp cyAhPSByZXBsYWNlbWVudCgpIHx8ICh2bS5oZWFwLmN1cnJlbnRUaHJlYWRJc0RvaW5nR0NXb3Jr KCkgJiYgIXZtLmhlYXAuaXNNYXJrZWQob3duZXJFeGVjdXRhYmxlKCkpKSk7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KICAgICB9CkBAIC0yMzI2LDcgKzIzMjYsNyBAQCB2b2lkIENv ZGVCbG9jazo6amV0dGlzb24oUHJvZmlsZXI6OkpldHRpCiAKICAgICAvLyBKZXR0aXNvbiBjYW4g aGFwcGVuIGR1cmluZyBHQy4gV2UgZG9uJ3Qgd2FudCB0byBpbnN0YWxsIGNvZGUgdG8gYSBkZWFk IGV4ZWN1dGFibGUKICAgICAvLyBiZWNhdXNlIHRoYXQgd291bGQgYWRkIGEgZGVhZCBvYmplY3Qg dG8gdGhlIHJlbWVtYmVyZWQgc2V0LgotICAgIGlmICh2bS5oZWFwLmlzQ3VycmVudFRocmVhZEJ1 c3koKSAmJiAhdm0uaGVhcC5pc01hcmtlZChvd25lckV4ZWN1dGFibGUoKSkpCisgICAgaWYgKHZt LmhlYXAuY3VycmVudFRocmVhZElzRG9pbmdHQ1dvcmsoKSAmJiAhdm0uaGVhcC5pc01hcmtlZChv d25lckV4ZWN1dGFibGUoKSkpCiAgICAgICAgIHJldHVybjsKIAogI2lmIEVOQUJMRShKSVQpCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAkocmV2aXNpb24gMjg1NjM2KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEz OCwyMiArMTM4LDYgQEAgc2l6ZV90IHByb3BvcnRpb25hbEhlYXBTaXplKHNpemVfdCBoZWFwUwog ICAgIHJldHVybiBPcHRpb25zOjpsYXJnZUhlYXBHcm93dGhGYWN0b3IoKSAqIGhlYXBTaXplOwog fQogCi1ib29sIGlzVmFsaWRTaGFyZWRJbnN0YW5jZVRocmVhZFN0YXRlKFZNJiB2bSkKLXsKLSAg ICByZXR1cm4gdm0uY3VycmVudFRocmVhZElzSG9sZGluZ0FQSUxvY2soKTsKLX0KLQotYm9vbCBp c1ZhbGlkVGhyZWFkU3RhdGUoVk0mIHZtKQotewotICAgIGlmICh2bS5hdG9tU3RyaW5nVGFibGUo KSAhPSBUaHJlYWQ6OmN1cnJlbnQoKS5hdG9tU3RyaW5nVGFibGUoKSkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgaWYgKHZtLmlzU2hhcmVkSW5zdGFuY2UoKSAmJiAhaXNWYWxpZFNoYXJl ZEluc3RhbmNlVGhyZWFkU3RhdGUodm0pKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBy ZXR1cm4gdHJ1ZTsKLX0KLQogdm9pZCByZWNvcmRUeXBlKFZNJiB2bSwgVHlwZUNvdW50U2V0JiBz ZXQsIEpTQ2VsbCogY2VsbCkKIHsKICAgICBjb25zdCBjaGFyKiB0eXBlTmFtZSA9ICJbdW5rbm93 bl0iOwpAQCAtMjM3OSwxNyArMjM2Myw2IEBAIHZvaWQgSGVhcDo6ZGlkQWxsb2NhdGUoc2l6ZV90 IGJ5dGVzKQogICAgIHBlcmZvcm1JbmNyZW1lbnQoYnl0ZXMpOwogfQogCi1ib29sIEhlYXA6Omlz VmFsaWRBbGxvY2F0aW9uKHNpemVfdCkKLXsKLSAgICBpZiAoIWlzVmFsaWRUaHJlYWRTdGF0ZSh2 bSgpKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYgKGlzQ3VycmVudFRocmVhZEJ1 c3koKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIAotICAgIHJldHVybiB0cnVlOwotfQot CiB2b2lkIEhlYXA6OmFkZEZpbmFsaXplcihKU0NlbGwqIGNlbGwsIENGaW5hbGl6ZXIgZmluYWxp emVyKQogewogICAgIFdlYWtTZXQ6OmFsbG9jYXRlKGNlbGwsICZtX2NGaW5hbGl6ZXJPd25lciwg Yml0d2lzZV9jYXN0PHZvaWQqPihmaW5hbGl6ZXIpKTsgLy8gQmFsYW5jZWQgYnkgQ0ZpbmFsaXpl ck93bmVyOjpmaW5hbGl6ZSgpLgpAQCAtMjUzNiw3ICsyNTA5LDcgQEAgdm9pZCBIZWFwOjp3cml0 ZUJhcnJpZXJTbG93UGF0aChjb25zdCBKUwogICAgIGFkZFRvUmVtZW1iZXJlZFNldChmcm9tKTsK IH0KIAotYm9vbCBIZWFwOjppc0N1cnJlbnRUaHJlYWRCdXN5KCkKK2Jvb2wgSGVhcDo6Y3VycmVu dFRocmVhZElzRG9pbmdHQ1dvcmsoKQogewogICAgIHJldHVybiBUaHJlYWQ6Om1heUJlR0NUaHJl YWQoKSB8fCBtdXRhdG9yU3RhdGUoKSAhPSBNdXRhdG9yU3RhdGU6OlJ1bm5pbmc7CiB9CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCShyZXZpc2lvbiAyODU2MzYpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2NCw3ICsxNjQs NyBAQCBwdWJsaWM6CiAKICAgICAvLyBXZSdyZSBhbHdheXMgYnVzeSBvbiB0aGUgY29sbGVjdGlv biB0aHJlYWRzLiBPbiB0aGUgbWFpbiB0aHJlYWQsIHRoaXMgcmV0dXJucyB0cnVlIGlmIHdlJ3Jl CiAgICAgLy8gaGVscGluZyBoZWFwLgotICAgIEpTX0VYUE9SVF9QUklWQVRFIGJvb2wgaXNDdXJy ZW50VGhyZWFkQnVzeSgpOworICAgIEpTX0VYUE9SVF9QUklWQVRFIGJvb2wgY3VycmVudFRocmVh ZElzRG9pbmdHQ1dvcmsoKTsKICAgICAKICAgICB0eXBlZGVmIHZvaWQgKCpDRmluYWxpemVyKShK U0NlbGwqKTsKICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkIGFkZEZpbmFsaXplcihKU0NlbGwq LCBDRmluYWxpemVyKTsKQEAgLTQyNiw3ICs0MjYsNiBAQCBwcml2YXRlOgogICAgICAgICB2b2lk IGZpbmFsaXplKEhhbmRsZTxVbmtub3duPiwgdm9pZCogY29udGV4dCkgZmluYWw7CiAgICAgfTsK IAotICAgIEpTX0VYUE9SVF9QUklWQVRFIGJvb2wgaXNWYWxpZEFsbG9jYXRpb24oc2l6ZV90KTsK ICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkIHJlcG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVkU2xv d0Nhc2Uoc2l6ZV90KTsKICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkIGRlcHJlY2F0ZWRSZXBv cnRFeHRyYU1lbW9yeVNsb3dDYXNlKHNpemVfdCk7CiAgICAgCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9WTS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL1ZNLmgJKHJldmlzaW9uIDI4NTYzNikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL1ZNLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwODYsNyArMTA4Niw3IEBAIHB1Ymxp YzoKICNlbmRpZgogICAgIEpTX0VYUE9SVF9QUklWQVRFIHZvaWQgZHVtcFJlZ0V4cFRyYWNlKCk7 CiAKLSAgICBib29sIGlzQ29sbGVjdG9yQnVzeU9uQ3VycmVudFRocmVhZCgpIHsgcmV0dXJuIGhl YXAuaXNDdXJyZW50VGhyZWFkQnVzeSgpOyB9CisgICAgYm9vbCBpc0NvbGxlY3RvckJ1c3lPbkN1 cnJlbnRUaHJlYWQoKSB7IHJldHVybiBoZWFwLmN1cnJlbnRUaHJlYWRJc0RvaW5nR0NXb3JrKCk7 IH0KIAogI2lmIEVOQUJMRShHQ19WQUxJREFUSU9OKQogICAgIGJvb2wgaXNJbml0aWFsaXppbmdP YmplY3QoKSBjb25zdDsgCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODU2MzYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAy MS0xMS0xMSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1l IEhlYXA6OmlzQ3VycmVudFRocmVhZEJ1c3koKSB0byBIZWFwOjpjdXJyZW50VGhyZWFkSXNEb2lu Z0dDV29yaygpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjMzMDA1CisgICAgICAgIHJkYXI6Ly84NTMwNzIwNAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYmluZGluZ3MvanMvR0NDb250cm9sbGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkdDQ29udHJvbGxlcjo6Z2FyYmFnZUNvbGxlY3ROb3cpOgor ICAgICAgICAoV2ViQ29yZTo6R0NDb250cm9sbGVyOjpnYXJiYWdlQ29sbGVjdE5vd0lmTm90RG9u ZVJlY2VudGx5KToKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Oldvcmtlckdsb2JhbFNjb3BlOjpkZWxldGVKU0NvZGVBbmRHQyk6CisK IDIwMjEtMTEtMTAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIE1v dmUgbV9kb2VzR0MgZnJvbSBIZWFwIHRvIFZNLgpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvR0NDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9HQ0NvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAyODU2MzYpCisrKyBTb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9HQ0NvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Miw3 ICs5Miw3IEBAIHZvaWQgR0NDb250cm9sbGVyOjpnY1RpbWVyRmlyZWQoKQogdm9pZCBHQ0NvbnRy b2xsZXI6OmdhcmJhZ2VDb2xsZWN0Tm93KCkKIHsKICAgICBKU0xvY2tIb2xkZXIgbG9jayhjb21t b25WTSgpKTsKLSAgICBpZiAoIWNvbW1vblZNKCkuaGVhcC5pc0N1cnJlbnRUaHJlYWRCdXN5KCkp IHsKKyAgICBpZiAoIWNvbW1vblZNKCkuaGVhcC5jdXJyZW50VGhyZWFkSXNEb2luZ0dDV29yaygp KSB7CiAgICAgICAgIGNvbW1vblZNKCkuaGVhcC5jb2xsZWN0Tm93KFN5bmMsIENvbGxlY3Rpb25T Y29wZTo6RnVsbCk7CiAgICAgICAgIFdURjo6cmVsZWFzZUZhc3RNYWxsb2NGcmVlTWVtb3J5KCk7 CiAgICAgfQpAQCAtMTAyLDcgKzEwMiw3IEBAIHZvaWQgR0NDb250cm9sbGVyOjpnYXJiYWdlQ29s bGVjdE5vd0lmTm8KIHsKICNpZiBVU0UoQ0YpIHx8IFVTRShHTElCKQogICAgIEpTTG9ja0hvbGRl ciBsb2NrKGNvbW1vblZNKCkpOwotICAgIGlmICghY29tbW9uVk0oKS5oZWFwLmlzQ3VycmVudFRo cmVhZEJ1c3koKSkKKyAgICBpZiAoIWNvbW1vblZNKCkuaGVhcC5jdXJyZW50VGhyZWFkSXNEb2lu Z0dDV29yaygpKQogICAgICAgICBjb21tb25WTSgpLmhlYXAuY29sbGVjdE5vd0Z1bGxJZk5vdERv bmVSZWNlbnRseShBc3luYyk7CiAjZWxzZQogICAgIGdhcmJhZ2VDb2xsZWN0U29vbigpOwpJbmRl eDogU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJHbG9iYWxTY29wZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJHbG9iYWxTY29wZS5jcHAJKHJldmlz aW9uIDI4NTYzNikKKysrIFNvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyR2xvYmFsU2NvcGUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NzUsMTQgKzU3NSwxNCBAQCB2b2lkIFdvcmtlckdsb2Jh bFNjb3BlOjpkZWxldGVKU0NvZGVBbmRHCiAgICAgdm0oKS5kZWxldGVBbGxDb2RlKEpTQzo6RGVs ZXRlQWxsQ29kZUlmTm90Q29sbGVjdGluZyk7CiAKICAgICBpZiAoc3luY2hyb25vdXMgPT0gU3lu Y2hyb25vdXM6OlllcykgewotICAgICAgICBpZiAoIXZtKCkuaGVhcC5pc0N1cnJlbnRUaHJlYWRC dXN5KCkpIHsKKyAgICAgICAgaWYgKCF2bSgpLmhlYXAuY3VycmVudFRocmVhZElzRG9pbmdHQ1dv cmsoKSkgewogICAgICAgICAgICAgdm0oKS5oZWFwLmNvbGxlY3ROb3coSlNDOjpTeW5jLCBKU0M6 OkNvbGxlY3Rpb25TY29wZTo6RnVsbCk7CiAgICAgICAgICAgICBXVEY6OnJlbGVhc2VGYXN0TWFs bG9jRnJlZU1lbW9yeSgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQog I2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgaWYgKCF2bSgpLmhlYXAuaXNDdXJyZW50VGhy ZWFkQnVzeSgpKSB7CisgICAgaWYgKCF2bSgpLmhlYXAuY3VycmVudFRocmVhZElzRG9pbmdHQ1dv cmsoKSkgewogICAgICAgICB2bSgpLmhlYXAuY29sbGVjdE5vd0Z1bGxJZk5vdERvbmVSZWNlbnRs eShKU0M6OkFzeW5jKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K