225948 2021-05-18 17:50:57 -0700 Speed up debug validation in CacheableIdentifier::createFromIdentifierOwnedByCodeBlock(). 2021-05-19 15:41:01 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1761402 0 mark.lam 2021-05-18 17:50:57 -0700 rdar://78175542 1761405 1 429011 mark.lam 2021-05-18 18:07:38 -0700 Created attachment 429011 proposed patch. 1761406 2 429011 ysuzuki 2021-05-18 18:11:57 -0700 Comment on attachment 429011 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=429011&action=review > Source/JavaScriptCore/bytecode/CodeBlock.cpp:2936 > + createRareDataIfNecessary(); > + auto& cachedIdentifierUids = m_rareData->m_cachedIdentifierUids; > + if (UNLIKELY(cachedIdentifierUids.size() != numberOfIdentifiers)) { > + cachedIdentifierUids.reserveInitialCapacity(numberOfIdentifiers); > + for (unsigned index = 0; index < unlinkedIdentifiers; ++index) { > + const Identifier& identifier = unlinkedCode->identifier(index); > + cachedIdentifierUids.add(identifier.impl()); > + } > + if (numberOfDFGIdentifiers) { > + ASSERT(JITCode::isOptimizingJIT(jitType())); > + auto& dfgIdentifiers = m_jitCode->dfgCommon()->m_dfgIdentifiers; > + for (unsigned index = 0; index < numberOfDFGIdentifiers; ++index) { > + const Identifier& identifier = dfgIdentifiers[index]; > + cachedIdentifierUids.add(identifier.impl()); > + } > + } > + } > + return cachedIdentifierUids.contains(uid); This function can be called from DFG compilation thread. So we need to have a lock. 1761428 3 429018 mark.lam 2021-05-18 18:51:49 -0700 Created attachment 429018 proposed patch. 1761438 4 429018 ysuzuki 2021-05-18 19:08:19 -0700 Comment on attachment 429018 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=429018&action=review > Source/JavaScriptCore/bytecode/CodeBlock.cpp:2919 > + if (!m_rareData || m_rareData->m_cachedIdentifierUids.size() != numberOfIdentifiers) { m_cachedIdentifierUids.size() is dangerous without taking a lock. If it is in the middle of growing, then it can be SEGV since HashSet stores its size into the backing memory. The other part looks good to me. 1761446 5 mark.lam 2021-05-18 19:26:02 -0700 (In reply to Yusuke Suzuki from comment #4) > Comment on attachment 429018 [details] > proposed patch. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=429018&action=review > > > Source/JavaScriptCore/bytecode/CodeBlock.cpp:2919 > > + if (!m_rareData || m_rareData->m_cachedIdentifierUids.size() != numberOfIdentifiers) { > > m_cachedIdentifierUids.size() is dangerous without taking a lock. If it is > in the middle of growing, then it can be SEGV since HashSet stores its size > into the backing memory. > The other part looks good to me. I don't think the number of identifiers can grow by the time CacheableIdentifier::createFromIdentifierOwnedByCodeBlock() is called. The original code was iterating over existing identifiers and asserting that the specified identifier is found among the CodeBlock ones. 1761448 6 429025 mark.lam 2021-05-18 19:34:43 -0700 Created attachment 429025 proposed patch. 1761449 7 429025 mark.lam 2021-05-18 19:37:07 -0700 Comment on attachment 429025 proposed patch. Taking out of review first. Need to check one more thing. 1761450 8 429025 mark.lam 2021-05-18 19:42:44 -0700 Comment on attachment 429025 proposed patch. OK, all is well. Just wanted to verify that m_jitCode->dfgCommon()->m_dfgIdentifiers is only set once, and not appended to. It is indeed only set once in DesiredIdentifiers::reallyAdd(). Hence, the number of identifiers are fixed and will not grow. 1761451 9 429025 mark.lam 2021-05-18 19:46:13 -0700 Comment on attachment 429025 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=429025&action=review > Source/JavaScriptCore/bytecode/CodeBlock.cpp:2919 > + if (m_cachedIdentifierUids.size() != numberOfIdentifiers) { There is no issue with growing this because the table is fixed size. Since we create it on the side and WTFMove into m_cachedIdentifierUids only after it is fully initialized, m_cachedIdentifierUids.size() will only ever see 0 or the real size. 1761552 10 429025 mark.lam 2021-05-19 09:31:07 -0700 Comment on attachment 429025 proposed patch. Thanks for the review. Landing now. 1761561 11 ews-feeder 2021-05-19 09:49:37 -0700 Committed r277727 (237904@main): <https://commits.webkit.org/237904@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429025. 1761738 12 mark.lam 2021-05-19 15:41:01 -0700 Also landed CLoop build fix in r277759: <http://trac.webkit.org/r277759>. 429011 2021-05-18 18:07:38 -0700 2021-05-18 18:51:49 -0700 proposed patch. bug-225948.patch text/plain 7402 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc3Njk4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBA CisyMDIxLTA1LTE4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBT cGVlZCB1cCBkZWJ1ZyB2YWxpZGF0aW9uIGluIENhY2hlYWJsZUlkZW50aWZpZXI6OmNyZWF0ZUZy b21JZGVudGlmaWVyT3duZWRCeUNvZGVCbG9jaygpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1OTQ4CisgICAgICAgIHJkYXI6Ly83ODE3NTU0Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDEuIEludHJv ZHVjZSBDb2RlQmxvY2s6Omhhc0lkZW50aWZpZXIoKSBzbyB0aGF0IHdlIGNhbiBlbmNhcHN1bGF0 ZSB0aGUgaWRlbnRpZmllcgorICAgICAgICAgICBzZWFyY2ggYmV0dGVyLiAgQ2hhbmdlIENhY2hl YWJsZUlkZW50aWZpZXI6OmNyZWF0ZUZyb21JZGVudGlmaWVyT3duZWRCeUNvZGVCbG9jaygpCisg ICAgICAgICAgIHRvIGNhbGwgdGhpcyBtZXRob2QgaW5zdGVhZCBvZiByb2xsaW5nIGl0cyBvd24g aWRlbnRpZmllciBzZWFyY2guCisKKyAgICAgICAgMi4gSWYgdGhlIENvZGVCbG9jayBpcyBwYXRo b2xvZ2ljYWwgYW5kIGhhcyBhIHJpZGljdWxvdXMgbnVtYmVyIG9mIGlkZW50aWZpZXJzCisgICAg ICAgICAgIHRvIHNlYXJjaCwgY3JlYXRlIGEgY2FjaGVkIGhhc2ggc2V0IG9mIHRoZSBpZGVudGlm aWVycywgYW5kIHVzZSB0aGF0IGZvcgorICAgICAgICAgICBkb2luZyB0aGUgc2VhcmNoIGluc3Rl YWQuCisKKyAgICAgICAgICAgQXBwYXJlbnRseSwgWW91VHViZSBjYW4gaGF2ZSBhIHNpbmdsZSBK UyBmdW5jdGlvbiB3aXRoIDIxNzc2ODkgYnl0ZWNvZGVzLCB3aGVyZQorICAgICAgICAgICBhIGxh cmdlIHBvcnRpb24gb2YgdGhvc2UgYXJlIHB1dF9ieV9pZHMuICBUaGUgZnVuY3Rpb24gYWxzbyBo YXMgc29tZSAxN2srCisgICAgICAgICAgIGlkZW50aWZpZXJzLiAgV2l0aCB0aGF0IG1heSBieXRl Y29kZXMgZG9pbmcgYSB2YWxpZGF0aW9uIHNlYXJjaCBvbiAxN2srCisgICAgICAgICAgIGlkZW50 aWZpZXJzIGluIGEgRGVidWcgYnVpbGQsIHRoZSBzaXRlIGNhbiBiZWNvbWUgdW4tdXNlYWJsZS4g IFRoaXMgb3B0aW1pemF0aW9uCisgICAgICAgICAgIGJyaW5ncyBpdCBiYWNrIGZyb20gdW4tdXNl YWJsZSB0byBiYXJlbHkgdG9sZXJhYmxlIG9uIHRoZSBEZWJ1ZyBidWlsZC4KKworICAgICAgICAz LiBBbHNvIGZldGNoIHRoZSBVbmxpbmtlZENvZGVCbG9jayBmcm9tIHRoZSBXcml0ZUJhcnJpZXIg ZmllbGQganVzdCBvbmNlIGluCisgICAgICAgICAgIENvZGVCbG9jazo6aWRlbnRpZmllcigpIGFu ZCBDb2RlQmxvY2s6Omhhc0lkZW50aWZpZXIoKS4gIFRoaXMgbWF5IG5vdCBtYXR0ZXIKKyAgICAg ICAgICAgb24gYSBSZWxlYXNlIGJ1aWxkLCBidXQgaXQgY2FuIGFkZCB1cCBvbiBhIERlYnVnIGJ1 aWxkLCB3aGljaCBpcyBhbHJlYWR5IHNsb3cuCisgICAgICAgICAgIFdlIHNob3VsZCB0cnkgdG8g YXZvaWQgZG9pbmcgcmVkdW5kYW50IHZhbGlkYXRpb24gdmlhIHRoZSBXcml0ZUJhcnJpZXIgYWNj ZXNzLgorCisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6 Q29kZUJsb2NrOjppZGVudGlmaWVyIGNvbnN0KToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpo YXNJZGVudGlmaWVyKToKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2suaDoKKyAgICAgICAg KiBydW50aW1lL0NhY2hlYWJsZUlkZW50aWZpZXJJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkNh Y2hlYWJsZUlkZW50aWZpZXI6OmNyZWF0ZUZyb21JZGVudGlmaWVyT3duZWRCeUNvZGVCbG9jayk6 CisKIDIwMjEtMDUtMTggIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIERhdGEgQ2FsbCBJQ3MgdGhhdCBkb24ndCByZXBhdGNoIGFuZCB1c2UgdGhlbSBpbiB0 aGUgYmFzZWxpbmUgSklUCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29k ZUJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Q29kZUJsb2NrLmNwcAkocmV2aXNpb24gMjc3NjgzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4OTgsMTQgKzI4OTgs NjAgQEAgc2l6ZV90IENvZGVCbG9jazo6bnVtYmVyT2ZERkdJZGVudGlmaWVycwogCiBjb25zdCBJ ZGVudGlmaWVyJiBDb2RlQmxvY2s6OmlkZW50aWZpZXIoaW50IGluZGV4KSBjb25zdAogewotICAg IHNpemVfdCB1bmxpbmtlZElkZW50aWZpZXJzID0gbV91bmxpbmtlZENvZGUtPm51bWJlck9mSWRl bnRpZmllcnMoKTsKKyAgICBVbmxpbmtlZENvZGVCbG9jayogdW5saW5rZWRDb2RlID0gbV91bmxp bmtlZENvZGUuZ2V0KCk7CisgICAgc2l6ZV90IHVubGlua2VkSWRlbnRpZmllcnMgPSB1bmxpbmtl ZENvZGUtPm51bWJlck9mSWRlbnRpZmllcnMoKTsKICAgICBpZiAoc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KGluZGV4KSA8IHVubGlua2VkSWRlbnRpZmllcnMpCi0gICAgICAgIHJldHVybiBtX3VubGlu a2VkQ29kZS0+aWRlbnRpZmllcihpbmRleCk7CisgICAgICAgIHJldHVybiB1bmxpbmtlZENvZGUt PmlkZW50aWZpZXIoaW5kZXgpOwogICAgIEFTU0VSVChKSVRDb2RlOjppc09wdGltaXppbmdKSVQo aml0VHlwZSgpKSk7CiAgICAgcmV0dXJuIG1faml0Q29kZS0+ZGZnQ29tbW9uKCktPm1fZGZnSWRl bnRpZmllcnNbaW5kZXggLSB1bmxpbmtlZElkZW50aWZpZXJzXTsKIH0KICNlbmRpZiAvLyBFTkFC TEUoREZHX0pJVCkKIAorI2lmIEFTU0VSVF9FTkFCTEVECitib29sIENvZGVCbG9jazo6aGFzSWRl bnRpZmllcihVbmlxdWVkU3RyaW5nSW1wbCogdWlkKQoreworICAgIFVubGlua2VkQ29kZUJsb2Nr KiB1bmxpbmtlZENvZGUgPSBtX3VubGlua2VkQ29kZS5nZXQoKTsKKyAgICBzaXplX3QgdW5saW5r ZWRJZGVudGlmaWVycyA9IHVubGlua2VkQ29kZS0+bnVtYmVyT2ZJZGVudGlmaWVycygpOworICAg IHNpemVfdCBudW1iZXJPZkRGR0lkZW50aWZpZXJzID0gdGhpcy0+bnVtYmVyT2ZERkdJZGVudGlm aWVycygpOworICAgIHNpemVfdCBudW1iZXJPZklkZW50aWZpZXJzID0gdW5saW5rZWRJZGVudGlm aWVycyArIG51bWJlck9mREZHSWRlbnRpZmllcnM7CisKKyAgICBpZiAobnVtYmVyT2ZJZGVudGlm aWVycyA+IDEwMCkgeworICAgICAgICBjcmVhdGVSYXJlRGF0YUlmTmVjZXNzYXJ5KCk7CisgICAg ICAgIGF1dG8mIGNhY2hlZElkZW50aWZpZXJVaWRzID0gbV9yYXJlRGF0YS0+bV9jYWNoZWRJZGVu dGlmaWVyVWlkczsKKyAgICAgICAgaWYgKFVOTElLRUxZKGNhY2hlZElkZW50aWZpZXJVaWRzLnNp emUoKSAhPSBudW1iZXJPZklkZW50aWZpZXJzKSkgeworICAgICAgICAgICAgY2FjaGVkSWRlbnRp ZmllclVpZHMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZklkZW50aWZpZXJzKTsKKyAg ICAgICAgICAgIGZvciAodW5zaWduZWQgaW5kZXggPSAwOyBpbmRleCA8IHVubGlua2VkSWRlbnRp ZmllcnM7ICsraW5kZXgpIHsKKyAgICAgICAgICAgICAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVu dGlmaWVyID0gdW5saW5rZWRDb2RlLT5pZGVudGlmaWVyKGluZGV4KTsKKyAgICAgICAgICAgICAg ICBjYWNoZWRJZGVudGlmaWVyVWlkcy5hZGQoaWRlbnRpZmllci5pbXBsKCkpOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgaWYgKG51bWJlck9mREZHSWRlbnRpZmllcnMpIHsKKyAgICAgICAg ICAgICAgICBBU1NFUlQoSklUQ29kZTo6aXNPcHRpbWl6aW5nSklUKGppdFR5cGUoKSkpOworICAg ICAgICAgICAgICAgIGF1dG8mIGRmZ0lkZW50aWZpZXJzID0gbV9qaXRDb2RlLT5kZmdDb21tb24o KS0+bV9kZmdJZGVudGlmaWVyczsKKyAgICAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGluZGV4 ID0gMDsgaW5kZXggPCBudW1iZXJPZkRGR0lkZW50aWZpZXJzOyArK2luZGV4KSB7CisgICAgICAg ICAgICAgICAgICAgIGNvbnN0IElkZW50aWZpZXImIGlkZW50aWZpZXIgPSBkZmdJZGVudGlmaWVy c1tpbmRleF07CisgICAgICAgICAgICAgICAgICAgIGNhY2hlZElkZW50aWZpZXJVaWRzLmFkZChp ZGVudGlmaWVyLmltcGwoKSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAg ICAgICB9CisgICAgICAgIHJldHVybiBjYWNoZWRJZGVudGlmaWVyVWlkcy5jb250YWlucyh1aWQp OworICAgIH0KKworICAgIGZvciAodW5zaWduZWQgaW5kZXggPSAwOyBpbmRleCA8IHVubGlua2Vk SWRlbnRpZmllcnM7ICsraW5kZXgpIHsKKyAgICAgICAgY29uc3QgSWRlbnRpZmllciYgaWRlbnRp ZmllciA9IHVubGlua2VkQ29kZS0+aWRlbnRpZmllcihpbmRleCk7CisgICAgICAgIGlmIChpZGVu dGlmaWVyLmltcGwoKSA9PSB1aWQpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9Cisg ICAgQVNTRVJUKEpJVENvZGU6OmlzT3B0aW1pemluZ0pJVChqaXRUeXBlKCkpKTsKKyAgICBhdXRv JiBkZmdJZGVudGlmaWVycyA9IG1faml0Q29kZS0+ZGZnQ29tbW9uKCktPm1fZGZnSWRlbnRpZmll cnM7CisgICAgZm9yICh1bnNpZ25lZCBpbmRleCA9IDA7IGluZGV4IDwgbnVtYmVyT2ZERkdJZGVu dGlmaWVyczsgKytpbmRleCkgeworICAgICAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVudGlmaWVy ID0gZGZnSWRlbnRpZmllcnNbaW5kZXhdOworICAgICAgICBpZiAoaWRlbnRpZmllci5pbXBsKCkg PT0gdWlkKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxz ZTsKK30KKyNlbmRpZgorCiB2b2lkIENvZGVCbG9jazo6dXBkYXRlQWxsVmFsdWVQcm9maWxlUHJl ZGljdGlvbnNBbmRDb3VudExpdmVuZXNzKHVuc2lnbmVkJiBudW1iZXJPZkxpdmVOb25Bcmd1bWVu dFZhbHVlUHJvZmlsZXMsIHVuc2lnbmVkJiBudW1iZXJPZlNhbXBsZXNJblByb2ZpbGVzKQogewog ICAgIENvbmN1cnJlbnRKU0xvY2tlciBsb2NrZXIobV9sb2NrKTsKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmgJKHJldmlzaW9uIDI3NzY4MykKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAkod29ya2luZyBjb3B5KQpA QCAtNzEsNiArNzEsNyBAQAogI2luY2x1ZGUgPHd0Zi9CYWcuaD4KICNpbmNsdWRlIDx3dGYvRmFz dE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9GaXhlZFZlY3Rvci5oPgorI2luY2x1ZGUgPHd0Zi9I YXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9TZWdtZW50 ZWRWZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CkBAIC01NzIsNiArNTczLDkgQEAg cHVibGljOgogICAgIHNpemVfdCBudW1iZXJPZklkZW50aWZpZXJzKCkgY29uc3QgeyByZXR1cm4g bV91bmxpbmtlZENvZGUtPm51bWJlck9mSWRlbnRpZmllcnMoKTsgfQogICAgIGNvbnN0IElkZW50 aWZpZXImIGlkZW50aWZpZXIoaW50IGluZGV4KSBjb25zdCB7IHJldHVybiBtX3VubGlua2VkQ29k ZS0+aWRlbnRpZmllcihpbmRleCk7IH0KICNlbmRpZgorI2lmIEFTU0VSVF9FTkFCTEVECisgICAg Ym9vbCBoYXNJZGVudGlmaWVyKFVuaXF1ZWRTdHJpbmdJbXBsKik7CisjZW5kaWYKIAogICAgIFZl Y3RvcjxXcml0ZUJhcnJpZXI8VW5rbm93bj4+JiBjb25zdGFudHMoKSB7IHJldHVybiBtX2NvbnN0 YW50UmVnaXN0ZXJzOyB9CiAgICAgdW5zaWduZWQgYWRkQ29uc3RhbnQoY29uc3QgQ29uY3VycmVu dEpTTG9ja2VyJiwgSlNWYWx1ZSB2KQpAQCAtODg0LDYgKzg4OCw5IEBAIHB1YmxpYzoKICAgICAg ICAgVmVjdG9yPEhhbmRsZXJJbmZvPiBtX2V4Y2VwdGlvbkhhbmRsZXJzOwogCiAgICAgICAgIERp cmVjdEV2YWxDb2RlQ2FjaGUgbV9kaXJlY3RFdmFsQ29kZUNhY2hlOworI2lmIEFTU0VSVF9FTkFC TEVECisgICAgICAgIEhhc2hTZXQ8VW5pcXVlZFN0cmluZ0ltcGwqPiBtX2NhY2hlZElkZW50aWZp ZXJVaWRzOworI2VuZGlmCiAgICAgfTsKIAogICAgIHZvaWQgY2xlYXJFeGNlcHRpb25IYW5kbGVy cygpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9DYWNoZWFibGVJZGVudGlm aWVySW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0NhY2hlYWJsZUlkZW50aWZpZXJJbmxpbmVzLmgJKHJldmlzaW9uIDI3NzY4MykKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hlYWJsZUlkZW50aWZpZXJJbmxpbmVzLmgJKHdv cmtpbmcgY29weSkKQEAgLTQyLDE4ICs0Miw3IEBAIGlubGluZSBDYWNoZWFibGVJZGVudGlmaWVy IENhY2hlYWJsZUlkZW4KIAogaW5saW5lIENhY2hlYWJsZUlkZW50aWZpZXIgQ2FjaGVhYmxlSWRl bnRpZmllcjo6Y3JlYXRlRnJvbUlkZW50aWZpZXJPd25lZEJ5Q29kZUJsb2NrKENvZGVCbG9jayog Y29kZUJsb2NrLCBVbmlxdWVkU3RyaW5nSW1wbCogdWlkKQogewotICAgIFVOVVNFRF9QQVJBTShj b2RlQmxvY2spOwotI2lmIEFTU0VSVF9FTkFCTEVECi0gICAgYm9vbCBmb3VuZCA9IGZhbHNlOwot ICAgIGZvciAodW5zaWduZWQgaW5kZXggPSAwOyBpbmRleCA8IGNvZGVCbG9jay0+bnVtYmVyT2ZJ ZGVudGlmaWVycygpOyArK2luZGV4KSB7Ci0gICAgICAgIGNvbnN0IElkZW50aWZpZXImIGlkZW50 aWZpZXIgPSBjb2RlQmxvY2stPmlkZW50aWZpZXIoaW5kZXgpOwotICAgICAgICBpZiAoaWRlbnRp Zmllci5pbXBsKCkgPT0gdWlkKSB7Ci0gICAgICAgICAgICBmb3VuZCA9IHRydWU7Ci0gICAgICAg ICAgICBicmVhazsKLSAgICAgICAgfQotICAgIH0KLSAgICBBU1NFUlQoZm91bmQpOwotI2VuZGlm CisgICAgQVNTRVJUX1VOVVNFRChjb2RlQmxvY2ssIGNvZGVCbG9jay0+aGFzSWRlbnRpZmllcih1 aWQpKTsKICAgICByZXR1cm4gQ2FjaGVhYmxlSWRlbnRpZmllcih1aWQpOwogfQogCg== 429018 2021-05-18 18:51:49 -0700 2021-05-18 19:34:43 -0700 proposed patch. bug-225948.patch text/plain 7594 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc3Njk4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBA CisyMDIxLTA1LTE4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBT cGVlZCB1cCBkZWJ1ZyB2YWxpZGF0aW9uIGluIENhY2hlYWJsZUlkZW50aWZpZXI6OmNyZWF0ZUZy b21JZGVudGlmaWVyT3duZWRCeUNvZGVCbG9jaygpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1OTQ4CisgICAgICAgIHJkYXI6Ly83ODE3NTU0Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDEuIEludHJv ZHVjZSBDb2RlQmxvY2s6Omhhc0lkZW50aWZpZXIoKSBzbyB0aGF0IHdlIGNhbiBlbmNhcHN1bGF0 ZSB0aGUgaWRlbnRpZmllcgorICAgICAgICAgICBzZWFyY2ggYmV0dGVyLiAgQ2hhbmdlIENhY2hl YWJsZUlkZW50aWZpZXI6OmNyZWF0ZUZyb21JZGVudGlmaWVyT3duZWRCeUNvZGVCbG9jaygpCisg ICAgICAgICAgIHRvIGNhbGwgdGhpcyBtZXRob2QgaW5zdGVhZCBvZiByb2xsaW5nIGl0cyBvd24g aWRlbnRpZmllciBzZWFyY2guCisKKyAgICAgICAgMi4gSWYgdGhlIENvZGVCbG9jayBpcyBwYXRo b2xvZ2ljYWwgYW5kIGhhcyBhIHJpZGljdWxvdXMgbnVtYmVyIG9mIGlkZW50aWZpZXJzCisgICAg ICAgICAgIHRvIHNlYXJjaCwgY3JlYXRlIGEgY2FjaGVkIGhhc2ggc2V0IG9mIHRoZSBpZGVudGlm aWVycywgYW5kIHVzZSB0aGF0IGZvcgorICAgICAgICAgICBkb2luZyB0aGUgc2VhcmNoIGluc3Rl YWQuCisKKyAgICAgICAgICAgQXBwYXJlbnRseSwgWW91VHViZSBjYW4gaGF2ZSBhIHNpbmdsZSBK UyBmdW5jdGlvbiB3aXRoIDIxNzc2ODkgYnl0ZWNvZGVzLCB3aGVyZQorICAgICAgICAgICBhIGxh cmdlIHBvcnRpb24gb2YgdGhvc2UgYXJlIHB1dF9ieV9pZHMuICBUaGUgZnVuY3Rpb24gYWxzbyBo YXMgc29tZSAxN2srCisgICAgICAgICAgIGlkZW50aWZpZXJzLiAgV2l0aCB0aGF0IG1heSBieXRl Y29kZXMgZG9pbmcgYSB2YWxpZGF0aW9uIHNlYXJjaCBvbiAxN2srCisgICAgICAgICAgIGlkZW50 aWZpZXJzIGluIGEgRGVidWcgYnVpbGQsIHRoZSBzaXRlIGNhbiBiZWNvbWUgdW4tdXNlYWJsZS4g IFRoaXMgb3B0aW1pemF0aW9uCisgICAgICAgICAgIGJyaW5ncyBpdCBiYWNrIGZyb20gdW4tdXNl YWJsZSB0byBiYXJlbHkgdG9sZXJhYmxlIG9uIHRoZSBEZWJ1ZyBidWlsZC4KKworICAgICAgICAz LiBBbHNvIGZldGNoIHRoZSBVbmxpbmtlZENvZGVCbG9jayBmcm9tIHRoZSBXcml0ZUJhcnJpZXIg ZmllbGQganVzdCBvbmNlIGluCisgICAgICAgICAgIENvZGVCbG9jazo6aWRlbnRpZmllcigpIGFu ZCBDb2RlQmxvY2s6Omhhc0lkZW50aWZpZXIoKS4gIFRoaXMgbWF5IG5vdCBtYXR0ZXIKKyAgICAg ICAgICAgb24gYSBSZWxlYXNlIGJ1aWxkLCBidXQgaXQgY2FuIGFkZCB1cCBvbiBhIERlYnVnIGJ1 aWxkLCB3aGljaCBpcyBhbHJlYWR5IHNsb3cuCisgICAgICAgICAgIFdlIHNob3VsZCB0cnkgdG8g YXZvaWQgZG9pbmcgcmVkdW5kYW50IHZhbGlkYXRpb24gdmlhIHRoZSBXcml0ZUJhcnJpZXIgYWNj ZXNzLgorCisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6 Q29kZUJsb2NrOjppZGVudGlmaWVyIGNvbnN0KToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpo YXNJZGVudGlmaWVyKToKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2suaDoKKyAgICAgICAg KiBydW50aW1lL0NhY2hlYWJsZUlkZW50aWZpZXJJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkNh Y2hlYWJsZUlkZW50aWZpZXI6OmNyZWF0ZUZyb21JZGVudGlmaWVyT3duZWRCeUNvZGVCbG9jayk6 CisKIDIwMjEtMDUtMTggIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIERhdGEgQ2FsbCBJQ3MgdGhhdCBkb24ndCByZXBhdGNoIGFuZCB1c2UgdGhlbSBpbiB0 aGUgYmFzZWxpbmUgSklUCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29k ZUJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Q29kZUJsb2NrLmNwcAkocmV2aXNpb24gMjc3NjgzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4OTgsMTQgKzI4OTgs NjMgQEAgc2l6ZV90IENvZGVCbG9jazo6bnVtYmVyT2ZERkdJZGVudGlmaWVycwogCiBjb25zdCBJ ZGVudGlmaWVyJiBDb2RlQmxvY2s6OmlkZW50aWZpZXIoaW50IGluZGV4KSBjb25zdAogewotICAg IHNpemVfdCB1bmxpbmtlZElkZW50aWZpZXJzID0gbV91bmxpbmtlZENvZGUtPm51bWJlck9mSWRl bnRpZmllcnMoKTsKKyAgICBVbmxpbmtlZENvZGVCbG9jayogdW5saW5rZWRDb2RlID0gbV91bmxp bmtlZENvZGUuZ2V0KCk7CisgICAgc2l6ZV90IHVubGlua2VkSWRlbnRpZmllcnMgPSB1bmxpbmtl ZENvZGUtPm51bWJlck9mSWRlbnRpZmllcnMoKTsKICAgICBpZiAoc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KGluZGV4KSA8IHVubGlua2VkSWRlbnRpZmllcnMpCi0gICAgICAgIHJldHVybiBtX3VubGlu a2VkQ29kZS0+aWRlbnRpZmllcihpbmRleCk7CisgICAgICAgIHJldHVybiB1bmxpbmtlZENvZGUt PmlkZW50aWZpZXIoaW5kZXgpOwogICAgIEFTU0VSVChKSVRDb2RlOjppc09wdGltaXppbmdKSVQo aml0VHlwZSgpKSk7CiAgICAgcmV0dXJuIG1faml0Q29kZS0+ZGZnQ29tbW9uKCktPm1fZGZnSWRl bnRpZmllcnNbaW5kZXggLSB1bmxpbmtlZElkZW50aWZpZXJzXTsKIH0KICNlbmRpZiAvLyBFTkFC TEUoREZHX0pJVCkKIAorI2lmIEFTU0VSVF9FTkFCTEVECitib29sIENvZGVCbG9jazo6aGFzSWRl bnRpZmllcihVbmlxdWVkU3RyaW5nSW1wbCogdWlkKQoreworICAgIFVubGlua2VkQ29kZUJsb2Nr KiB1bmxpbmtlZENvZGUgPSBtX3VubGlua2VkQ29kZS5nZXQoKTsKKyAgICBzaXplX3QgdW5saW5r ZWRJZGVudGlmaWVycyA9IHVubGlua2VkQ29kZS0+bnVtYmVyT2ZJZGVudGlmaWVycygpOworICAg IHNpemVfdCBudW1iZXJPZkRGR0lkZW50aWZpZXJzID0gdGhpcy0+bnVtYmVyT2ZERkdJZGVudGlm aWVycygpOworICAgIHNpemVfdCBudW1iZXJPZklkZW50aWZpZXJzID0gdW5saW5rZWRJZGVudGlm aWVycyArIG51bWJlck9mREZHSWRlbnRpZmllcnM7CisKKyAgICBpZiAobnVtYmVyT2ZJZGVudGlm aWVycyA+IDEwMCkgeworICAgICAgICBpZiAoIW1fcmFyZURhdGEgfHwgbV9yYXJlRGF0YS0+bV9j YWNoZWRJZGVudGlmaWVyVWlkcy5zaXplKCkgIT0gbnVtYmVyT2ZJZGVudGlmaWVycykgeworICAg ICAgICAgICAgQ29uY3VycmVudEpTTG9ja2VyIGxvY2tlcihtX2xvY2spOworICAgICAgICAgICAg Y3JlYXRlUmFyZURhdGFJZk5lY2Vzc2FyeSgpOworICAgICAgICAgICAgSGFzaFNldDxVbmlxdWVk U3RyaW5nSW1wbCo+IGNhY2hlZElkZW50aWZpZXJVaWRzOworICAgICAgICAgICAgY2FjaGVkSWRl bnRpZmllclVpZHMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZklkZW50aWZpZXJzKTsK KyAgICAgICAgICAgIGZvciAodW5zaWduZWQgaW5kZXggPSAwOyBpbmRleCA8IHVubGlua2VkSWRl bnRpZmllcnM7ICsraW5kZXgpIHsKKyAgICAgICAgICAgICAgICBjb25zdCBJZGVudGlmaWVyJiBp ZGVudGlmaWVyID0gdW5saW5rZWRDb2RlLT5pZGVudGlmaWVyKGluZGV4KTsKKyAgICAgICAgICAg ICAgICBjYWNoZWRJZGVudGlmaWVyVWlkcy5hZGQoaWRlbnRpZmllci5pbXBsKCkpOworICAgICAg ICAgICAgfQorICAgICAgICAgICAgaWYgKG51bWJlck9mREZHSWRlbnRpZmllcnMpIHsKKyAgICAg ICAgICAgICAgICBBU1NFUlQoSklUQ29kZTo6aXNPcHRpbWl6aW5nSklUKGppdFR5cGUoKSkpOwor ICAgICAgICAgICAgICAgIGF1dG8mIGRmZ0lkZW50aWZpZXJzID0gbV9qaXRDb2RlLT5kZmdDb21t b24oKS0+bV9kZmdJZGVudGlmaWVyczsKKyAgICAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGlu ZGV4ID0gMDsgaW5kZXggPCBudW1iZXJPZkRGR0lkZW50aWZpZXJzOyArK2luZGV4KSB7CisgICAg ICAgICAgICAgICAgICAgIGNvbnN0IElkZW50aWZpZXImIGlkZW50aWZpZXIgPSBkZmdJZGVudGlm aWVyc1tpbmRleF07CisgICAgICAgICAgICAgICAgICAgIGNhY2hlZElkZW50aWZpZXJVaWRzLmFk ZChpZGVudGlmaWVyLmltcGwoKSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQor ICAgICAgICAgICAgV1RGOjpzdG9yZVN0b3JlRmVuY2UoKTsKKyAgICAgICAgICAgIG1fcmFyZURh dGEtPm1fY2FjaGVkSWRlbnRpZmllclVpZHMgPSBXVEZNb3ZlKGNhY2hlZElkZW50aWZpZXJVaWRz KTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gbV9yYXJlRGF0YS0+bV9jYWNoZWRJZGVudGlm aWVyVWlkcy5jb250YWlucyh1aWQpOworICAgIH0KKworICAgIGZvciAodW5zaWduZWQgaW5kZXgg PSAwOyBpbmRleCA8IHVubGlua2VkSWRlbnRpZmllcnM7ICsraW5kZXgpIHsKKyAgICAgICAgY29u c3QgSWRlbnRpZmllciYgaWRlbnRpZmllciA9IHVubGlua2VkQ29kZS0+aWRlbnRpZmllcihpbmRl eCk7CisgICAgICAgIGlmIChpZGVudGlmaWVyLmltcGwoKSA9PSB1aWQpCisgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgQVNTRVJUKEpJVENvZGU6OmlzT3B0aW1pemluZ0pJVChq aXRUeXBlKCkpKTsKKyAgICBhdXRvJiBkZmdJZGVudGlmaWVycyA9IG1faml0Q29kZS0+ZGZnQ29t bW9uKCktPm1fZGZnSWRlbnRpZmllcnM7CisgICAgZm9yICh1bnNpZ25lZCBpbmRleCA9IDA7IGlu ZGV4IDwgbnVtYmVyT2ZERkdJZGVudGlmaWVyczsgKytpbmRleCkgeworICAgICAgICBjb25zdCBJ ZGVudGlmaWVyJiBpZGVudGlmaWVyID0gZGZnSWRlbnRpZmllcnNbaW5kZXhdOworICAgICAgICBp ZiAoaWRlbnRpZmllci5pbXBsKCkgPT0gdWlkKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKyNlbmRpZgorCiB2b2lkIENvZGVCbG9jazo6dXBk YXRlQWxsVmFsdWVQcm9maWxlUHJlZGljdGlvbnNBbmRDb3VudExpdmVuZXNzKHVuc2lnbmVkJiBu dW1iZXJPZkxpdmVOb25Bcmd1bWVudFZhbHVlUHJvZmlsZXMsIHVuc2lnbmVkJiBudW1iZXJPZlNh bXBsZXNJblByb2ZpbGVzKQogewogICAgIENvbmN1cnJlbnRKU0xvY2tlciBsb2NrZXIobV9sb2Nr KTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmgJKHJl dmlzaW9uIDI3NzY4MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxv Y2suaAkod29ya2luZyBjb3B5KQpAQCAtNzEsNiArNzEsNyBAQAogI2luY2x1ZGUgPHd0Zi9CYWcu aD4KICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9GaXhlZFZlY3Rv ci5oPgorI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgog I2luY2x1ZGUgPHd0Zi9TZWdtZW50ZWRWZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+ CkBAIC01NzIsNiArNTczLDkgQEAgcHVibGljOgogICAgIHNpemVfdCBudW1iZXJPZklkZW50aWZp ZXJzKCkgY29uc3QgeyByZXR1cm4gbV91bmxpbmtlZENvZGUtPm51bWJlck9mSWRlbnRpZmllcnMo KTsgfQogICAgIGNvbnN0IElkZW50aWZpZXImIGlkZW50aWZpZXIoaW50IGluZGV4KSBjb25zdCB7 IHJldHVybiBtX3VubGlua2VkQ29kZS0+aWRlbnRpZmllcihpbmRleCk7IH0KICNlbmRpZgorI2lm IEFTU0VSVF9FTkFCTEVECisgICAgYm9vbCBoYXNJZGVudGlmaWVyKFVuaXF1ZWRTdHJpbmdJbXBs Kik7CisjZW5kaWYKIAogICAgIFZlY3RvcjxXcml0ZUJhcnJpZXI8VW5rbm93bj4+JiBjb25zdGFu dHMoKSB7IHJldHVybiBtX2NvbnN0YW50UmVnaXN0ZXJzOyB9CiAgICAgdW5zaWduZWQgYWRkQ29u c3RhbnQoY29uc3QgQ29uY3VycmVudEpTTG9ja2VyJiwgSlNWYWx1ZSB2KQpAQCAtODg0LDYgKzg4 OCw5IEBAIHB1YmxpYzoKICAgICAgICAgVmVjdG9yPEhhbmRsZXJJbmZvPiBtX2V4Y2VwdGlvbkhh bmRsZXJzOwogCiAgICAgICAgIERpcmVjdEV2YWxDb2RlQ2FjaGUgbV9kaXJlY3RFdmFsQ29kZUNh Y2hlOworI2lmIEFTU0VSVF9FTkFCTEVECisgICAgICAgIEhhc2hTZXQ8VW5pcXVlZFN0cmluZ0lt cGwqPiBtX2NhY2hlZElkZW50aWZpZXJVaWRzOworI2VuZGlmCiAgICAgfTsKIAogICAgIHZvaWQg Y2xlYXJFeGNlcHRpb25IYW5kbGVycygpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9DYWNoZWFibGVJZGVudGlmaWVySW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hlYWJsZUlkZW50aWZpZXJJbmxpbmVzLmgJKHJldmlz aW9uIDI3NzY4MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hlYWJsZUlk ZW50aWZpZXJJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDE4ICs0Miw3IEBAIGlubGlu ZSBDYWNoZWFibGVJZGVudGlmaWVyIENhY2hlYWJsZUlkZW4KIAogaW5saW5lIENhY2hlYWJsZUlk ZW50aWZpZXIgQ2FjaGVhYmxlSWRlbnRpZmllcjo6Y3JlYXRlRnJvbUlkZW50aWZpZXJPd25lZEJ5 Q29kZUJsb2NrKENvZGVCbG9jayogY29kZUJsb2NrLCBVbmlxdWVkU3RyaW5nSW1wbCogdWlkKQog ewotICAgIFVOVVNFRF9QQVJBTShjb2RlQmxvY2spOwotI2lmIEFTU0VSVF9FTkFCTEVECi0gICAg Ym9vbCBmb3VuZCA9IGZhbHNlOwotICAgIGZvciAodW5zaWduZWQgaW5kZXggPSAwOyBpbmRleCA8 IGNvZGVCbG9jay0+bnVtYmVyT2ZJZGVudGlmaWVycygpOyArK2luZGV4KSB7Ci0gICAgICAgIGNv bnN0IElkZW50aWZpZXImIGlkZW50aWZpZXIgPSBjb2RlQmxvY2stPmlkZW50aWZpZXIoaW5kZXgp OwotICAgICAgICBpZiAoaWRlbnRpZmllci5pbXBsKCkgPT0gdWlkKSB7Ci0gICAgICAgICAgICBm b3VuZCA9IHRydWU7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotICAgIH0KLSAgICBB U1NFUlQoZm91bmQpOwotI2VuZGlmCisgICAgQVNTRVJUX1VOVVNFRChjb2RlQmxvY2ssIGNvZGVC bG9jay0+aGFzSWRlbnRpZmllcih1aWQpKTsKICAgICByZXR1cm4gQ2FjaGVhYmxlSWRlbnRpZmll cih1aWQpOwogfQogCg== 429025 2021-05-18 19:34:43 -0700 2021-05-19 09:49:38 -0700 proposed patch. bug-225948.patch text/plain 7566 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc3Njk4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBA CisyMDIxLTA1LTE4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBT cGVlZCB1cCBkZWJ1ZyB2YWxpZGF0aW9uIGluIENhY2hlYWJsZUlkZW50aWZpZXI6OmNyZWF0ZUZy b21JZGVudGlmaWVyT3duZWRCeUNvZGVCbG9jaygpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1OTQ4CisgICAgICAgIHJkYXI6Ly83ODE3NTU0Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDEuIEludHJv ZHVjZSBDb2RlQmxvY2s6Omhhc0lkZW50aWZpZXIoKSBzbyB0aGF0IHdlIGNhbiBlbmNhcHN1bGF0 ZSB0aGUgaWRlbnRpZmllcgorICAgICAgICAgICBzZWFyY2ggYmV0dGVyLiAgQ2hhbmdlIENhY2hl YWJsZUlkZW50aWZpZXI6OmNyZWF0ZUZyb21JZGVudGlmaWVyT3duZWRCeUNvZGVCbG9jaygpCisg ICAgICAgICAgIHRvIGNhbGwgdGhpcyBtZXRob2QgaW5zdGVhZCBvZiByb2xsaW5nIGl0cyBvd24g aWRlbnRpZmllciBzZWFyY2guCisKKyAgICAgICAgMi4gSWYgdGhlIENvZGVCbG9jayBpcyBwYXRo b2xvZ2ljYWwgYW5kIGhhcyBhIHJpZGljdWxvdXMgbnVtYmVyIG9mIGlkZW50aWZpZXJzCisgICAg ICAgICAgIHRvIHNlYXJjaCwgY3JlYXRlIGEgY2FjaGVkIGhhc2ggc2V0IG9mIHRoZSBpZGVudGlm aWVycywgYW5kIHVzZSB0aGF0IGZvcgorICAgICAgICAgICBkb2luZyB0aGUgc2VhcmNoIGluc3Rl YWQuCisKKyAgICAgICAgICAgQXBwYXJlbnRseSwgWW91VHViZSBjYW4gaGF2ZSBhIHNpbmdsZSBK UyBmdW5jdGlvbiB3aXRoIDIxNzc2ODkgYnl0ZWNvZGVzLCB3aGVyZQorICAgICAgICAgICBhIGxh cmdlIHBvcnRpb24gb2YgdGhvc2UgYXJlIHB1dF9ieV9pZHMuICBUaGUgZnVuY3Rpb24gYWxzbyBo YXMgc29tZSAxN2srCisgICAgICAgICAgIGlkZW50aWZpZXJzLiAgV2l0aCB0aGF0IG1heSBieXRl Y29kZXMgZG9pbmcgYSB2YWxpZGF0aW9uIHNlYXJjaCBvbiAxN2srCisgICAgICAgICAgIGlkZW50 aWZpZXJzIGluIGEgRGVidWcgYnVpbGQsIHRoZSBzaXRlIGNhbiBiZWNvbWUgdW4tdXNlYWJsZS4g IFRoaXMgb3B0aW1pemF0aW9uCisgICAgICAgICAgIGJyaW5ncyBpdCBiYWNrIGZyb20gdW4tdXNl YWJsZSB0byBiYXJlbHkgdG9sZXJhYmxlIG9uIHRoZSBEZWJ1ZyBidWlsZC4KKworICAgICAgICAz LiBBbHNvIGZldGNoIHRoZSBVbmxpbmtlZENvZGVCbG9jayBmcm9tIHRoZSBXcml0ZUJhcnJpZXIg ZmllbGQganVzdCBvbmNlIGluCisgICAgICAgICAgIENvZGVCbG9jazo6aWRlbnRpZmllcigpIGFu ZCBDb2RlQmxvY2s6Omhhc0lkZW50aWZpZXIoKS4gIFRoaXMgbWF5IG5vdCBtYXR0ZXIKKyAgICAg ICAgICAgb24gYSBSZWxlYXNlIGJ1aWxkLCBidXQgaXQgY2FuIGFkZCB1cCBvbiBhIERlYnVnIGJ1 aWxkLCB3aGljaCBpcyBhbHJlYWR5IHNsb3cuCisgICAgICAgICAgIFdlIHNob3VsZCB0cnkgdG8g YXZvaWQgZG9pbmcgcmVkdW5kYW50IHZhbGlkYXRpb24gdmlhIHRoZSBXcml0ZUJhcnJpZXIgYWNj ZXNzLgorCisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6 Q29kZUJsb2NrOjppZGVudGlmaWVyIGNvbnN0KToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpo YXNJZGVudGlmaWVyKToKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2suaDoKKyAgICAgICAg KiBydW50aW1lL0NhY2hlYWJsZUlkZW50aWZpZXJJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OkNh Y2hlYWJsZUlkZW50aWZpZXI6OmNyZWF0ZUZyb21JZGVudGlmaWVyT3duZWRCeUNvZGVCbG9jayk6 CisKIDIwMjEtMDUtMTggIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIERhdGEgQ2FsbCBJQ3MgdGhhdCBkb24ndCByZXBhdGNoIGFuZCB1c2UgdGhlbSBpbiB0 aGUgYmFzZWxpbmUgSklUCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29k ZUJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Q29kZUJsb2NrLmNwcAkocmV2aXNpb24gMjc3NjgzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4OTgsMTQgKzI4OTgs NjMgQEAgc2l6ZV90IENvZGVCbG9jazo6bnVtYmVyT2ZERkdJZGVudGlmaWVycwogCiBjb25zdCBJ ZGVudGlmaWVyJiBDb2RlQmxvY2s6OmlkZW50aWZpZXIoaW50IGluZGV4KSBjb25zdAogewotICAg IHNpemVfdCB1bmxpbmtlZElkZW50aWZpZXJzID0gbV91bmxpbmtlZENvZGUtPm51bWJlck9mSWRl bnRpZmllcnMoKTsKKyAgICBVbmxpbmtlZENvZGVCbG9jayogdW5saW5rZWRDb2RlID0gbV91bmxp bmtlZENvZGUuZ2V0KCk7CisgICAgc2l6ZV90IHVubGlua2VkSWRlbnRpZmllcnMgPSB1bmxpbmtl ZENvZGUtPm51bWJlck9mSWRlbnRpZmllcnMoKTsKICAgICBpZiAoc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KGluZGV4KSA8IHVubGlua2VkSWRlbnRpZmllcnMpCi0gICAgICAgIHJldHVybiBtX3VubGlu a2VkQ29kZS0+aWRlbnRpZmllcihpbmRleCk7CisgICAgICAgIHJldHVybiB1bmxpbmtlZENvZGUt PmlkZW50aWZpZXIoaW5kZXgpOwogICAgIEFTU0VSVChKSVRDb2RlOjppc09wdGltaXppbmdKSVQo aml0VHlwZSgpKSk7CiAgICAgcmV0dXJuIG1faml0Q29kZS0+ZGZnQ29tbW9uKCktPm1fZGZnSWRl bnRpZmllcnNbaW5kZXggLSB1bmxpbmtlZElkZW50aWZpZXJzXTsKIH0KICNlbmRpZiAvLyBFTkFC TEUoREZHX0pJVCkKIAorI2lmIEFTU0VSVF9FTkFCTEVECitib29sIENvZGVCbG9jazo6aGFzSWRl bnRpZmllcihVbmlxdWVkU3RyaW5nSW1wbCogdWlkKQoreworICAgIFVubGlua2VkQ29kZUJsb2Nr KiB1bmxpbmtlZENvZGUgPSBtX3VubGlua2VkQ29kZS5nZXQoKTsKKyAgICBzaXplX3QgdW5saW5r ZWRJZGVudGlmaWVycyA9IHVubGlua2VkQ29kZS0+bnVtYmVyT2ZJZGVudGlmaWVycygpOworICAg IHNpemVfdCBudW1iZXJPZkRGR0lkZW50aWZpZXJzID0gdGhpcy0+bnVtYmVyT2ZERkdJZGVudGlm aWVycygpOworICAgIHNpemVfdCBudW1iZXJPZklkZW50aWZpZXJzID0gdW5saW5rZWRJZGVudGlm aWVycyArIG51bWJlck9mREZHSWRlbnRpZmllcnM7CisKKyAgICBpZiAobnVtYmVyT2ZJZGVudGlm aWVycyA+IDEwMCkgeworICAgICAgICBpZiAobV9jYWNoZWRJZGVudGlmaWVyVWlkcy5zaXplKCkg IT0gbnVtYmVyT2ZJZGVudGlmaWVycykgeworICAgICAgICAgICAgTG9ja2VyIGxvY2tlcihtX2Nh Y2hlZElkZW50aWZpZXJVaWRzTG9jayk7CisgICAgICAgICAgICBjcmVhdGVSYXJlRGF0YUlmTmVj ZXNzYXJ5KCk7CisgICAgICAgICAgICBIYXNoU2V0PFVuaXF1ZWRTdHJpbmdJbXBsKj4gY2FjaGVk SWRlbnRpZmllclVpZHM7CisgICAgICAgICAgICBjYWNoZWRJZGVudGlmaWVyVWlkcy5yZXNlcnZl SW5pdGlhbENhcGFjaXR5KG51bWJlck9mSWRlbnRpZmllcnMpOworICAgICAgICAgICAgZm9yICh1 bnNpZ25lZCBpbmRleCA9IDA7IGluZGV4IDwgdW5saW5rZWRJZGVudGlmaWVyczsgKytpbmRleCkg eworICAgICAgICAgICAgICAgIGNvbnN0IElkZW50aWZpZXImIGlkZW50aWZpZXIgPSB1bmxpbmtl ZENvZGUtPmlkZW50aWZpZXIoaW5kZXgpOworICAgICAgICAgICAgICAgIGNhY2hlZElkZW50aWZp ZXJVaWRzLmFkZChpZGVudGlmaWVyLmltcGwoKSk7CisgICAgICAgICAgICB9CisgICAgICAgICAg ICBpZiAobnVtYmVyT2ZERkdJZGVudGlmaWVycykgeworICAgICAgICAgICAgICAgIEFTU0VSVChK SVRDb2RlOjppc09wdGltaXppbmdKSVQoaml0VHlwZSgpKSk7CisgICAgICAgICAgICAgICAgYXV0 byYgZGZnSWRlbnRpZmllcnMgPSBtX2ppdENvZGUtPmRmZ0NvbW1vbigpLT5tX2RmZ0lkZW50aWZp ZXJzOworICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaW5kZXggPSAwOyBpbmRleCA8IG51 bWJlck9mREZHSWRlbnRpZmllcnM7ICsraW5kZXgpIHsKKyAgICAgICAgICAgICAgICAgICAgY29u c3QgSWRlbnRpZmllciYgaWRlbnRpZmllciA9IGRmZ0lkZW50aWZpZXJzW2luZGV4XTsKKyAgICAg ICAgICAgICAgICAgICAgY2FjaGVkSWRlbnRpZmllclVpZHMuYWRkKGlkZW50aWZpZXIuaW1wbCgp KTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgICAgICBXVEY6OnN0 b3JlU3RvcmVGZW5jZSgpOworICAgICAgICAgICAgbV9jYWNoZWRJZGVudGlmaWVyVWlkcyA9IFdU Rk1vdmUoY2FjaGVkSWRlbnRpZmllclVpZHMpOworICAgICAgICB9CisgICAgICAgIHJldHVybiBt X2NhY2hlZElkZW50aWZpZXJVaWRzLmNvbnRhaW5zKHVpZCk7CisgICAgfQorCisgICAgZm9yICh1 bnNpZ25lZCBpbmRleCA9IDA7IGluZGV4IDwgdW5saW5rZWRJZGVudGlmaWVyczsgKytpbmRleCkg eworICAgICAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVudGlmaWVyID0gdW5saW5rZWRDb2RlLT5p ZGVudGlmaWVyKGluZGV4KTsKKyAgICAgICAgaWYgKGlkZW50aWZpZXIuaW1wbCgpID09IHVpZCkK KyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICBBU1NFUlQoSklUQ29kZTo6aXNP cHRpbWl6aW5nSklUKGppdFR5cGUoKSkpOworICAgIGF1dG8mIGRmZ0lkZW50aWZpZXJzID0gbV9q aXRDb2RlLT5kZmdDb21tb24oKS0+bV9kZmdJZGVudGlmaWVyczsKKyAgICBmb3IgKHVuc2lnbmVk IGluZGV4ID0gMDsgaW5kZXggPCBudW1iZXJPZkRGR0lkZW50aWZpZXJzOyArK2luZGV4KSB7Cisg ICAgICAgIGNvbnN0IElkZW50aWZpZXImIGlkZW50aWZpZXIgPSBkZmdJZGVudGlmaWVyc1tpbmRl eF07CisgICAgICAgIGlmIChpZGVudGlmaWVyLmltcGwoKSA9PSB1aWQpCisgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorI2VuZGlmCisKIHZvaWQg Q29kZUJsb2NrOjp1cGRhdGVBbGxWYWx1ZVByb2ZpbGVQcmVkaWN0aW9uc0FuZENvdW50TGl2ZW5l c3ModW5zaWduZWQmIG51bWJlck9mTGl2ZU5vbkFyZ3VtZW50VmFsdWVQcm9maWxlcywgdW5zaWdu ZWQmIG51bWJlck9mU2FtcGxlc0luUHJvZmlsZXMpCiB7CiAgICAgQ29uY3VycmVudEpTTG9ja2Vy IGxvY2tlcihtX2xvY2spOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0Nv ZGVCbG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9D b2RlQmxvY2suaAkocmV2aXNpb24gMjc3NjgzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb2RlL0NvZGVCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC03MSw2ICs3MSw3IEBACiAjaW5j bHVkZSA8d3RmL0JhZy5oPgogI2luY2x1ZGUgPHd0Zi9GYXN0TWFsbG9jLmg+CiAjaW5jbHVkZSA8 d3RmL0ZpeGVkVmVjdG9yLmg+CisjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDx3 dGYvUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1NlZ21lbnRlZFZlY3Rvci5oPgogI2luY2x1ZGUg PHd0Zi9WZWN0b3IuaD4KQEAgLTU3Miw2ICs1NzMsOSBAQCBwdWJsaWM6CiAgICAgc2l6ZV90IG51 bWJlck9mSWRlbnRpZmllcnMoKSBjb25zdCB7IHJldHVybiBtX3VubGlua2VkQ29kZS0+bnVtYmVy T2ZJZGVudGlmaWVycygpOyB9CiAgICAgY29uc3QgSWRlbnRpZmllciYgaWRlbnRpZmllcihpbnQg aW5kZXgpIGNvbnN0IHsgcmV0dXJuIG1fdW5saW5rZWRDb2RlLT5pZGVudGlmaWVyKGluZGV4KTsg fQogI2VuZGlmCisjaWYgQVNTRVJUX0VOQUJMRUQKKyAgICBib29sIGhhc0lkZW50aWZpZXIoVW5p cXVlZFN0cmluZ0ltcGwqKTsKKyNlbmRpZgogCiAgICAgVmVjdG9yPFdyaXRlQmFycmllcjxVbmtu b3duPj4mIGNvbnN0YW50cygpIHsgcmV0dXJuIG1fY29uc3RhbnRSZWdpc3RlcnM7IH0KICAgICB1 bnNpZ25lZCBhZGRDb25zdGFudChjb25zdCBDb25jdXJyZW50SlNMb2NrZXImLCBKU1ZhbHVlIHYp CkBAIC0xMDU2LDYgKzEwNjAsMTEgQEAgcHJpdmF0ZToKICAgICBkb3VibGUgbV9wcmV2aW91c0Nv dW50ZXIgeyAwIH07CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8UmFyZURhdGE+IG1fcmFyZURhdGE7 CisKKyNpZiBBU1NFUlRfRU5BQkxFRAorICAgIExvY2sgbV9jYWNoZWRJZGVudGlmaWVyVWlkc0xv Y2s7CisgICAgSGFzaFNldDxVbmlxdWVkU3RyaW5nSW1wbCo+IG1fY2FjaGVkSWRlbnRpZmllclVp ZHM7CisjZW5kaWYKIH07CiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBFeGVjdXRhYmxlVHlwZT4KSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hlYWJsZUlkZW50aWZpZXJJbmxp bmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ2FjaGVh YmxlSWRlbnRpZmllcklubGluZXMuaAkocmV2aXNpb24gMjc3NjgzKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvQ2FjaGVhYmxlSWRlbnRpZmllcklubGluZXMuaAkod29ya2luZyBj b3B5KQpAQCAtNDIsMTggKzQyLDcgQEAgaW5saW5lIENhY2hlYWJsZUlkZW50aWZpZXIgQ2FjaGVh YmxlSWRlbgogCiBpbmxpbmUgQ2FjaGVhYmxlSWRlbnRpZmllciBDYWNoZWFibGVJZGVudGlmaWVy OjpjcmVhdGVGcm9tSWRlbnRpZmllck93bmVkQnlDb2RlQmxvY2soQ29kZUJsb2NrKiBjb2RlQmxv Y2ssIFVuaXF1ZWRTdHJpbmdJbXBsKiB1aWQpCiB7Ci0gICAgVU5VU0VEX1BBUkFNKGNvZGVCbG9j ayk7Ci0jaWYgQVNTRVJUX0VOQUJMRUQKLSAgICBib29sIGZvdW5kID0gZmFsc2U7Ci0gICAgZm9y ICh1bnNpZ25lZCBpbmRleCA9IDA7IGluZGV4IDwgY29kZUJsb2NrLT5udW1iZXJPZklkZW50aWZp ZXJzKCk7ICsraW5kZXgpIHsKLSAgICAgICAgY29uc3QgSWRlbnRpZmllciYgaWRlbnRpZmllciA9 IGNvZGVCbG9jay0+aWRlbnRpZmllcihpbmRleCk7Ci0gICAgICAgIGlmIChpZGVudGlmaWVyLmlt cGwoKSA9PSB1aWQpIHsKLSAgICAgICAgICAgIGZvdW5kID0gdHJ1ZTsKLSAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICB9Ci0gICAgfQotICAgIEFTU0VSVChmb3VuZCk7Ci0jZW5kaWYKKyAgICBB U1NFUlRfVU5VU0VEKGNvZGVCbG9jaywgY29kZUJsb2NrLT5oYXNJZGVudGlmaWVyKHVpZCkpOwog ICAgIHJldHVybiBDYWNoZWFibGVJZGVudGlmaWVyKHVpZCk7CiB9CiAK