239421 2022-04-16 10:36:45 -0700 Fix a deadlock in VMTraps. 2022-04-16 21:23:32 -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 oldest_to_newest 1862058 0 mark.lam 2022-04-16 10:36:45 -0700 There is an inversion in lock ordering between VMTraps and the Sampling Profiler. 1862059 1 webkit-bug-importer 2022-04-16 10:37:08 -0700 <rdar://problem/91851592> 1862061 2 457751 mark.lam 2022-04-16 11:11:43 -0700 Created attachment 457751 [fast-cq] proposed patch. 1862082 3 457751 msaboff 2022-04-16 14:08:53 -0700 Comment on attachment 457751 [fast-cq] proposed patch. r=me 1862108 4 457751 mark.lam 2022-04-16 21:20:41 -0700 Comment on attachment 457751 [fast-cq] proposed patch. Thanks for the review. Landing now. 1862109 5 ews-feeder 2022-04-16 21:23:30 -0700 Committed r292946 (249711@main): <https://commits.webkit.org/249711@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457751. 457751 2022-04-16 11:11:43 -0700 2022-04-16 21:23:31 -0700 [fast-cq] proposed patch. bug-239421.patch text/plain 3894 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjkyOTQwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDIyLTA0LTE2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggYSBkZWFkbG9jayBpbiBWTVRyYXBzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM5NDIxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MTg1MTU5 Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg c2FtcGxpbmcgcHJvZmlsZXIgZmlyc3QgYWNxdWlyZXMgdGhlIGNvZGVCbG9ja1NldCBsb2NrIGZv bGxvd2VkIGJ5IHRoZSBUaHJlYWRTdXNwZW5kTG9ja2VyLgorICAgICAgICBWTVRyYXBzLCBvbiB0 aGUgb3RoZXIgaGFuZCwgZmlyc3QgYWNxdWlyZXMgdGhlIFRocmVhZFN1c3BlbmRMb2NrZXIgZm9s bG93ZWQgYnkgdGhlCisgICAgICAgIGNvZGVCbG9ja1NldCBsb2NrLiAgQXMgYSByZXN1bHQsIFZN VHJhcHMgY2FuIGRlYWRsb2NrIHdpdGggdGhlIFNhbXBsaW5nIFByb2ZpbGVyCisgICAgICAgIHRo cmVhZCwgYW5kIGxlYXZlIHRoZSBtdXRhdG9yIGluIGEgc3VzcGVuZGVkIHN0YXRlLCBvciBmb3Jl dmVyIGJsb2NrZWQgb24gdGhlCisgICAgICAgIGNvZGVCbG9ja1NldCBsb2NrLgorCisgICAgICAg IFRoaXMgd2FzIGRpc2NvdmVyZWQgd2hpbGUgcnVubmluZyB0aGUgc3RyZXNzL2hhcy1pbmRleGVk LXByb3BlcnR5LXdpdGgtd29yc2VuaW5nLWFycmF5LW1vZGUuanMuZnRsLW5vLWNqaXQtdmFsaWRh dGUtc2FtcGxpbmctcHJvZmlsZXIKKyAgICAgICAgdGVzdCBvbiBhIERlYnVnIGJ1aWxkIG9mIGpz YyBvbiBhbiBNMSBNQlAuICBTaW5jZSBpdCByZXF1aXJlcyBhIHJhY2UgY29uZGl0aW9uIHRvCisg ICAgICAgIHJlcHJvZHVjZSwgcmVwcm9kdWNpYmlsaXR5IGlzIG5vdCBhbHdheXMgcmVsaWFibGUu CisKKyAgICAgICAgKiBydW50aW1lL1ZNVHJhcHMuY3BwOgorICAgICAgICAoSlNDOjpWTVRyYXBz Ojp0cnlJbnN0YWxsVHJhcEJyZWFrcG9pbnRzKToKKwogMjAyMi0wNC0xNSAgQ2hyaXMgRHVtZXog IDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIExldmVyYWdlIFN0cmluZ1ZpZXcgaW4gbW9y ZSBwbGFjZXMgdG8gYXZvaWQgc29tZSBTdHJpbmcgYWxsb2NhdGlvbnMKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNVHJhcHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNVHJhcHMuY3BwCShyZXZpc2lvbiAyOTI5NDApCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTVRyYXBzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTAyLDcgKzEwMiwxNiBAQCB2b2lkIFZNVHJhcHM6OnRyeUluc3RhbGxUcmFwQnJlYWtwb2lu dHMoCiAKICAgICBDYWxsRnJhbWUqIGNhbGxGcmFtZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8Q2FsbEZy YW1lKj4oY29udGV4dC5mcmFtZVBvaW50ZXIpOwogCi0gICAgTG9ja2VyIGNvZGVCbG9ja1NldExv Y2tlciB7IHZtLmhlYXAuY29kZUJsb2NrU2V0KCkuZ2V0TG9jaygpIH07CisgICAgLy8gRXZlbiB0 aG91Z2ggd2Uga25vdyB0aGUgbXV0YXRvciB0aHJlYWQgaXMgbm90IGluIEMrKyBjb2RlIGFuZCB0 aGVyZWZvcmUsIG5vdCBob2xkaW5nCisgICAgLy8gdGhpcyBsb2NrLCB0aGUgc2FtcGxpbmcgcHJv ZmlsZXIgbWF5IGhhdmUgYWNxdWlyZWQgdGhpcyBsb2NrIGJlZm9yZSBhY3F1aXJpbmcKKyAgICAv LyBUaHJlYWRTdXNwZW5kTG9ja2VyIGFuZCBzdXNwZW5kaW5nIHRoZSBtdXRhdG9yLiBTaW5jZSBW TVRyYXBzIGFjcXVpcmVzIHRoZQorICAgIC8vIFRocmVhZFN1c3BlbmRMb2NrZXIgZmlyc3QsIHdl IGNhbiBkZWFkbG9jayB3aXRoIHRoZSBTYW1wbGluZyBQcm9maWxlciB0aHJlYWQsIGFuZAorICAg IC8vIGxlYXZlIHRoZSBtdXRhdG9yIGluIGEgc3VzcGVuZGVkIHN0YXRlLCBvciBmb3JldmVyIGJs b2NrZWQgb24gdGhlIGNvZGVCbG9ja1NldCBsb2NrLgorICAgIExvY2smIGNvZGVCbG9ja1NldExv Y2sgPSB2bS5oZWFwLmNvZGVCbG9ja1NldCgpLmdldExvY2soKTsKKyAgICBpZiAoIWNvZGVCbG9j a1NldExvY2sudHJ5TG9jaygpKQorICAgICAgICByZXR1cm47CisKKyAgICBMb2NrZXIgY29kZUJs b2NrU2V0TG9ja2VyIHsgQWRvcHRMb2NrLCBjb2RlQmxvY2tTZXRMb2NrIH07CiAKICAgICBDb2Rl QmxvY2sqIGZvdW5kQ29kZUJsb2NrID0gbnVsbHB0cjsKICAgICBFbnRyeUZyYW1lKiBlbnRyeUZy YW1lID0gdm0udG9wRW50cnlGcmFtZTsKQEAgLTIxNiw4ICsyMjUsMTcgQEAgcHVibGljOgogICAg ICAgICAgICAgICAgIEFTU0VSVChjdXJyZW50Q29kZUJsb2NrLT5oYXNJbnN0YWxsZWRWTVRyYXBC cmVha3BvaW50cygpKTsKICAgICAgICAgICAgICAgICBWTSYgdm0gPSBjdXJyZW50Q29kZUJsb2Nr LT52bSgpOwogCi0gICAgICAgICAgICAgICAgLy8gV2UgYXJlIGluIEpJVCBjb2RlIHNvIGl0J3Mg c2FmZSB0byBhY3F1aXJlIHRoaXMgbG9jay4KLSAgICAgICAgICAgICAgICBMb2NrZXIgY29kZUJs b2NrU2V0TG9ja2VyIHsgdm0uaGVhcC5jb2RlQmxvY2tTZXQoKS5nZXRMb2NrKCkgfTsKKyAgICAg ICAgICAgICAgICAvLyBFdmVuIHRob3VnaCB3ZSBrbm93IHRoZSBtdXRhdG9yIHRocmVhZCBpcyBu b3QgaW4gQysrIGNvZGUgYW5kIHRoZXJlZm9yZSwgbm90IGhvbGRpbmcKKyAgICAgICAgICAgICAg ICAvLyB0aGlzIGxvY2ssIHRoZSBzYW1wbGluZyBwcm9maWxlciBtYXkgaGF2ZSBhY3F1aXJlZCB0 aGlzIGxvY2sgYmVmb3JlIGFjcXVpcmluZworICAgICAgICAgICAgICAgIC8vIFRocmVhZFN1c3Bl bmRMb2NrZXIgYW5kIHN1c3BlbmRpbmcgdGhlIG11dGF0b3IuIFNpbmNlIFZNVHJhcHMgYWNxdWly ZXMgdGhlCisgICAgICAgICAgICAgICAgLy8gVGhyZWFkU3VzcGVuZExvY2tlciBmaXJzdCwgd2Ug Y2FuIGRlYWRsb2NrIHdpdGggdGhlIFNhbXBsaW5nIFByb2ZpbGVyIHRocmVhZCwgYW5kCisgICAg ICAgICAgICAgICAgLy8gbGVhdmUgdGhlIG11dGF0b3IgaW4gYSBzdXNwZW5kZWQgc3RhdGUsIG9y IGZvcmV2ZXIgYmxvY2tlZCBvbiB0aGUgY29kZUJsb2NrU2V0IGxvY2suCisgICAgICAgICAgICAg ICAgTG9jayYgY29kZUJsb2NrU2V0TG9jayA9IHZtLmhlYXAuY29kZUJsb2NrU2V0KCkuZ2V0TG9j aygpOworICAgICAgICAgICAgICAgIGlmICghY29kZUJsb2NrU2V0TG9jay50cnlMb2NrKCkpCisg ICAgICAgICAgICAgICAgICAgIHJldHVybiBTaWduYWxBY3Rpb246Ok5vdEhhbmRsZWQ7CisKKyAg ICAgICAgICAgICAgICBMb2NrZXIgY29kZUJsb2NrU2V0TG9ja2VyIHsgQWRvcHRMb2NrLCBjb2Rl QmxvY2tTZXRMb2NrIH07CisKICAgICAgICAgICAgICAgICBib29sIHNhd0N1cnJlbnRDb2RlQmxv Y2sgPSBmYWxzZTsKICAgICAgICAgICAgICAgICB2bS5oZWFwLmZvckVhY2hDb2RlQmxvY2tJZ25v cmluZ0pJVFBsYW5zKGNvZGVCbG9ja1NldExvY2tlciwgWyZdIChDb2RlQmxvY2sqIGNvZGVCbG9j aykgewogICAgICAgICAgICAgICAgICAgICAvLyBXZSB3YW50IHRvIGpldHRpc29uIGFsbCBjb2Rl IGJsb2NrcyB0aGF0IGhhdmUgdm0gdHJhcHMgYnJlYWtwb2ludHMsIG90aGVyd2lzZSB3ZSBjb3Vs ZCBoaXQgdGhlbSBsYXRlci4K