226946 2021-06-11 16:22:24 -0700 Lazily compute SecurityOrigin::m_isPotentiallyTrustworthy for performance 2021-06-11 19:37:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen darin ggaren sam webkit-bug-importer oldest_to_newest 1769113 0 cdumez 2021-06-11 16:22:24 -0700 We currently initialize m_isPotentiallyTrustworthy in the SecurityOrigin constructor. However, it is a bit expensive to compute and shows on profiles, and we often don't actually use this data member. As a result, this patch makes it so that SecurityOrigin::m_isPotentiallyTrustworthy gets computed lazily. 1769115 1 431240 cdumez 2021-06-11 16:24:04 -0700 Created attachment 431240 Patch 1769117 2 431240 achristensen 2021-06-11 16:26:07 -0700 Comment on attachment 431240 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431240&action=review > Source/WebCore/page/SecurityOrigin.cpp:496 > + return m_isPotentiallyTrustworthy; return *m_isPotentiallyTrustworthy; > Source/WebCore/page/SecurityOrigin.h:246 > + std::optional<bool> m_isPotentiallyTrustworthy; This uses more memory. To offset this, could you make some of the surrounding booleans bit fields? 1769129 3 cdumez 2021-06-11 16:49:59 -0700 (In reply to Alex Christensen from comment #2) > Comment on attachment 431240 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=431240&action=review > > > Source/WebCore/page/SecurityOrigin.cpp:496 > > + return m_isPotentiallyTrustworthy; > > return *m_isPotentiallyTrustworthy; Indeed, oops. > > > Source/WebCore/page/SecurityOrigin.h:246 > > + std::optional<bool> m_isPotentiallyTrustworthy; > > This uses more memory. To offset this, could you make some of the > surrounding booleans bit fields? sizeof(SecurityOrigin) is 64 before and after my change so let's not? 1769130 4 431242 cdumez 2021-06-11 16:50:27 -0700 Created attachment 431242 Patch 1769131 5 431243 cdumez 2021-06-11 16:51:07 -0700 Created attachment 431243 Patch 1769135 6 431245 cdumez 2021-06-11 17:13:53 -0700 Created attachment 431245 Patch 1769160 7 ews-feeder 2021-06-11 19:36:38 -0700 Committed r278806 (238763@main): <https://commits.webkit.org/238763@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431245. 1769162 8 webkit-bug-importer 2021-06-11 19:37:17 -0700 <rdar://problem/79228666> 431240 2021-06-11 16:24:04 -0700 2021-06-11 16:50:25 -0700 Patch bug-226946-20210611162404.patch text/plain 3501 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4Nzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDUxMTJhODc3OWZjMzcx ZTQzNjE2YTVhYjkzOGI3MDQ2MTJlZDNlOC4uYTVlN2E3ZGM2N2Q4ODQ3MmJmZTZlNjIzNjEyY2Uw MTg3NzQ1OTM4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA2LTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTGF6aWx5IGNvbXB1dGUgU2Vj dXJpdHlPcmlnaW46Om1faXNQb3RlbnRpYWxseVRydXN0d29ydGh5IGZvciBwZXJmb3JtYW5jZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2OTQ2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY3VycmVu dGx5IGluaXRpYWxpemUgbV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkgaW4gdGhlIFNlY3VyaXR5 T3JpZ2luIGNvbnN0cnVjdG9yLgorICAgICAgICBIb3dldmVyLCBpdCBpcyBhIGJpdCBleHBlbnNp dmUgdG8gY29tcHV0ZSBhbmQgc2hvd3Mgb24gcHJvZmlsZXMsIGFuZCB3ZSBvZnRlbiBkb24ndAor ICAgICAgICBhY3R1YWxseSB1c2UgdGhpcyBkYXRhIG1lbWJlci4gQXMgYSByZXN1bHQsIHRoaXMg cGF0Y2ggbWFrZXMgaXQgc28gdGhhdAorICAgICAgICBTZWN1cml0eU9yaWdpbjo6bV9pc1BvdGVu dGlhbGx5VHJ1c3R3b3J0aHkgZ2V0cyBjb21wdXRlZCBsYXppbHkuCisKKyAgICAgICAgKiBwYWdl L1NlY3VyaXR5T3JpZ2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpT ZWN1cml0eU9yaWdpbik6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6aXNQb3Rl bnRpYWxseVRydXN0d29ydGh5IGNvbnN0KToKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2lu Lmg6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6aXNQb3RlbnRpYWxseVRydXN0 d29ydGh5IGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMS0wNi0xMSAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBtb3JlIHJlbGVhc2UgbG9nZ2luZyBpbiBX ZWJDb3JlIGZvciBlcGhlbWVyYWwgc2Vzc2lvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9y aWdpbi5jcHAKaW5kZXggN2JiNzNiOTkyMTRjMjcxM2MwZTU2ZjE5ZDE2MDI3NjQzYTUyNDc4Ny4u OTAwYWFkM2YyMTQ5ZjA1M2IyNzYyYjcwMjdhOWM1ZmFjNTc3ZmZhNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKQEAgLTE5MCw4ICsxOTAsNiBAQCBTZWN1cml0eU9yaWdp bjo6U2VjdXJpdHlPcmlnaW4oY29uc3QgVVJMJiB1cmwpCiAKICAgICBpZiAobV9jYW5Mb2FkTG9j YWxSZXNvdXJjZXMpCiAgICAgICAgIG1fZmlsZVBhdGggPSB1cmwuZmlsZVN5c3RlbVBhdGgoKTsg Ly8gSW4gY2FzZSBlbmZvcmNlRmlsZVBhdGhTZXBhcmF0aW9uKCkgaXMgY2FsbGVkLgotCi0gICAg bV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkgPSBzaG91bGRUcmVhdEFzUG90ZW50aWFsbHlUcnVz dHdvcnRoeSh1cmwpOwogfQogCiBTZWN1cml0eU9yaWdpbjo6U2VjdXJpdHlPcmlnaW4oKQpAQCAt NDkxLDYgKzQ4OSwxMyBAQCBib29sIFNlY3VyaXR5T3JpZ2luOjppc01hdGNoaW5nUmVnaXN0cmFi bGVEb21haW5TdWZmaXgoY29uc3QgU3RyaW5nJiBkb21haW5TdWZmaQogI2VuZGlmCiB9CiAKK2Jv b2wgU2VjdXJpdHlPcmlnaW46OmlzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSgpIGNvbnN0Cit7Cisg ICAgaWYgKCFtX2lzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSkKKyAgICAgICAgbV9pc1BvdGVudGlh bGx5VHJ1c3R3b3J0aHkgPSBzaG91bGRUcmVhdEFzUG90ZW50aWFsbHlUcnVzdHdvcnRoeShtX2Rh dGEucHJvdG9jb2woKSwgbV9kYXRhLmhvc3QoKSk7CisgICAgcmV0dXJuIG1faXNQb3RlbnRpYWxs eVRydXN0d29ydGh5OworfQorCiB2b2lkIFNlY3VyaXR5T3JpZ2luOjpncmFudExvYWRMb2NhbFJl c291cmNlcygpCiB7CiAgICAgLy8gR3JhbnRpbmcgcHJpdmlsZWdlcyB0byBzb21lLCBidXQgbm90 IGFsbCwgZG9jdW1lbnRzIGluIGEgU2VjdXJpdHlPcmlnaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJp dHlPcmlnaW4uaAppbmRleCAzYzRkMzZjYzhlNjJlMDZjNDI2NmY3ZWE0OWZlZDVmNmZmNDQ2OGQ1 Li5kZjUzNWE1OWIyZDJmNTdmNDI4NWI2MTY1N2Q4Y2RlMTNlNGYwY2U3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9TZWN1cml0eU9yaWdpbi5oCkBAIC0yMDgsNyArMjA4LDcgQEAgcHVibGljOgogICAgIC8v IGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL29yaWdpbi5odG1sI2lzLWEt cmVnaXN0cmFibGUtZG9tYWluLXN1ZmZpeC1vZi1vci1pcy1lcXVhbC10bwogICAgIFdFQkNPUkVf RVhQT1JUIGJvb2wgaXNNYXRjaGluZ1JlZ2lzdHJhYmxlRG9tYWluU3VmZml4KGNvbnN0IFN0cmlu ZyYsIGJvb2wgdHJlYXRJUEFkZHJlc3NBc0RvbWFpbiA9IGZhbHNlKSBjb25zdDsKIAotICAgIGJv b2wgaXNQb3RlbnRpYWxseVRydXN0d29ydGh5KCkgY29uc3QgeyByZXR1cm4gbV9pc1BvdGVudGlh bGx5VHJ1c3R3b3J0aHk7IH0KKyAgICBib29sIGlzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSgpIGNv bnN0OwogICAgIHZvaWQgc2V0SXNQb3RlbnRpYWxseVRydXN0d29ydGh5KGJvb2wgdmFsdWUpIHsg bV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkgPSB2YWx1ZTsgfQogCiAgICAgV0VCQ09SRV9FWFBP UlQgc3RhdGljIGJvb2wgaXNMb2NhbEhvc3RPckxvb3BiYWNrSVBBZGRyZXNzKFN0cmluZ1ZpZXcp OwpAQCAtMjQzLDcgKzI0Myw3IEBAIHByaXZhdGU6CiAgICAgU3RvcmFnZUJsb2NraW5nUG9saWN5 IG1fc3RvcmFnZUJsb2NraW5nUG9saWN5IHsgU3RvcmFnZUJsb2NraW5nUG9saWN5OjpBbGxvd0Fs bCB9OwogICAgIGJvb2wgbV9lbmZvcmNlc0ZpbGVQYXRoU2VwYXJhdGlvbiB7IGZhbHNlIH07CiAg ICAgYm9vbCBtX25lZWRzU3RvcmFnZUFjY2Vzc0Zyb21GaWxlVVJMc1F1aXJrIHsgZmFsc2UgfTsK LSAgICBib29sIG1faXNQb3RlbnRpYWxseVRydXN0d29ydGh5IHsgZmFsc2UgfTsKKyAgICBzdGQ6 Om9wdGlvbmFsPGJvb2w+IG1faXNQb3RlbnRpYWxseVRydXN0d29ydGh5OwogICAgIGJvb2wgbV9p c0xvY2FsIHsgZmFsc2UgfTsKIH07CiAK 431242 2021-06-11 16:50:27 -0700 2021-06-11 16:51:05 -0700 Patch bug-226946-20210611165026.patch text/plain 3503 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZlZjhmMThiYjgxZGI0 OGNiYjlhMzY3ZDkxMTNmZWM0ODMzYTllZi4uMDcwOWUyMmNhYWY2ZmUzNjcxNGNjM2NhYzJmZDVh OGRlYjc5NTU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA2LTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTGF6aWx5IGNvbXB1dGUgU2Vj dXJpdHlPcmlnaW46Om1faXNQb3RlbnRpYWxseVRydXN0d29ydGh5IGZvciBwZXJmb3JtYW5jZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2OTQ2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY3VycmVu dGx5IGluaXRpYWxpemUgbV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkgaW4gdGhlIFNlY3VyaXR5 T3JpZ2luIGNvbnN0cnVjdG9yLgorICAgICAgICBIb3dldmVyLCBpdCBpcyBhIGJpdCBleHBlbnNp dmUgdG8gY29tcHV0ZSBhbmQgc2hvd3Mgb24gcHJvZmlsZXMsIGFuZCB3ZSBvZnRlbiBkb24ndAor ICAgICAgICBhY3R1YWxseSB1c2UgdGhpcyBkYXRhIG1lbWJlci4gQXMgYSByZXN1bHQsIHRoaXMg cGF0Y2ggbWFrZXMgaXQgc28gdGhhdAorICAgICAgICBTZWN1cml0eU9yaWdpbjo6bV9pc1BvdGVu dGlhbGx5VHJ1c3R3b3J0aHkgZ2V0cyBjb21wdXRlZCBsYXppbHkuCisKKyAgICAgICAgKiBwYWdl L1NlY3VyaXR5T3JpZ2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpT ZWN1cml0eU9yaWdpbik6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6aXNQb3Rl bnRpYWxseVRydXN0d29ydGh5IGNvbnN0KToKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2lu Lmg6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6aXNQb3RlbnRpYWxseVRydXN0 d29ydGh5IGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMS0wNi0xMSAgSW1hbm9sIEZlcm5hbmRleiAg PGlmZXJuYW5kZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgRW5jb2RlL0RlY29k ZSB0ZW1wbGF0ZXMgZm9yIFdlYlhSIElucHV0U291cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3Vy aXR5T3JpZ2luLmNwcAppbmRleCA3YmI3M2I5OTIxNGMyNzEzYzBlNTZmMTlkMTYwMjc2NDNhNTI0 Nzg3Li5iN2NmZGUxODE1ZmMzZjJkY2E1MzQ1MDEwNmFkMjQwZjg5ODY3MTE3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcApAQCAtMTkwLDggKzE5MCw2IEBAIFNlY3VyaXR5 T3JpZ2luOjpTZWN1cml0eU9yaWdpbihjb25zdCBVUkwmIHVybCkKIAogICAgIGlmIChtX2Nhbkxv YWRMb2NhbFJlc291cmNlcykKICAgICAgICAgbV9maWxlUGF0aCA9IHVybC5maWxlU3lzdGVtUGF0 aCgpOyAvLyBJbiBjYXNlIGVuZm9yY2VGaWxlUGF0aFNlcGFyYXRpb24oKSBpcyBjYWxsZWQuCi0K LSAgICBtX2lzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSA9IHNob3VsZFRyZWF0QXNQb3RlbnRpYWxs eVRydXN0d29ydGh5KHVybCk7CiB9CiAKIFNlY3VyaXR5T3JpZ2luOjpTZWN1cml0eU9yaWdpbigp CkBAIC00OTEsNiArNDg5LDEzIEBAIGJvb2wgU2VjdXJpdHlPcmlnaW46OmlzTWF0Y2hpbmdSZWdp c3RyYWJsZURvbWFpblN1ZmZpeChjb25zdCBTdHJpbmcmIGRvbWFpblN1ZmZpCiAjZW5kaWYKIH0K IAorYm9vbCBTZWN1cml0eU9yaWdpbjo6aXNQb3RlbnRpYWxseVRydXN0d29ydGh5KCkgY29uc3QK K3sKKyAgICBpZiAoIW1faXNQb3RlbnRpYWxseVRydXN0d29ydGh5KQorICAgICAgICBtX2lzUG90 ZW50aWFsbHlUcnVzdHdvcnRoeSA9IHNob3VsZFRyZWF0QXNQb3RlbnRpYWxseVRydXN0d29ydGh5 KG1fZGF0YS5wcm90b2NvbCwgbV9kYXRhLmhvc3QpOworICAgIHJldHVybiAqbV9pc1BvdGVudGlh bGx5VHJ1c3R3b3J0aHk7Cit9CisKIHZvaWQgU2VjdXJpdHlPcmlnaW46OmdyYW50TG9hZExvY2Fs UmVzb3VyY2VzKCkKIHsKICAgICAvLyBHcmFudGluZyBwcml2aWxlZ2VzIHRvIHNvbWUsIGJ1dCBu b3QgYWxsLCBkb2N1bWVudHMgaW4gYSBTZWN1cml0eU9yaWdpbgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1 cml0eU9yaWdpbi5oCmluZGV4IDNjNGQzNmNjOGU2MmUwNmM0MjY2ZjdlYTQ5ZmVkNWY2ZmY0NDY4 ZDUuLmRmNTM1YTU5YjJkMmY1N2Y0Mjg1YjYxNjU3ZDhjZGUxM2U0ZjBjZTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgKQEAgLTIwOCw3ICsyMDgsNyBAQCBwdWJsaWM6CiAgICAg Ly8gaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdnLm9yZy9tdWx0aXBhZ2Uvb3JpZ2luLmh0bWwjaXMt YS1yZWdpc3RyYWJsZS1kb21haW4tc3VmZml4LW9mLW9yLWlzLWVxdWFsLXRvCiAgICAgV0VCQ09S RV9FWFBPUlQgYm9vbCBpc01hdGNoaW5nUmVnaXN0cmFibGVEb21haW5TdWZmaXgoY29uc3QgU3Ry aW5nJiwgYm9vbCB0cmVhdElQQWRkcmVzc0FzRG9tYWluID0gZmFsc2UpIGNvbnN0OwogCi0gICAg Ym9vbCBpc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkoKSBjb25zdCB7IHJldHVybiBtX2lzUG90ZW50 aWFsbHlUcnVzdHdvcnRoeTsgfQorICAgIGJvb2wgaXNQb3RlbnRpYWxseVRydXN0d29ydGh5KCkg Y29uc3Q7CiAgICAgdm9pZCBzZXRJc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkoYm9vbCB2YWx1ZSkg eyBtX2lzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSA9IHZhbHVlOyB9CiAKICAgICBXRUJDT1JFX0VY UE9SVCBzdGF0aWMgYm9vbCBpc0xvY2FsSG9zdE9yTG9vcGJhY2tJUEFkZHJlc3MoU3RyaW5nVmll dyk7CkBAIC0yNDMsNyArMjQzLDcgQEAgcHJpdmF0ZToKICAgICBTdG9yYWdlQmxvY2tpbmdQb2xp Y3kgbV9zdG9yYWdlQmxvY2tpbmdQb2xpY3kgeyBTdG9yYWdlQmxvY2tpbmdQb2xpY3k6OkFsbG93 QWxsIH07CiAgICAgYm9vbCBtX2VuZm9yY2VzRmlsZVBhdGhTZXBhcmF0aW9uIHsgZmFsc2UgfTsK ICAgICBib29sIG1fbmVlZHNTdG9yYWdlQWNjZXNzRnJvbUZpbGVVUkxzUXVpcmsgeyBmYWxzZSB9 OwotICAgIGJvb2wgbV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkgeyBmYWxzZSB9OworICAgIHN0 ZDo6b3B0aW9uYWw8Ym9vbD4gbV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHk7CiAgICAgYm9vbCBt X2lzTG9jYWwgeyBmYWxzZSB9OwogfTsKIAo= 431243 2021-06-11 16:51:07 -0700 2021-06-11 17:13:59 -0700 Patch bug-226946-20210611165106.patch text/plain 3511 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZlZjhmMThiYjgxZGI0 OGNiYjlhMzY3ZDkxMTNmZWM0ODMzYTllZi4uMDcwOWUyMmNhYWY2ZmUzNjcxNGNjM2NhYzJmZDVh OGRlYjc5NTU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA2LTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTGF6aWx5IGNvbXB1dGUgU2Vj dXJpdHlPcmlnaW46Om1faXNQb3RlbnRpYWxseVRydXN0d29ydGh5IGZvciBwZXJmb3JtYW5jZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2OTQ2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY3VycmVu dGx5IGluaXRpYWxpemUgbV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkgaW4gdGhlIFNlY3VyaXR5 T3JpZ2luIGNvbnN0cnVjdG9yLgorICAgICAgICBIb3dldmVyLCBpdCBpcyBhIGJpdCBleHBlbnNp dmUgdG8gY29tcHV0ZSBhbmQgc2hvd3Mgb24gcHJvZmlsZXMsIGFuZCB3ZSBvZnRlbiBkb24ndAor ICAgICAgICBhY3R1YWxseSB1c2UgdGhpcyBkYXRhIG1lbWJlci4gQXMgYSByZXN1bHQsIHRoaXMg cGF0Y2ggbWFrZXMgaXQgc28gdGhhdAorICAgICAgICBTZWN1cml0eU9yaWdpbjo6bV9pc1BvdGVu dGlhbGx5VHJ1c3R3b3J0aHkgZ2V0cyBjb21wdXRlZCBsYXppbHkuCisKKyAgICAgICAgKiBwYWdl L1NlY3VyaXR5T3JpZ2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpT ZWN1cml0eU9yaWdpbik6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6aXNQb3Rl bnRpYWxseVRydXN0d29ydGh5IGNvbnN0KToKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2lu Lmg6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eU9yaWdpbjo6aXNQb3RlbnRpYWxseVRydXN0 d29ydGh5IGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMS0wNi0xMSAgSW1hbm9sIEZlcm5hbmRleiAg PGlmZXJuYW5kZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgRW5jb2RlL0RlY29k ZSB0ZW1wbGF0ZXMgZm9yIFdlYlhSIElucHV0U291cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3Vy aXR5T3JpZ2luLmNwcAppbmRleCA3YmI3M2I5OTIxNGMyNzEzYzBlNTZmMTlkMTYwMjc2NDNhNTI0 Nzg3Li5iN2NmZGUxODE1ZmMzZjJkY2E1MzQ1MDEwNmFkMjQwZjg5ODY3MTE3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcApAQCAtMTkwLDggKzE5MCw2IEBAIFNlY3VyaXR5 T3JpZ2luOjpTZWN1cml0eU9yaWdpbihjb25zdCBVUkwmIHVybCkKIAogICAgIGlmIChtX2Nhbkxv YWRMb2NhbFJlc291cmNlcykKICAgICAgICAgbV9maWxlUGF0aCA9IHVybC5maWxlU3lzdGVtUGF0 aCgpOyAvLyBJbiBjYXNlIGVuZm9yY2VGaWxlUGF0aFNlcGFyYXRpb24oKSBpcyBjYWxsZWQuCi0K LSAgICBtX2lzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSA9IHNob3VsZFRyZWF0QXNQb3RlbnRpYWxs eVRydXN0d29ydGh5KHVybCk7CiB9CiAKIFNlY3VyaXR5T3JpZ2luOjpTZWN1cml0eU9yaWdpbigp CkBAIC00OTEsNiArNDg5LDEzIEBAIGJvb2wgU2VjdXJpdHlPcmlnaW46OmlzTWF0Y2hpbmdSZWdp c3RyYWJsZURvbWFpblN1ZmZpeChjb25zdCBTdHJpbmcmIGRvbWFpblN1ZmZpCiAjZW5kaWYKIH0K IAorYm9vbCBTZWN1cml0eU9yaWdpbjo6aXNQb3RlbnRpYWxseVRydXN0d29ydGh5KCkgY29uc3QK K3sKKyAgICBpZiAoIW1faXNQb3RlbnRpYWxseVRydXN0d29ydGh5KQorICAgICAgICBtX2lzUG90 ZW50aWFsbHlUcnVzdHdvcnRoeSA9IHNob3VsZFRyZWF0QXNQb3RlbnRpYWxseVRydXN0d29ydGh5 KG1fZGF0YS5wcm90b2NvbCwgbV9kYXRhLmhvc3QpOworICAgIHJldHVybiAqbV9pc1BvdGVudGlh bGx5VHJ1c3R3b3J0aHk7Cit9CisKIHZvaWQgU2VjdXJpdHlPcmlnaW46OmdyYW50TG9hZExvY2Fs UmVzb3VyY2VzKCkKIHsKICAgICAvLyBHcmFudGluZyBwcml2aWxlZ2VzIHRvIHNvbWUsIGJ1dCBu b3QgYWxsLCBkb2N1bWVudHMgaW4gYSBTZWN1cml0eU9yaWdpbgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1 cml0eU9yaWdpbi5oCmluZGV4IDNjNGQzNmNjOGU2MmUwNmM0MjY2ZjdlYTQ5ZmVkNWY2ZmY0NDY4 ZDUuLjk2MTJhMmFiMjk0ZmY5NWYzMDkwZmJjZGU3Y2FiZTcyMDM1YmQ5ZjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgKQEAgLTIwOCw3ICsyMDgsNyBAQCBwdWJsaWM6CiAgICAg Ly8gaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdnLm9yZy9tdWx0aXBhZ2Uvb3JpZ2luLmh0bWwjaXMt YS1yZWdpc3RyYWJsZS1kb21haW4tc3VmZml4LW9mLW9yLWlzLWVxdWFsLXRvCiAgICAgV0VCQ09S RV9FWFBPUlQgYm9vbCBpc01hdGNoaW5nUmVnaXN0cmFibGVEb21haW5TdWZmaXgoY29uc3QgU3Ry aW5nJiwgYm9vbCB0cmVhdElQQWRkcmVzc0FzRG9tYWluID0gZmFsc2UpIGNvbnN0OwogCi0gICAg Ym9vbCBpc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkoKSBjb25zdCB7IHJldHVybiBtX2lzUG90ZW50 aWFsbHlUcnVzdHdvcnRoeTsgfQorICAgIGJvb2wgaXNQb3RlbnRpYWxseVRydXN0d29ydGh5KCkg Y29uc3Q7CiAgICAgdm9pZCBzZXRJc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkoYm9vbCB2YWx1ZSkg eyBtX2lzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSA9IHZhbHVlOyB9CiAKICAgICBXRUJDT1JFX0VY UE9SVCBzdGF0aWMgYm9vbCBpc0xvY2FsSG9zdE9yTG9vcGJhY2tJUEFkZHJlc3MoU3RyaW5nVmll dyk7CkBAIC0yNDMsNyArMjQzLDcgQEAgcHJpdmF0ZToKICAgICBTdG9yYWdlQmxvY2tpbmdQb2xp Y3kgbV9zdG9yYWdlQmxvY2tpbmdQb2xpY3kgeyBTdG9yYWdlQmxvY2tpbmdQb2xpY3k6OkFsbG93 QWxsIH07CiAgICAgYm9vbCBtX2VuZm9yY2VzRmlsZVBhdGhTZXBhcmF0aW9uIHsgZmFsc2UgfTsK ICAgICBib29sIG1fbmVlZHNTdG9yYWdlQWNjZXNzRnJvbUZpbGVVUkxzUXVpcmsgeyBmYWxzZSB9 OwotICAgIGJvb2wgbV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkgeyBmYWxzZSB9OworICAgIG11 dGFibGUgc3RkOjpvcHRpb25hbDxib29sPiBtX2lzUG90ZW50aWFsbHlUcnVzdHdvcnRoeTsKICAg ICBib29sIG1faXNMb2NhbCB7IGZhbHNlIH07CiB9OwogCg== 431245 2021-06-11 17:13:53 -0700 2021-06-11 19:36:39 -0700 Patch bug-226946-20210611171352.patch text/plain 3528 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQyODRkNmIzN2VlMTlk NTViNGU0NjA1ZGJjMTczY2MxMzc2MjFlMi4uODRmOWU5NTIwOWVjZjBmMjUyNGQ4YmEzN2YyZTNl YTYwZmNjMTk3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA2LTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTGF6aWx5IGNvbXB1dGUgU2Vj dXJpdHlPcmlnaW46Om1faXNQb3RlbnRpYWxseVRydXN0d29ydGh5IGZvciBwZXJmb3JtYW5jZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2OTQ2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICBXZSBjdXJy ZW50bHkgaW5pdGlhbGl6ZSBtX2lzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSBpbiB0aGUgU2VjdXJp dHlPcmlnaW4gY29uc3RydWN0b3IuCisgICAgICAgIEhvd2V2ZXIsIGl0IGlzIGEgYml0IGV4cGVu c2l2ZSB0byBjb21wdXRlIGFuZCBzaG93cyBvbiBwcm9maWxlcywgYW5kIHdlIG9mdGVuIGRvbid0 CisgICAgICAgIGFjdHVhbGx5IHVzZSB0aGlzIGRhdGEgbWVtYmVyLiBBcyBhIHJlc3VsdCwgdGhp cyBwYXRjaCBtYWtlcyBpdCBzbyB0aGF0CisgICAgICAgIFNlY3VyaXR5T3JpZ2luOjptX2lzUG90 ZW50aWFsbHlUcnVzdHdvcnRoeSBnZXRzIGNvbXB1dGVkIGxhemlseS4KKworICAgICAgICAqIHBh Z2UvU2VjdXJpdHlPcmlnaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46 OlNlY3VyaXR5T3JpZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjppc1Bv dGVudGlhbGx5VHJ1c3R3b3J0aHkgY29uc3QpOgorICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmln aW4uaDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjppc1BvdGVudGlhbGx5VHJ1 c3R3b3J0aHkgY29uc3QpOiBEZWxldGVkLgorCiAyMDIxLTA2LTExICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUGFydGl0aW9uIENyb3NzT3Jp Z2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGUgYnkgU2Vzc2lvbklECmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2Vj dXJpdHlPcmlnaW4uY3BwCmluZGV4IDdiYjczYjk5MjE0YzI3MTNjMGU1NmYxOWQxNjAyNzY0M2E1 MjQ3ODcuLmI3Y2ZkZTE4MTVmYzNmMmRjYTUzNDUwMTA2YWQyNDBmODk4NjcxMTcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCkBAIC0xOTAsOCArMTkwLDYgQEAgU2VjdXJp dHlPcmlnaW46OlNlY3VyaXR5T3JpZ2luKGNvbnN0IFVSTCYgdXJsKQogCiAgICAgaWYgKG1fY2Fu TG9hZExvY2FsUmVzb3VyY2VzKQogICAgICAgICBtX2ZpbGVQYXRoID0gdXJsLmZpbGVTeXN0ZW1Q YXRoKCk7IC8vIEluIGNhc2UgZW5mb3JjZUZpbGVQYXRoU2VwYXJhdGlvbigpIGlzIGNhbGxlZC4K LQotICAgIG1faXNQb3RlbnRpYWxseVRydXN0d29ydGh5ID0gc2hvdWxkVHJlYXRBc1BvdGVudGlh bGx5VHJ1c3R3b3J0aHkodXJsKTsKIH0KIAogU2VjdXJpdHlPcmlnaW46OlNlY3VyaXR5T3JpZ2lu KCkKQEAgLTQ5MSw2ICs0ODksMTMgQEAgYm9vbCBTZWN1cml0eU9yaWdpbjo6aXNNYXRjaGluZ1Jl Z2lzdHJhYmxlRG9tYWluU3VmZml4KGNvbnN0IFN0cmluZyYgZG9tYWluU3VmZmkKICNlbmRpZgog fQogCitib29sIFNlY3VyaXR5T3JpZ2luOjppc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkoKSBjb25z dAoreworICAgIGlmICghbV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkpCisgICAgICAgIG1faXNQ b3RlbnRpYWxseVRydXN0d29ydGh5ID0gc2hvdWxkVHJlYXRBc1BvdGVudGlhbGx5VHJ1c3R3b3J0 aHkobV9kYXRhLnByb3RvY29sLCBtX2RhdGEuaG9zdCk7CisgICAgcmV0dXJuICptX2lzUG90ZW50 aWFsbHlUcnVzdHdvcnRoeTsKK30KKwogdm9pZCBTZWN1cml0eU9yaWdpbjo6Z3JhbnRMb2FkTG9j YWxSZXNvdXJjZXMoKQogewogICAgIC8vIEdyYW50aW5nIHByaXZpbGVnZXMgdG8gc29tZSwgYnV0 IG5vdCBhbGwsIGRvY3VtZW50cyBpbiBhIFNlY3VyaXR5T3JpZ2luCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Nl Y3VyaXR5T3JpZ2luLmgKaW5kZXggM2M0ZDM2Y2M4ZTYyZTA2YzQyNjZmN2VhNDlmZWQ1ZjZmZjQ0 NjhkNS4uNTY5ZGE3MTg5NDUxOTMwYTQ0ZmFmNjhkZWE0YzVjMTNmMDI1MDVmZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaApAQCAtMjA4LDcgKzIwOCw3IEBAIHB1YmxpYzoKICAg ICAvLyBodHRwczovL2h0bWwuc3BlYy53aGF0d2cub3JnL211bHRpcGFnZS9vcmlnaW4uaHRtbCNp cy1hLXJlZ2lzdHJhYmxlLWRvbWFpbi1zdWZmaXgtb2Ytb3ItaXMtZXF1YWwtdG8KICAgICBXRUJD T1JFX0VYUE9SVCBib29sIGlzTWF0Y2hpbmdSZWdpc3RyYWJsZURvbWFpblN1ZmZpeChjb25zdCBT dHJpbmcmLCBib29sIHRyZWF0SVBBZGRyZXNzQXNEb21haW4gPSBmYWxzZSkgY29uc3Q7CiAKLSAg ICBib29sIGlzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSgpIGNvbnN0IHsgcmV0dXJuIG1faXNQb3Rl bnRpYWxseVRydXN0d29ydGh5OyB9CisgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBpc1BvdGVudGlh bGx5VHJ1c3R3b3J0aHkoKSBjb25zdDsKICAgICB2b2lkIHNldElzUG90ZW50aWFsbHlUcnVzdHdv cnRoeShib29sIHZhbHVlKSB7IG1faXNQb3RlbnRpYWxseVRydXN0d29ydGh5ID0gdmFsdWU7IH0K IAogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBib29sIGlzTG9jYWxIb3N0T3JMb29wYmFja0lQ QWRkcmVzcyhTdHJpbmdWaWV3KTsKQEAgLTI0Myw3ICsyNDMsNyBAQCBwcml2YXRlOgogICAgIFN0 b3JhZ2VCbG9ja2luZ1BvbGljeSBtX3N0b3JhZ2VCbG9ja2luZ1BvbGljeSB7IFN0b3JhZ2VCbG9j a2luZ1BvbGljeTo6QWxsb3dBbGwgfTsKICAgICBib29sIG1fZW5mb3JjZXNGaWxlUGF0aFNlcGFy YXRpb24geyBmYWxzZSB9OwogICAgIGJvb2wgbV9uZWVkc1N0b3JhZ2VBY2Nlc3NGcm9tRmlsZVVS THNRdWlyayB7IGZhbHNlIH07Ci0gICAgYm9vbCBtX2lzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSB7 IGZhbHNlIH07CisgICAgbXV0YWJsZSBzdGQ6Om9wdGlvbmFsPGJvb2w+IG1faXNQb3RlbnRpYWxs eVRydXN0d29ydGh5OwogICAgIGJvb2wgbV9pc0xvY2FsIHsgZmFsc2UgfTsKIH07CiAK