227069 2021-06-16 07:46:56 -0700 [WTF] DataMutex: Assert on double locking on the same thread 2021-06-16 19:07:58 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aboya aboya benjamin calvaris cdumez cmarcelo dpino ews-watchlist webkit-bug-importer oldest_to_newest 1770184 0 aboya 2021-06-16 07:46:56 -0700 DataMutex used to use OwnerAwareLock to track what thread is holding the mutex and emit assertion errors if a thread is found attempting to lock a mutex held by that same thread. This turns deadlocks into runtime errors. OwnerAwareLock was removed when DataMutex got clang thread safety annotations. This patch reintroduces the same logic, while keeping thread-safety annotations. This fixes WTF_DataMutex.DoubleLockDeathTest, which tested this functionality and was previously regressed. 1770185 1 431545 aboya 2021-06-16 07:48:55 -0700 Created attachment 431545 Patch 1770199 2 ews-feeder 2021-06-16 08:41:22 -0700 Committed r278936 (238867@main): <https://commits.webkit.org/238867@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431545. 1770200 3 webkit-bug-importer 2021-06-16 08:42:25 -0700 <rdar://problem/79399360> 1770509 4 fujii 2021-06-16 19:07:58 -0700 *** Bug 227021 has been marked as a duplicate of this bug. *** 431545 2021-06-16 07:48:55 -0700 2021-06-16 08:41:23 -0700 Patch bug-227069-20210616164854.patch text/plain 5073 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4OTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGFmNjk5MjcxYjFiZWRiMzZjZGYwNGYy YWRiNzAzNWNmODBkMWY0ZGEuLjY2Yjg5MjQ5YTViOTE4ZmU4MjFkYTY0ZmU0ZmUyZTliNWIxZGUz MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMDYtMTYgIEFsaWNpYSBCb3lhIEdhcmPDrWEg IDxhYm95YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtXVEZdIERhdGFNdXRleDogQXNzZXJ0IG9u IGRvdWJsZSBsb2NraW5nIG9uIHRoZSBzYW1lIHRocmVhZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MDY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGF0YU11dGV4IHVzZWQgdG8gdXNlIE93bmVyQXdh cmVMb2NrIHRvIHRyYWNrIHdoYXQgdGhyZWFkIGlzIGhvbGRpbmcKKyAgICAgICAgdGhlIG11dGV4 IGFuZCBlbWl0IGFzc2VydGlvbiBlcnJvcnMgaWYgYSB0aHJlYWQgaXMgZm91bmQgYXR0ZW1wdGlu ZyB0bworICAgICAgICBsb2NrIGEgbXV0ZXggaGVsZCBieSB0aGF0IHNhbWUgdGhyZWFkLiBUaGlz IHR1cm5zIGRlYWRsb2NrcyBpbnRvCisgICAgICAgIHJ1bnRpbWUgZXJyb3JzLgorCisgICAgICAg IE93bmVyQXdhcmVMb2NrIHdhcyByZW1vdmVkIHdoZW4gRGF0YU11dGV4IGdvdCBjbGFuZyB0aHJl YWQgc2FmZXR5CisgICAgICAgIGFubm90YXRpb25zLiBUaGlzIHBhdGNoIHJlaW50cm9kdWNlcyB0 aGUgc2FtZSBsb2dpYywgd2hpbGUga2VlcGluZworICAgICAgICB0aHJlYWQtc2FmZXR5IGFubm90 YXRpb25zLgorCisgICAgICAgIFRoaXMgZml4ZXMgV1RGX0RhdGFNdXRleC5Eb3VibGVMb2NrRGVh dGhUZXN0LCB3aGljaCB0ZXN0ZWQgdGhpcworICAgICAgICBmdW5jdGlvbmFsaXR5IGFuZCB3YXMg cHJldmlvdXNseSByZWdyZXNzZWQuCisKKyAgICAgICAgKiB3dGYvRGF0YU11dGV4Lmg6CisKIDIw MjEtMDYtMDYgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIERlbGV0 ZSBzb21lIHJlY2VudGx5LW9ic29sZXRlZCBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvRGF0YU11dGV4LmggYi9Tb3VyY2UvV1RGL3d0Zi9EYXRhTXV0ZXguaAppbmRleCBjNmQyOGNm ZWYxYjRhMDI0MWQ2ZmQ2OWFkM2E4Mjc4ZGE1NThjNDIxLi43Y2YzODMxMTRmNjlhZjQ1ZmI0ZTUz NGFiNDI3YTNjMzcwZWNhYWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9EYXRhTXV0ZXgu aAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9EYXRhTXV0ZXguaApAQCAtNTcsNiArNTcsOSBAQCBwcml2 YXRlOgogCiAgICAgTG9jayBtX211dGV4OwogICAgIFQgbV9kYXRhIFdURl9HVUFSREVEX0JZX0xP Q0sobV9tdXRleCk7CisjaWYgRU5BQkxFX0RBVEFfTVVURVhfQ0hFQ0tTCisgICAgVGhyZWFkKiBt X2N1cnJlbnRNdXRleEhvbGRlciB7IG51bGxwdHIgfTsKKyNlbmRpZgogfTsKIAogdGVtcGxhdGUg PHR5cGVuYW1lIFQ+CkBAIC02NSwxNSArNjgsMTMgQEAgcHVibGljOgogICAgIGV4cGxpY2l0IERh dGFNdXRleExvY2tlcihEYXRhTXV0ZXg8VD4mIGRhdGFNdXRleCkgV1RGX0FDUVVJUkVTX0xPQ0so bV9kYXRhTXV0ZXgubV9tdXRleCkKICAgICAgICAgOiBtX2RhdGFNdXRleChkYXRhTXV0ZXgpCiAg ICAgewotICAgICAgICBtdXRleCgpLmxvY2soKTsKLSAgICAgICAgbV9pc0xvY2tlZCA9IHRydWU7 CisgICAgICAgIGxvY2soKTsKICAgICB9CiAKICAgICB+RGF0YU11dGV4TG9ja2VyKCkgV1RGX1JF TEVBU0VTX0xPQ0soKQogICAgIHsKICAgICAgICAgaWYgKG1faXNMb2NrZWQpIHsKLSAgICAgICAg ICAgIGFzc2VydElzSGVsZChtX2RhdGFNdXRleC5tX211dGV4KTsKLSAgICAgICAgICAgIG11dGV4 KCkudW5sb2NrKCk7CisgICAgICAgICAgICB1bmxvY2soKTsKICAgICAgICAgfQogICAgIH0KIApA QCAtMTAxLDkgKzEwMiw4IEBAIHB1YmxpYzoKICAgICAvLyBSdW4tdGltZSBjaGVja3MgYXJlIHN0 aWxsIHBlcmZvcm1lZCBpZiBlbmFibGVkLgogICAgIHZvaWQgdW5sb2NrRWFybHkoKSBXVEZfUkVM RUFTRVNfTE9DSyhtX2RhdGFNdXRleC5tX211dGV4KQogICAgIHsKLSAgICAgICAgREFUQV9NVVRF WF9DSEVDSyhtdXRleCgpLmlzSGVsZCgpKTsKLSAgICAgICAgbV9pc0xvY2tlZCA9IGZhbHNlOwot ICAgICAgICBtdXRleCgpLnVubG9jaygpOworICAgICAgICBhc3NlcnRJc0hlbGQobV9kYXRhTXV0 ZXgubV9tdXRleCk7CisgICAgICAgIHVubG9jaygpOwogICAgIH0KIAogICAgIC8vIFVzZWQgdG8g YXZvaWQgZXhjZXNzaXZlIGJyYWNlIHNjb3Bpbmcgd2hlbiBvbmx5IHNtYWxsIHBhcnRzIG9mIHRo ZSBjb2RlIG5lZWQgdG8gYmUgcnVuIHVubG9ja2VkLgpAQCAtMTExLDE2ICsxMTEsMzUgQEAgcHVi bGljOgogICAgIC8vIEl0J3MgaGVscGZ1bCB0byB1c2UgYSBtaW5pbWFsIGxhbWJkYSBjYXB0dXJl IHRvIGJlIGNvbnNjaW91cyBvZiB3aGF0IGRhdGEgeW91J3JlIGhhdmluZyBhY2Nlc3MgdG8gaW4g dGhlc2Ugc2VjdGlvbnMuCiAgICAgdm9pZCBydW5VbmxvY2tlZChjb25zdCBGdW5jdGlvbjx2b2lk KCk+JiBjYWxsYmFjaykgV1RGX0lHTk9SRVNfVEhSRUFEX1NBRkVUWV9BTkFMWVNJUwogICAgIHsK LSAgICAgICAgREFUQV9NVVRFWF9DSEVDSyhtdXRleCgpLmlzSGVsZCgpKTsKLSAgICAgICAgYXNz ZXJ0SXNIZWxkKG1fZGF0YU11dGV4Lm1fbXV0ZXgpOwotICAgICAgICBtdXRleCgpLnVubG9jaygp OworICAgICAgICB1bmxvY2soKTsKICAgICAgICAgY2FsbGJhY2soKTsKLSAgICAgICAgbXV0ZXgo KS5sb2NrKCk7CisgICAgICAgIGxvY2soKTsKICAgICB9CiAKIHByaXZhdGU6CiAgICAgRGF0YU11 dGV4PFQ+JiBtX2RhdGFNdXRleDsKICAgICBib29sIG1faXNMb2NrZWQgeyBmYWxzZSB9OworCisg ICAgdm9pZCBsb2NrKCkgV1RGX0FDUVVJUkVTX0xPQ0sobV9kYXRhTXV0ZXgubV9tdXRleCkKKyAg ICB7CisgICAgICAgIERBVEFfTVVURVhfQ0hFQ0sobV9kYXRhTXV0ZXgubV9jdXJyZW50TXV0ZXhI b2xkZXIgIT0gJlRocmVhZDo6Y3VycmVudCgpKTsgLy8gVGhyZWFkIGF0dGVtcHRlZCByZWN1cnNp dmUgbG9jayBvbiBub24tcmVjdXJzaXZlIGxvY2suCisgICAgICAgIG11dGV4KCkubG9jaygpOwor ICAgICAgICBtX2lzTG9ja2VkID0gdHJ1ZTsKKyNpZiBFTkFCTEVfREFUQV9NVVRFWF9DSEVDS1MK KyAgICAgICAgbV9kYXRhTXV0ZXgubV9jdXJyZW50TXV0ZXhIb2xkZXIgPSAmVGhyZWFkOjpjdXJy ZW50KCk7CisjZW5kaWYKKyAgICB9CisKKyAgICB2b2lkIHVubG9jaygpIFdURl9SRUxFQVNFU19M T0NLKG1fZGF0YU11dGV4Lm1fbXV0ZXgpCisgICAgeworICAgICAgICBEQVRBX01VVEVYX0NIRUNL KG11dGV4KCkuaXNIZWxkKCkpOworICAgICAgICBhc3NlcnRJc0hlbGQobV9kYXRhTXV0ZXgubV9t dXRleCk7CisjaWYgRU5BQkxFX0RBVEFfTVVURVhfQ0hFQ0tTCisgICAgICAgIG1fZGF0YU11dGV4 Lm1fY3VycmVudE11dGV4SG9sZGVyID0gbnVsbHB0cjsKKyNlbmRpZgorICAgICAgICBtX2lzTG9j a2VkID0gZmFsc2U7CisgICAgICAgIG11dGV4KCkudW5sb2NrKCk7CisgICAgfQogfTsKIAogfSAv LyBuYW1lc3BhY2UgV1RGCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggYjFjZjdjN2E5YWE1YWVkMmNkNDE3MzE4MWFlMWE0MmNmMDA1YzEwYS4uYTYy YzAyZjJlODQzOWVhM2RjODBiZjExNDhiN2QwYzEwOTEyMDZjNiAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA2 LTE2ICBBbGljaWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBb V1RGXSBEYXRhTXV0ZXg6IEFzc2VydCBvbiBkb3VibGUgbG9ja2luZyBvbiB0aGUgc2FtZSB0aHJl YWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzA2 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0 ZSBleHBlY3RhdGlvbnMgdG8gaW5jbHVkZSB0aGUgZml4ZWQgdGVzdC4KKworICAgICAgICAqIFRl c3RXZWJLaXRBUEkvZ2xpYi9UZXN0RXhwZWN0YXRpb25zLmpzb246CisKIDIwMjEtMDYtMTUgIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBbGxv dyBsZWdhY3kgU2VjdXJpdHlPcmlnaW4gYmVoYXZpb3IgZm9yIHgtYXBwbGUtcWwtaWQyIHNjaGVt ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1Rlc3RFeHBlY3RhdGlvbnMu anNvbiBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9UZXN0RXhwZWN0YXRpb25zLmpzb24KaW5k ZXggMGVlM2E5ODgxYzI3ZWYxY2UwMDA2MTQ0MjcwMWU3MzVjNzBjNTgzNi4uMTgyZGFiNzIyMzVl MWRkY2Q2ZTU2MjZlYzg3NjdhNzc1NTJiODdlYyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktp dEFQSS9nbGliL1Rlc3RFeHBlY3RhdGlvbnMuanNvbgorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L2dsaWIvVGVzdEV4cGVjdGF0aW9ucy5qc29uCkBAIC0yODksOSArMjg5LDYgQEAKICAgICAgICAg ICAgIH0sCiAgICAgICAgICAgICAiV1RGLldvcmtlclBvb2xEZWNyZWFzZSI6IHsKICAgICAgICAg ICAgICAgICAiZXhwZWN0ZWQiOiB7Imd0ayI6IHsic3RhdHVzIjogWyJUSU1FT1VUIiwgIlBBU1Mi XSwgImJ1ZyI6ICJ3ZWJraXQub3JnL2IvMjE0ODAzIn19Ci0gICAgICAgICAgICB9LAotICAgICAg ICAgICAgIldURl9EYXRhTXV0ZXguRG91YmxlTG9ja0RlYXRoVGVzdCI6IHsKLSAgICAgICAgICAg ICAgICAiZXhwZWN0ZWQiOiB7Imd0ayI6IHsic3RhdHVzIjogWyJUSU1FT1VUIl0sICJidWciOiAi d2Via2l0Lm9yZy9iLzIyNzAyMSJ9fQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSwK