200195 2019-07-27 02:40:35 -0700 [JSC] WeakMapImpl do not need to take cellLock in visitOutputConstraints and main thread 2022-02-24 00:58:20 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1556373 0 ysuzuki 2019-07-27 02:40:35 -0700 [JSC] WeakMapImpl do not need to take cellLock in visitOutputConstraint and main thread 1556374 1 375026 ysuzuki 2019-07-27 02:43:22 -0700 Created attachment 375026 Patch 1845455 2 453059 ysuzuki 2022-02-23 17:33:03 -0800 Created attachment 453059 Patch 1845458 3 453060 ysuzuki 2022-02-23 17:36:35 -0800 Created attachment 453060 Patch 1845483 4 453060 mark.lam 2022-02-23 19:08:08 -0800 Comment on attachment 453060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453060&action=review r=me > Source/JavaScriptCore/ChangeLog:8 > + WeakMapImpl::visitOutputConstraints is called in the constraint solver, and it does not modify the buffer of WeakMapImpl. Can you remove this part: "and it does not modify the buffer of WeakMapImpl"? It is not relevant, correct? The only relevant detail is what you stated below i.e. the constraint solver runs and rehash can never be run concurrently. Also, if concurrency were an issue, m_buffer isn't the only thing that needs to be protected: m_capacity does too. So, it seems strange to draw attention to the buffer here. 1845491 5 453060 ysuzuki 2022-02-23 20:23:04 -0800 Comment on attachment 453060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453060&action=review >> Source/JavaScriptCore/ChangeLog:8 >> + WeakMapImpl::visitOutputConstraints is called in the constraint solver, and it does not modify the buffer of WeakMapImpl. > > Can you remove this part: "and it does not modify the buffer of WeakMapImpl"? It is not relevant, correct? The only relevant detail is what you stated below i.e. the constraint solver runs and rehash can never be run concurrently. > > Also, if concurrency were an issue, m_buffer isn't the only thing that needs to be protected: m_capacity does too. So, it seems strange to draw attention to the buffer here. OK, dropped. 1845543 6 ysuzuki 2022-02-24 00:57:20 -0800 Committed r290416 (247724@trunk): <https://commits.webkit.org/247724@trunk> 1845545 7 webkit-bug-importer 2022-02-24 00:58:20 -0800 <rdar://problem/89405434> 375026 2019-07-27 02:43:22 -0700 2022-02-23 17:33:01 -0800 Patch bug-200195-20190727024322.patch text/plain 4162 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3ODg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi NGRhMTQwNzBlM2VhNmQzZWQxNDhjODY0ZTQ3MjFmYzAyYWEyMGYxLi5lZmE1MGZkYThmMzdiMDc5 YjIxZmQ1NTA3MzJlNTcxN2VmYWU5MTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxOS0wNy0yNyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFdlYWtNYXBJbXBsIGRvIG5vdCBuZWVkIHRvIHRha2UgY2VsbExv Y2sgaW4gdmlzaXRPdXRwdXRDb25zdHJhaW50cyBhbmQgbWFpbiB0aHJlYWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDE5NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYWtNYXBJbXBsOjp2aXNpdE91 dHB1dENvbnN0cmFpbnRzIGlzIGNhbGxlZCBpbiB0aGUgY29uc3RyYWludCBzb2x2ZXIsIGFuZCBp dCBkb2VzIG5vdCBtb2RpZnkgdGhlIGJ1ZmZlciBvZiBXZWFrTWFwSW1wbC4KKyAgICAgICAgV2Vh a01hcEltcGw6OnJlaGFzaCBjYW4gZGVzdHJveSB0aGUgYnVmZmVyLCBidXQgaXQgaXMgb25seSBj YWxsZWQgb24gZWl0aGVyIHRoZSBtYWluIHRocmVhZCBvciBHQyBmaW5hbGl6ZXIuIEFzIGEgcmVz dWx0LAorICAgICAgICBpdCBuZXZlciBoYXBwZW5zIHRoYXQgZGVzdHJveWluZyB0aGUgYnVmZmVy IHdoaWxlIHRvdWNoaW5nIGl0IGluIHZpc2l0T3V0cHV0Q29uc3RyYWludHMuIFdlIGNhbiByZW1v dmUgdGhlIGxvY2sgZ3VhcmRpbmcKKyAgICAgICAgdGhpcyBidWZmZXIuCisKKyAgICAgICAgKiBy dW50aW1lL1dlYWtNYXBJbXBsLmNwcDoKKyAgICAgICAgKEpTQzo6V2Vha01hcEltcGw8V2Vha01h cEJ1Y2tldDxXZWFrTWFwQnVja2V0RGF0YUtleVZhbHVlPj46OnZpc2l0T3V0cHV0Q29uc3RyYWlu dHMpOgorICAgICAgICAqIHJ1bnRpbWUvV2Vha01hcEltcGwuaDoKKyAgICAgICAgKEpTQzo6V2Vh a01hcEltcGw6OmZpbmlzaENyZWF0aW9uKToKKyAgICAgICAgKEpTQzo6V2Vha01hcEltcGw6OnJl aGFzaCk6CisgICAgICAgIChKU0M6OldlYWtNYXBJbXBsOjptYWtlQW5kU2V0TmV3QnVmZmVyKToK KwogMjAxOS0wNy0yNyAgSnVzdGluIE1pY2hhdWQgIDxqdXN0aW5fbWljaGF1ZEBhcHBsZS5jb20+ CiAKICAgICAgICAgW1g4Nl0gRW1pdCBCVCBpbnN0cnVjdGlvbiBmb3Igc2hpZnQgKyBtYXNrIGlu IEIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFrTWFwSW1w bC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFrTWFwSW1wbC5jcHAKaW5k ZXggYjhhYWEyZjE3YWNjMzYwZGEzZDllMjcyYzFlZDdkODgwMGJhODBhZi4uOGQzOTFjM2IzNGZk Mzc5OWM1N2EzYThlMjNlM2EyNGEyYWY4YTNjNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvV2Vha01hcEltcGwuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL1dlYWtNYXBJbXBsLmNwcApAQCAtNjYsNyArNjYsNiBAQCB2b2lkIFdlYWtNYXBJ bXBsPFdlYWtNYXBCdWNrZXQ8V2Vha01hcEJ1Y2tldERhdGFLZXlWYWx1ZT4+Ojp2aXNpdE91dHB1 dENvbnN0cmFpbgogewogICAgIFZNJiB2bSA9IHZpc2l0b3Iudm0oKTsKICAgICBhdXRvKiB0aGlz T2JqZWN0ID0ganNDYXN0PFdlYWtNYXBJbXBsKj4oY2VsbCk7Ci0gICAgYXV0byBsb2NrZXIgPSBo b2xkTG9jayh0aGlzT2JqZWN0LT5jZWxsTG9jaygpKTsKICAgICBhdXRvKiBidWZmZXIgPSB0aGlz T2JqZWN0LT5idWZmZXIoKTsKICAgICBmb3IgKHVpbnQzMl90IGluZGV4ID0gMDsgaW5kZXggPCB0 aGlzT2JqZWN0LT5tX2NhcGFjaXR5OyArK2luZGV4KSB7CiAgICAgICAgIGF1dG8qIGJ1Y2tldCA9 IGJ1ZmZlciArIGluZGV4OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvV2Vha01hcEltcGwuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dlYWtNYXBJ bXBsLmgKaW5kZXggOGI0NWZmZTE1OTEyOTM3ZDAxYzhiYjEwYTc2N2VjOTNkM2RlZDY1YS4uNDAw MWE3ZDhhNmZjMzhiYzliYzZmZTZmZWI1ZjE5OWRkOWYxZDA0NiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2Vha01hcEltcGwuaAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9XZWFrTWFwSW1wbC5oCkBAIC0yMTcsOSArMjE3LDcgQEAgY2xhc3Mg V2Vha01hcEltcGwgOiBwdWJsaWMgSlNEZXN0cnVjdGlibGVPYmplY3QgewogICAgICAgICBBU1NF UlRfV0lUSF9NRVNTQUdFKFdlYWtNYXBCdWNrZXQ8V2Vha01hcEJ1Y2tldERhdGFLZXk+OjpvZmZz ZXRPZktleSgpID09IFdlYWtNYXBCdWNrZXQ8V2Vha01hcEJ1Y2tldERhdGFLZXlWYWx1ZT46Om9m ZnNldE9mS2V5KCksICJXZSBhc3N1bWUgdGhpcyB0byBiZSB0cnVlIGluIHRoZSBERkcgYW5kIEZU TCBKSVQuIik7CiAKICAgICAgICAgQmFzZTo6ZmluaXNoQ3JlYXRpb24odm0pOwotCi0gICAgICAg IGF1dG8gbG9ja2VyID0gaG9sZExvY2soY2VsbExvY2soKSk7Ci0gICAgICAgIG1ha2VBbmRTZXRO ZXdCdWZmZXIobG9ja2VyLCBpbml0aWFsQ2FwYWNpdHkpOworICAgICAgICBtYWtlQW5kU2V0TmV3 QnVmZmVyKGluaXRpYWxDYXBhY2l0eSk7CiAgICAgfQogCiAgICAgLy8gV2Vha01hcCBvcGVyYXRp b25zIG11c3Qgbm90IGNhdXNlIEdDLiBXZSBtb2RlbCBvcGVyYXRpb25zIGluIERGRyBiYXNlZCBv biB0aGlzIGd1YXJhbnRlZS4KQEAgLTQwNSwxMCArNDAzLDYgQEAgY2xhc3MgV2Vha01hcEltcGwg OiBwdWJsaWMgSlNEZXN0cnVjdGlibGVPYmplY3QgewogICAgICAgICAvLyBmdW5jdGlvbiBtdXN0 IG5vdCB0b3VjaCBhbnkgR0MgcmVsYXRlZCBmZWF0dXJlcy4gVGhpcyBpcyB3aHkgd2UgZG8gbm90 IGFsbG9jYXRlIFdlYWtNYXBCdWZmZXIKICAgICAgICAgLy8gaW4gYXV4aWxpYXJ5IGJ1ZmZlci4K IAotICAgICAgICAvLyBUaGlzIHJlaGFzaCBtb2RpZmllcyBtX2J1ZmZlciB3aGljaCBpcyBub3Qg R0MtbWFuYWdlZCBidWZmZXIuIEJ1dCBtX2J1ZmZlciBjYW4gYmUgdG91Y2hlZCBpbgotICAgICAg ICAvLyB2aXNpdE91dHB1dENvbnN0cmFpbnRzLiBUaHVzLCB3ZSBzaG91bGQgZ3VhcmQgaXQgd2l0 aCBjZWxsTG9jay4KLSAgICAgICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayhjZWxsTG9jaygpKTsK LQogICAgICAgICB1aW50MzJfdCBvbGRDYXBhY2l0eSA9IG1fY2FwYWNpdHk7CiAgICAgICAgIE1h bGxvY1B0cjxXZWFrTWFwQnVmZmVyVHlwZSwgSlNWYWx1ZU1hbGxvYz4gb2xkQnVmZmVyID0gV1RG TW92ZShtX2J1ZmZlcik7CiAKQEAgLTQxOCw3ICs0MTIsNyBAQCBjbGFzcyBXZWFrTWFwSW1wbCA6 IHB1YmxpYyBKU0Rlc3RydWN0aWJsZU9iamVjdCB7CiAgICAgICAgICAgICBjYXBhY2l0eSA9IG5l eHRDYXBhY2l0eUFmdGVyQmF0Y2hSZW1vdmFsKGNhcGFjaXR5LCBtX2tleUNvdW50KTsKICAgICAg ICAgfSBlbHNlCiAgICAgICAgICAgICBjYXBhY2l0eSA9IG5leHRDYXBhY2l0eShjYXBhY2l0eSwg bV9rZXlDb3VudCk7Ci0gICAgICAgIG1ha2VBbmRTZXROZXdCdWZmZXIobG9ja2VyLCBjYXBhY2l0 eSk7CisgICAgICAgIG1ha2VBbmRTZXROZXdCdWZmZXIoY2FwYWNpdHkpOwogCiAgICAgICAgIGF1 dG8qIGJ1ZmZlciA9IHRoaXMtPmJ1ZmZlcigpOwogICAgICAgICBjb25zdCB1aW50MzJfdCBtYXNr ID0gbV9jYXBhY2l0eSAtIDE7CkBAIC00NTYsNyArNDUwLDcgQEAgY2xhc3MgV2Vha01hcEltcGwg OiBwdWJsaWMgSlNEZXN0cnVjdGlibGVPYmplY3QgewogICAgICAgICB9CiAgICAgfQogCi0gICAg dm9pZCBtYWtlQW5kU2V0TmV3QnVmZmVyKGNvbnN0IEFic3RyYWN0TG9ja2VyJiwgdWludDMyX3Qg Y2FwYWNpdHkpCisgICAgdm9pZCBtYWtlQW5kU2V0TmV3QnVmZmVyKHVpbnQzMl90IGNhcGFjaXR5 KQogICAgIHsKICAgICAgICAgQVNTRVJUKCEoY2FwYWNpdHkgJiAoY2FwYWNpdHkgLSAxKSkpOwog Cg== 453059 2022-02-23 17:33:03 -0800 2022-02-23 17:36:33 -0800 Patch bug-200195-20220223173302.patch text/plain 4498 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 YmNmYjljN2IzOTRmNjMzZTJiNjEwYjFjNGNiZWNjNGViZDE5MzMxLi5kYmJjMTliMzVlMjAyZWIx ZDRkZTUyZGFhZGUwZjE5ZmVhZjAwNTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAyMi0wMi0yMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFdlYWtNYXBJbXBsIGRvIG5vdCBuZWVkIHRvIHRha2UgY2VsbExv Y2sgaW4gdmlzaXRPdXRwdXRDb25zdHJhaW50cyBhbmQgbWFpbiB0aHJlYWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDE5NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYWtNYXBJbXBsOjp2aXNpdE91 dHB1dENvbnN0cmFpbnRzIGlzIGNhbGxlZCBpbiB0aGUgY29uc3RyYWludCBzb2x2ZXIsIGFuZCBp dCBkb2VzIG5vdCBtb2RpZnkgdGhlIGJ1ZmZlciBvZiBXZWFrTWFwSW1wbC4KKyAgICAgICAgV2Vh a01hcEltcGw6OnJlaGFzaCBjYW4gZGVzdHJveSB0aGUgYnVmZmVyLCBidXQgaXQgaXMgb25seSBj YWxsZWQgb24gZWl0aGVyIHRoZSBtYWluIHRocmVhZCBvciBHQyBmaW5hbGl6ZXIuIEFzIGEgcmVz dWx0LAorICAgICAgICBpdCBuZXZlciBoYXBwZW5zIHRoYXQgZGVzdHJveWluZyB0aGUgYnVmZmVy IHdoaWxlIHRvdWNoaW5nIGl0IGluIHZpc2l0T3V0cHV0Q29uc3RyYWludHMuIFdlIGNhbiByZW1v dmUgdGhlIGxvY2sgZ3VhcmRpbmcKKyAgICAgICAgdGhpcyBidWZmZXIuCisKKyAgICAgICAgKiBy dW50aW1lL1dlYWtNYXBJbXBsLmNwcDoKKyAgICAgICAgKEpTQzo6V2Vha01hcEltcGw8QnVja2V0 VHlwZT46OnZpc2l0T3V0cHV0Q29uc3RyYWludHMpOgorICAgICAgICAqIHJ1bnRpbWUvV2Vha01h cEltcGwuaDoKKyAgICAgICAgKEpTQzo6V2Vha01hcEltcGw6OmZpbmlzaENyZWF0aW9uKToKKyAg ICAgICAgKEpTQzo6V2Vha01hcEltcGw6Om1ha2VBbmRTZXROZXdCdWZmZXIpOgorICAgICAgICAq IHJ1bnRpbWUvV2Vha01hcEltcGxJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OldlYWtNYXBJbXBs PFdlYWtNYXBCdWNrZXQ+OjpyZWhhc2gpOgorCiAyMDIyLTAyLTIzICBZdXN1a2UgU3V6dWtpICA8 eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gQWRqdXN0IHRocmVhZCBudW1iZXIg Zm9yIEdDIHRocm91Z2hwdXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1dlYWtNYXBJbXBsLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dlYWtN YXBJbXBsLmNwcAppbmRleCA5ODMzZjc0MzEwYjFmODE5NjI0YzljOWVlYjQ2NzQ2ODNjOWJmYWNj Li43NGIzMzg5MWY5ZmZjNTk0NjJkNjhiNjYwYzExY2M3MWY2ZjBjYzM4IDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFrTWFwSW1wbC5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2Vha01hcEltcGwuY3BwCkBAIC04MCw3ICs4MCw2IEBA IEFMV0FZU19JTkxJTkUgdm9pZCBXZWFrTWFwSW1wbDxCdWNrZXRUeXBlPjo6dmlzaXRPdXRwdXRD b25zdHJhaW50cyhKU0NlbGwqIGNlbGwsCiAgICAgc3RhdGljX2Fzc2VydChzdGQ6OmlzX3NhbWU8 QnVja2V0VHlwZSwgV2Vha01hcEJ1Y2tldDxXZWFrTWFwQnVja2V0RGF0YUtleVZhbHVlPj46OnZh bHVlKTsKIAogICAgIGF1dG8qIHRoaXNPYmplY3QgPSBqc0Nhc3Q8V2Vha01hcEltcGwqPihjZWxs KTsKLSAgICBMb2NrZXIgbG9ja2VyIHsgdGhpc09iamVjdC0+Y2VsbExvY2soKSB9OwogICAgIGF1 dG8qIGJ1ZmZlciA9IHRoaXNPYmplY3QtPmJ1ZmZlcigpOwogICAgIGZvciAodWludDMyX3QgaW5k ZXggPSAwOyBpbmRleCA8IHRoaXNPYmplY3QtPm1fY2FwYWNpdHk7ICsraW5kZXgpIHsKICAgICAg ICAgYXV0byogYnVja2V0ID0gYnVmZmVyICsgaW5kZXg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9XZWFrTWFwSW1wbC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvV2Vha01hcEltcGwuaAppbmRleCA3NGRiYzU0ZjM4NjE5ZjExZGVkOTFkOTRkZTFl MWY0NTU2MTdkNDdiLi5lOGQ3MzkwODdmOWMwOGEyOTdhYzA0YmJlNDczOWZkMzkzYzllMDI0IDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFrTWFwSW1wbC5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dlYWtNYXBJbXBsLmgKQEAgLTIwOSw5 ICsyMDksNyBAQCBjbGFzcyBXZWFrTWFwSW1wbCA6IHB1YmxpYyBKU05vbkZpbmFsT2JqZWN0IHsK ICAgICAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRShXZWFrTWFwQnVja2V0PFdlYWtNYXBCdWNrZXRE YXRhS2V5Pjo6b2Zmc2V0T2ZLZXkoKSA9PSBXZWFrTWFwQnVja2V0PFdlYWtNYXBCdWNrZXREYXRh S2V5VmFsdWU+OjpvZmZzZXRPZktleSgpLCAiV2UgYXNzdW1lIHRoaXMgdG8gYmUgdHJ1ZSBpbiB0 aGUgREZHIGFuZCBGVEwgSklULiIpOwogCiAgICAgICAgIEJhc2U6OmZpbmlzaENyZWF0aW9uKHZt KTsKLQotICAgICAgICBMb2NrZXIgbG9ja2VyIHsgY2VsbExvY2soKSB9OwotICAgICAgICBtYWtl QW5kU2V0TmV3QnVmZmVyKGxvY2tlciwgaW5pdGlhbENhcGFjaXR5KTsKKyAgICAgICAgbWFrZUFu ZFNldE5ld0J1ZmZlcihpbml0aWFsQ2FwYWNpdHkpOwogICAgIH0KIAogICAgIC8vIFdlYWtNYXAg b3BlcmF0aW9ucyBtdXN0IG5vdCBjYXVzZSBHQy4gV2UgbW9kZWwgb3BlcmF0aW9ucyBpbiBERkcg YmFzZWQgb24gdGhpcyBndWFyYW50ZWUuCkBAIC0zOTUsNyArMzkzLDcgQEAgY2xhc3MgV2Vha01h cEltcGwgOiBwdWJsaWMgSlNOb25GaW5hbE9iamVjdCB7CiAgICAgICAgIH0KICAgICB9CiAKLSAg ICB2b2lkIG1ha2VBbmRTZXROZXdCdWZmZXIoY29uc3QgQWJzdHJhY3RMb2NrZXImLCB1aW50MzJf dCBjYXBhY2l0eSkKKyAgICB2b2lkIG1ha2VBbmRTZXROZXdCdWZmZXIodWludDMyX3QgY2FwYWNp dHkpCiAgICAgewogICAgICAgICBBU1NFUlQoIShjYXBhY2l0eSAmIChjYXBhY2l0eSAtIDEpKSk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dlYWtNYXBJbXBs SW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2Vha01hcEltcGxJbmxp bmVzLmgKaW5kZXggNzhhZTYzZDliODU5ZTgyNzNlMWUxZjE1MWRjNThkOTc5M2FmM2U2YS4uMmQ1 MTc5NjU1OGI4MGMyNWIxY2MxZmQzZTI3Mzg3NjBjMTFmNTA1ZCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2Vha01hcEltcGxJbmxpbmVzLmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2Vha01hcEltcGxJbmxpbmVzLmgKQEAgLTkwLDEwICs5 MCw2IEBAIHZvaWQgV2Vha01hcEltcGw8V2Vha01hcEJ1Y2tldD46OnJlaGFzaChSZWhhc2hNb2Rl IG1vZGUpCiAgICAgLy8gZnVuY3Rpb24gbXVzdCBub3QgdG91Y2ggYW55IEdDIHJlbGF0ZWQgZmVh dHVyZXMuIFRoaXMgaXMgd2h5IHdlIGRvIG5vdCBhbGxvY2F0ZSBXZWFrTWFwQnVmZmVyCiAgICAg Ly8gaW4gYXV4aWxpYXJ5IGJ1ZmZlci4KIAotICAgIC8vIFRoaXMgcmVoYXNoIG1vZGlmaWVzIG1f YnVmZmVyIHdoaWNoIGlzIG5vdCBHQy1tYW5hZ2VkIGJ1ZmZlci4gQnV0IG1fYnVmZmVyIGNhbiBi ZSB0b3VjaGVkIGluCi0gICAgLy8gdmlzaXRPdXRwdXRDb25zdHJhaW50cy4gVGh1cywgd2Ugc2hv dWxkIGd1YXJkIGl0IHdpdGggY2VsbExvY2suCi0gICAgTG9ja2VyIGxvY2tlciB7IGNlbGxMb2Nr KCkgfTsKLQogICAgIHVpbnQzMl90IG9sZENhcGFjaXR5ID0gbV9jYXBhY2l0eTsKICAgICBNYWxs b2NQdHI8V2Vha01hcEJ1ZmZlclR5cGUsIEpTVmFsdWVNYWxsb2M+IG9sZEJ1ZmZlciA9IFdURk1v dmUobV9idWZmZXIpOwogCkBAIC0xMDMsNyArOTksNyBAQCB2b2lkIFdlYWtNYXBJbXBsPFdlYWtN YXBCdWNrZXQ+OjpyZWhhc2goUmVoYXNoTW9kZSBtb2RlKQogICAgICAgICBjYXBhY2l0eSA9IG5l eHRDYXBhY2l0eUFmdGVyQmF0Y2hSZW1vdmFsKGNhcGFjaXR5LCBtX2tleUNvdW50KTsKICAgICB9 IGVsc2UKICAgICAgICAgY2FwYWNpdHkgPSBuZXh0Q2FwYWNpdHkoY2FwYWNpdHksIG1fa2V5Q291 bnQpOwotICAgIG1ha2VBbmRTZXROZXdCdWZmZXIobG9ja2VyLCBjYXBhY2l0eSk7CisgICAgbWFr ZUFuZFNldE5ld0J1ZmZlcihjYXBhY2l0eSk7CiAKICAgICBhdXRvKiBidWZmZXIgPSB0aGlzLT5i dWZmZXIoKTsKICAgICBjb25zdCB1aW50MzJfdCBtYXNrID0gbV9jYXBhY2l0eSAtIDE7Cg== 453060 2022-02-23 17:36:35 -0800 2022-02-23 19:08:08 -0800 Patch bug-200195-20220223173635.patch text/plain 4869 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 YmNmYjljN2IzOTRmNjMzZTJiNjEwYjFjNGNiZWNjNGViZDE5MzMxLi5mNDQ2NjFmNWI2MTRlN2Mw OWFmZmQ0NWExMzQzNjM5NTQ3YTg1NTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMi0wMi0yMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFdlYWtNYXBJbXBsIGRvIG5vdCBuZWVkIHRvIHRha2UgY2VsbExv Y2sgaW4gdmlzaXRPdXRwdXRDb25zdHJhaW50cyBhbmQgbWFpbiB0aHJlYWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDE5NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYWtNYXBJbXBsOjp2aXNpdE91 dHB1dENvbnN0cmFpbnRzIGlzIGNhbGxlZCBpbiB0aGUgY29uc3RyYWludCBzb2x2ZXIsIGFuZCBp dCBkb2VzIG5vdCBtb2RpZnkgdGhlIGJ1ZmZlciBvZiBXZWFrTWFwSW1wbC4KKyAgICAgICAgV2Vh a01hcEltcGw6OnJlaGFzaCBjYW4gZGVzdHJveSB0aGUgYnVmZmVyLCBidXQgaXQgaXMgb25seSBj YWxsZWQgb24gZWl0aGVyIHRoZSBtYWluIHRocmVhZCBvciBHQyBmaW5hbGl6ZXIuIEFzIGEgcmVz dWx0LAorICAgICAgICBpdCBuZXZlciBoYXBwZW5zIHRoYXQgZGVzdHJveWluZyB0aGUgYnVmZmVy IHdoaWxlIHRvdWNoaW5nIGl0IGluIHZpc2l0T3V0cHV0Q29uc3RyYWludHMuIFdlIGNhbiByZW1v dmUgdGhlIGxvY2sgZ3VhcmRpbmcKKyAgICAgICAgdGhpcyBidWZmZXIuCisKKyAgICAgICAgKiBy dW50aW1lL1dlYWtNYXBJbXBsLmNwcDoKKyAgICAgICAgKEpTQzo6V2Vha01hcEltcGw8QnVja2V0 VHlwZT46OnZpc2l0T3V0cHV0Q29uc3RyYWludHMpOgorICAgICAgICAqIHJ1bnRpbWUvV2Vha01h cEltcGwuaDoKKyAgICAgICAgKEpTQzo6V2Vha01hcEltcGw6OldlYWtNYXBJbXBsKToKKyAgICAg ICAgKEpTQzo6V2Vha01hcEltcGw6Om1ha2VBbmRTZXROZXdCdWZmZXIpOgorICAgICAgICAoSlND OjpXZWFrTWFwSW1wbDo6ZmluaXNoQ3JlYXRpb24pOiBEZWxldGVkLgorICAgICAgICAqIHJ1bnRp bWUvV2Vha01hcEltcGxJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OldlYWtNYXBJbXBsPFdlYWtN YXBCdWNrZXQ+OjpyZWhhc2gpOgorCiAyMDIyLTAyLTIzICBZdXN1a2UgU3V6dWtpICA8eXN1enVr aUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gQWRqdXN0IHRocmVhZCBudW1iZXIgZm9yIEdD IHRocm91Z2hwdXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dl YWtNYXBJbXBsLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dlYWtNYXBJbXBs LmNwcAppbmRleCA5ODMzZjc0MzEwYjFmODE5NjI0YzljOWVlYjQ2NzQ2ODNjOWJmYWNjLi43NGIz Mzg5MWY5ZmZjNTk0NjJkNjhiNjYwYzExY2M3MWY2ZjBjYzM4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFrTWFwSW1wbC5jcHAKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvV2Vha01hcEltcGwuY3BwCkBAIC04MCw3ICs4MCw2IEBAIEFMV0FZ U19JTkxJTkUgdm9pZCBXZWFrTWFwSW1wbDxCdWNrZXRUeXBlPjo6dmlzaXRPdXRwdXRDb25zdHJh aW50cyhKU0NlbGwqIGNlbGwsCiAgICAgc3RhdGljX2Fzc2VydChzdGQ6OmlzX3NhbWU8QnVja2V0 VHlwZSwgV2Vha01hcEJ1Y2tldDxXZWFrTWFwQnVja2V0RGF0YUtleVZhbHVlPj46OnZhbHVlKTsK IAogICAgIGF1dG8qIHRoaXNPYmplY3QgPSBqc0Nhc3Q8V2Vha01hcEltcGwqPihjZWxsKTsKLSAg ICBMb2NrZXIgbG9ja2VyIHsgdGhpc09iamVjdC0+Y2VsbExvY2soKSB9OwogICAgIGF1dG8qIGJ1 ZmZlciA9IHRoaXNPYmplY3QtPmJ1ZmZlcigpOwogICAgIGZvciAodWludDMyX3QgaW5kZXggPSAw OyBpbmRleCA8IHRoaXNPYmplY3QtPm1fY2FwYWNpdHk7ICsraW5kZXgpIHsKICAgICAgICAgYXV0 byogYnVja2V0ID0gYnVmZmVyICsgaW5kZXg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9XZWFrTWFwSW1wbC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvV2Vha01hcEltcGwuaAppbmRleCA3NGRiYzU0ZjM4NjE5ZjExZGVkOTFkOTRkZTFlMWY0NTU2 MTdkNDdiLi4yZmIxYjE2Y2U3ZjBiZDczZWFiNjg3OGRmNDM0Y2MyYjYyNTNkYzU1IDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFrTWFwSW1wbC5oCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dlYWtNYXBJbXBsLmgKQEAgLTE5NywyMSArMTk3 LDEzIEBAIGNsYXNzIFdlYWtNYXBJbXBsIDogcHVibGljIEpTTm9uRmluYWxPYmplY3QgewogCiAg ICAgc3RhdGljIHNpemVfdCBlc3RpbWF0ZWRTaXplKEpTQ2VsbCosIFZNJik7CiAKLSAgICBXZWFr TWFwSW1wbChWTSYgdm0sIFN0cnVjdHVyZSogc3RydWN0dXJlKQotICAgICAgICA6IEJhc2Uodm0s IHN0cnVjdHVyZSkKLSAgICB7Ci0gICAgfQotCiAgICAgc3RhdGljIGNvbnN0ZXhwciB1aW50MzJf dCBpbml0aWFsQ2FwYWNpdHkgPSA0OwogCi0gICAgdm9pZCBmaW5pc2hDcmVhdGlvbihWTSYgdm0p CisgICAgV2Vha01hcEltcGwoVk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKKyAgICAgICAg OiBCYXNlKHZtLCBzdHJ1Y3R1cmUpCiAgICAgewogICAgICAgICBBU1NFUlRfV0lUSF9NRVNTQUdF KFdlYWtNYXBCdWNrZXQ8V2Vha01hcEJ1Y2tldERhdGFLZXk+OjpvZmZzZXRPZktleSgpID09IFdl YWtNYXBCdWNrZXQ8V2Vha01hcEJ1Y2tldERhdGFLZXlWYWx1ZT46Om9mZnNldE9mS2V5KCksICJX ZSBhc3N1bWUgdGhpcyB0byBiZSB0cnVlIGluIHRoZSBERkcgYW5kIEZUTCBKSVQuIik7Ci0KLSAg ICAgICAgQmFzZTo6ZmluaXNoQ3JlYXRpb24odm0pOwotCi0gICAgICAgIExvY2tlciBsb2NrZXIg eyBjZWxsTG9jaygpIH07Ci0gICAgICAgIG1ha2VBbmRTZXROZXdCdWZmZXIobG9ja2VyLCBpbml0 aWFsQ2FwYWNpdHkpOworICAgICAgICBtYWtlQW5kU2V0TmV3QnVmZmVyKGluaXRpYWxDYXBhY2l0 eSk7CiAgICAgfQogCiAgICAgLy8gV2Vha01hcCBvcGVyYXRpb25zIG11c3Qgbm90IGNhdXNlIEdD LiBXZSBtb2RlbCBvcGVyYXRpb25zIGluIERGRyBiYXNlZCBvbiB0aGlzIGd1YXJhbnRlZS4KQEAg LTM5NSw3ICszODcsNyBAQCBjbGFzcyBXZWFrTWFwSW1wbCA6IHB1YmxpYyBKU05vbkZpbmFsT2Jq ZWN0IHsKICAgICAgICAgfQogICAgIH0KIAotICAgIHZvaWQgbWFrZUFuZFNldE5ld0J1ZmZlcihj b25zdCBBYnN0cmFjdExvY2tlciYsIHVpbnQzMl90IGNhcGFjaXR5KQorICAgIHZvaWQgbWFrZUFu ZFNldE5ld0J1ZmZlcih1aW50MzJfdCBjYXBhY2l0eSkKICAgICB7CiAgICAgICAgIEFTU0VSVCgh KGNhcGFjaXR5ICYgKGNhcGFjaXR5IC0gMSkpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvV2Vha01hcEltcGxJbmxpbmVzLmggYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9XZWFrTWFwSW1wbElubGluZXMuaAppbmRleCA3OGFlNjNkOWI4NTllODI3 M2UxZTFmMTUxZGM1OGQ5NzkzYWYzZTZhLi4yZDUxNzk2NTU4YjgwYzI1YjFjYzFmZDNlMjczODc2 MGMxMWY1MDVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFr TWFwSW1wbElubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFr TWFwSW1wbElubGluZXMuaApAQCAtOTAsMTAgKzkwLDYgQEAgdm9pZCBXZWFrTWFwSW1wbDxXZWFr TWFwQnVja2V0Pjo6cmVoYXNoKFJlaGFzaE1vZGUgbW9kZSkKICAgICAvLyBmdW5jdGlvbiBtdXN0 IG5vdCB0b3VjaCBhbnkgR0MgcmVsYXRlZCBmZWF0dXJlcy4gVGhpcyBpcyB3aHkgd2UgZG8gbm90 IGFsbG9jYXRlIFdlYWtNYXBCdWZmZXIKICAgICAvLyBpbiBhdXhpbGlhcnkgYnVmZmVyLgogCi0g ICAgLy8gVGhpcyByZWhhc2ggbW9kaWZpZXMgbV9idWZmZXIgd2hpY2ggaXMgbm90IEdDLW1hbmFn ZWQgYnVmZmVyLiBCdXQgbV9idWZmZXIgY2FuIGJlIHRvdWNoZWQgaW4KLSAgICAvLyB2aXNpdE91 dHB1dENvbnN0cmFpbnRzLiBUaHVzLCB3ZSBzaG91bGQgZ3VhcmQgaXQgd2l0aCBjZWxsTG9jay4K LSAgICBMb2NrZXIgbG9ja2VyIHsgY2VsbExvY2soKSB9OwotCiAgICAgdWludDMyX3Qgb2xkQ2Fw YWNpdHkgPSBtX2NhcGFjaXR5OwogICAgIE1hbGxvY1B0cjxXZWFrTWFwQnVmZmVyVHlwZSwgSlNW YWx1ZU1hbGxvYz4gb2xkQnVmZmVyID0gV1RGTW92ZShtX2J1ZmZlcik7CiAKQEAgLTEwMyw3ICs5 OSw3IEBAIHZvaWQgV2Vha01hcEltcGw8V2Vha01hcEJ1Y2tldD46OnJlaGFzaChSZWhhc2hNb2Rl IG1vZGUpCiAgICAgICAgIGNhcGFjaXR5ID0gbmV4dENhcGFjaXR5QWZ0ZXJCYXRjaFJlbW92YWwo Y2FwYWNpdHksIG1fa2V5Q291bnQpOwogICAgIH0gZWxzZQogICAgICAgICBjYXBhY2l0eSA9IG5l eHRDYXBhY2l0eShjYXBhY2l0eSwgbV9rZXlDb3VudCk7Ci0gICAgbWFrZUFuZFNldE5ld0J1ZmZl cihsb2NrZXIsIGNhcGFjaXR5KTsKKyAgICBtYWtlQW5kU2V0TmV3QnVmZmVyKGNhcGFjaXR5KTsK IAogICAgIGF1dG8qIGJ1ZmZlciA9IHRoaXMtPmJ1ZmZlcigpOwogICAgIGNvbnN0IHVpbnQzMl90 IG1hc2sgPSBtX2NhcGFjaXR5IC0gMTsK