154841 2016-02-29 16:48:57 -0800 regress/script-tests/double-pollution-putbyoffset.js.ftl-eager timed out because of a lock ordering deadlock involving InferredType and CodeBlock 2016-02-29 19:19:18 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1169316 0 fpizlo 2016-02-29 16:48:57 -0800 Yucky! 1169318 1 fpizlo 2016-02-29 16:56:17 -0800 Here's the deadlock: Main thread: 1) Change an InferredType. This acquires InferredType::m_lock. 2) Fire watchpoint set. This triggers CodeBlock invalidation, which acquires CodeBlock::m_lock. DFG thread: 1) Iterate over the information in a CodeBlock. This acquires CodeBlock::m_lock. 2) Ask an InferredType for its descriptor(). This acquires InferredType::m_lock. I think that the DFG thread's ordering should be legal, because the best logic for lock hierarchies is that locks that protect the largest set of stuff should be acquired first. This means that the main thread shouldn't be holding the InferredType::m_lock when firing watchpoint sets. I think that we already do magic for this in other places. 1169326 2 272533 fpizlo 2016-02-29 17:33:46 -0800 Created attachment 272533 the patch 1169341 3 fpizlo 2016-02-29 19:19:18 -0800 Landed in http://trac.webkit.org/changeset/197381 272533 2016-02-29 17:33:46 -0800 2016-02-29 17:38:24 -0800 the patch blah.patch text/plain 7261 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk3Mzc3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBA CisyMDE2LTAyLTI5ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg cmVncmVzcy9zY3JpcHQtdGVzdHMvZG91YmxlLXBvbGx1dGlvbi1wdXRieW9mZnNldC5qcy5mdGwt ZWFnZXIgdGltZWQgb3V0IGJlY2F1c2Ugb2YgYSBsb2NrIG9yZGVyaW5nIGRlYWRsb2NrIGludm9s dmluZyBJbmZlcnJlZFR5cGUgYW5kIENvZGVCbG9jaworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0ODQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSGVyZSdzIHRoZSBkZWFkbG9jazoKKworICAgICAgICBN YWluIHRocmVhZDoKKyAgICAgICAgICAgIDEpIENoYW5nZSBhbiBJbmZlcnJlZFR5cGUuICBUaGlz IGFjcXVpcmVzIEluZmVycmVkVHlwZTo6bV9sb2NrLgorICAgICAgICAgICAgMikgRmlyZSB3YXRj aHBvaW50IHNldC4gIFRoaXMgdHJpZ2dlcnMgQ29kZUJsb2NrIGludmFsaWRhdGlvbiwgd2hpY2gg YWNxdWlyZXMKKyAgICAgICAgICAgICAgIENvZGVCbG9jazo6bV9sb2NrLgorCisgICAgICAgIERG RyB0aHJlYWQ6CisgICAgICAgICAgICAxKSBJdGVyYXRlIG92ZXIgdGhlIGluZm9ybWF0aW9uIGlu IGEgQ29kZUJsb2NrLiAgVGhpcyBhY3F1aXJlcyBDb2RlQmxvY2s6Om1fbG9jay4KKyAgICAgICAg ICAgIDIpIEFzayBhbiBJbmZlcnJlZFR5cGUgZm9yIGl0cyBkZXNjcmlwdG9yKCkuICBUaGlzIGFj cXVpcmVzIEluZmVycmVkVHlwZTo6bV9sb2NrLgorCisgICAgICAgIEkgdGhpbmsgdGhhdCB0aGUg REZHIHRocmVhZCdzIG9yZGVyaW5nIHNob3VsZCBiZSBsZWdhbCwgYmVjYXVzZSB0aGUgYmVzdCBs b2dpYyBmb3IgbG9jaworICAgICAgICBoaWVyYXJjaGllcyBpcyB0aGF0IGxvY2tzIHRoYXQgcHJv dGVjdCB0aGUgbGFyZ2VzdCBzZXQgb2Ygc3R1ZmYgc2hvdWxkIGJlIGFjcXVpcmVkIGZpcnN0Lgor CisgICAgICAgIFRoaXMgbWVhbnMgdGhhdCB0aGUgbWFpbiB0aHJlYWQgc2hvdWxkbid0IGJlIGhv bGRpbmcgdGhlIEluZmVycmVkVHlwZTo6bV9sb2NrIHdoZW4gZmlyaW5nCisgICAgICAgIHdhdGNo cG9pbnQgc2V0cy4gIFRoYXQncyB3aGF0IHRoaXMgcGF0Y2ggZW5zdXJlcy4KKworICAgICAgICBB dCB0aGUgdGltZSBvZiB3cml0aW5nLCB0aGlzIHRlc3Qgd2FzIGRlYWRsb2NraW5nIGZvciBtZSBv biB0cnVuayAxMDAlIG9mIHRoZSB0aW1lLiAgV2l0aAorICAgICAgICB0aGlzIGNoYW5nZSBJIGNh bm5vdCBnZXQgaXQgdG8gZGVhZGxvY2suCisKKyAgICAgICAgKiBydW50aW1lL0luZmVycmVkVHlw ZS5jcHA6CisgICAgICAgIChKU0M6OkluZmVycmVkVHlwZTo6d2lsbFN0b3JlVmFsdWVTbG93KToK KyAgICAgICAgKEpTQzo6SW5mZXJyZWRUeXBlOjptYWtlVG9wU2xvdyk6CisgICAgICAgIChKU0M6 OkluZmVycmVkVHlwZTo6c2V0KToKKyAgICAgICAgKEpTQzo6SW5mZXJyZWRUeXBlOjpyZW1vdmVT dHJ1Y3R1cmUpOgorICAgICAgICAoSlNDOjpJbmZlcnJlZFR5cGU6OkluZmVycmVkU3RydWN0dXJl V2F0Y2hwb2ludDo6ZmlyZUludGVybmFsKToKKyAgICAgICAgKiBydW50aW1lL0luZmVycmVkVHlw ZS5oOgorCiAyMDE2LTAyLTI5ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAg ICAgICAgU3BlY3VsYXRlZFR5cGUgc2hvdWxkIGJlIGVhc2llciB0byBlZGl0CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbmZlcnJlZFR5cGUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0luZmVycmVkVHlwZS5jcHAJKHJldmlzaW9u IDE5NzM3MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0luZmVycmVkVHlwZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQwMCwyOCArNDAwLDQ0IEBAIHZvaWQgSW5mZXJyZWRUeXBl OjpkdW1wKFByaW50U3RyZWFtJiBvdXQKIAogYm9vbCBJbmZlcnJlZFR5cGU6OndpbGxTdG9yZVZh bHVlU2xvdyhWTSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUp CiB7Ci0gICAgQ29uY3VycmVudEpJVExvY2tlciBsb2NrZXIobV9sb2NrKTsKLSAgICBEZXNjcmlw dG9yIG15VHlwZSA9IGRlc2NyaXB0b3IobG9ja2VyKTsKLSAgICBEZXNjcmlwdG9yIG90aGVyVHlw ZSA9IERlc2NyaXB0b3I6OmZvclZhbHVlKHZhbHVlKTsKKyAgICBEZXNjcmlwdG9yIG9sZFR5cGU7 CisgICAgRGVzY3JpcHRvciBteVR5cGU7CisgICAgYm9vbCByZXN1bHQ7CisgICAgeworICAgICAg ICBDb25jdXJyZW50SklUTG9ja2VyIGxvY2tlcihtX2xvY2spOworICAgICAgICBvbGRUeXBlID0g ZGVzY3JpcHRvcihsb2NrZXIpOworICAgICAgICBteVR5cGUgPSBEZXNjcmlwdG9yOjpmb3JWYWx1 ZSh2YWx1ZSk7CiAKLSAgICBteVR5cGUubWVyZ2Uob3RoZXJUeXBlKTsKLQotICAgIEFTU0VSVChk ZXNjcmlwdG9yKGxvY2tlcikgIT0gbXlUeXBlKTsgLy8gVGhlIHR5cGUgbXVzdCBoYXZlIGNoYW5n ZWQgaWYgd2UncmUgb24gdGhlIHNsb3cgcGF0aC4KLQotICAgIHNldChsb2NrZXIsIHZtLCBwcm9w ZXJ0eU5hbWUsIHZhbHVlLCBteVR5cGUpOworICAgICAgICBteVR5cGUubWVyZ2Uob2xkVHlwZSk7 CisgICAgICAgIAorICAgICAgICBBU1NFUlQob2xkVHlwZSAhPSBteVR5cGUpOyAvLyBUaGUgdHlw ZSBtdXN0IGhhdmUgY2hhbmdlZCBpZiB3ZSdyZSBvbiB0aGUgc2xvdyBwYXRoLgogCi0gICAgcmV0 dXJuIGtpbmQobG9ja2VyKSAhPSBUb3A7CisgICAgICAgIGJvb2wgc2V0UmVzdWx0ID0gc2V0KGxv Y2tlciwgdm0sIG15VHlwZSk7CisgICAgICAgIHJlc3VsdCA9IGtpbmQobG9ja2VyKSAhPSBUb3A7 CisgICAgICAgIGlmICghc2V0UmVzdWx0KQorICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAg ICB9CisgICAgCisgICAgSW5mZXJyZWRUeXBlRmlyZURldGFpbCBkZXRhaWwodGhpcywgcHJvcGVy dHlOYW1lLnVpZCgpLCBvbGRUeXBlLCBteVR5cGUsIHZhbHVlKTsKKyAgICBtX3dhdGNocG9pbnRT ZXQuZmlyZUFsbChkZXRhaWwpOworICAgIHJldHVybiByZXN1bHQ7CiB9CiAKIHZvaWQgSW5mZXJy ZWRUeXBlOjptYWtlVG9wU2xvdyhWTSYgdm0sIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpCiB7 Ci0gICAgQ29uY3VycmVudEpJVExvY2tlciBsb2NrZXIobV9sb2NrKTsKLSAgICBzZXQobG9ja2Vy LCB2bSwgcHJvcGVydHlOYW1lLCBKU1ZhbHVlKCksIFRvcCk7CisgICAgRGVzY3JpcHRvciBvbGRU eXBlOworICAgIHsKKyAgICAgICAgQ29uY3VycmVudEpJVExvY2tlciBsb2NrZXIobV9sb2NrKTsK KyAgICAgICAgb2xkVHlwZSA9IGRlc2NyaXB0b3IobG9ja2VyKTsKKyAgICAgICAgaWYgKCFzZXQo bG9ja2VyLCB2bSwgVG9wKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBJbmZl cnJlZFR5cGVGaXJlRGV0YWlsIGRldGFpbCh0aGlzLCBwcm9wZXJ0eU5hbWUudWlkKCksIG9sZFR5 cGUsIFRvcCwgSlNWYWx1ZSgpKTsKKyAgICBtX3dhdGNocG9pbnRTZXQuZmlyZUFsbChkZXRhaWwp OwogfQogCi12b2lkIEluZmVycmVkVHlwZTo6c2V0KAotICAgIGNvbnN0IENvbmN1cnJlbnRKSVRM b2NrZXImIGxvY2tlciwgVk0mIHZtLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBKU1ZhbHVl IG9mZmVuZGluZ1ZhbHVlLAotICAgIERlc2NyaXB0b3IgbmV3RGVzY3JpcHRvcikKK2Jvb2wgSW5m ZXJyZWRUeXBlOjpzZXQoY29uc3QgQ29uY3VycmVudEpJVExvY2tlciYgbG9ja2VyLCBWTSYgdm0s IERlc2NyaXB0b3IgbmV3RGVzY3JpcHRvcikKIHsKICAgICAvLyBXZSB3aWxsIHRyaWdnZXIgd3Jp dGUgYmFycmllcnMgd2hpbGUgaG9sZGluZyBvdXIgbG9jay4gQ3VycmVudGx5LCB3cml0ZSBiYXJy aWVycyBkb24ndCBHQywgYnV0IHRoYXQKICAgICAvLyBjb3VsZCBjaGFuZ2UuIElmIGl0IGRvZXMs IHdlIGRvbid0IHdhbnQgdG8gZGVhZGxvY2suIE5vdGUgdGhhdCB3ZSBjb3VsZCBoYXZlIHVzZWQK QEAgLTQzMSw4ICs0NDcsMTAgQEAgdm9pZCBJbmZlcnJlZFR5cGU6OnNldCgKICAgICAKICAgICAv LyBCZSBkZWZlbnNpdmU6IGlmIHdlJ3JlIG5vdCByZWFsbHkgY2hhbmdpbmcgdGhlIHR5cGUsIHRo ZW4gd2UgZG9uJ3QgaGF2ZSB0byBkbyBhbnl0aGluZy4KICAgICBpZiAoZGVzY3JpcHRvcihsb2Nr ZXIpID09IG5ld0Rlc2NyaXB0b3IpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZh bHNlOwogCisgICAgYm9vbCBzaG91bGRGaXJlV2F0Y2hwb2ludFNldCA9IGZhbHNlOworICAgIAog ICAgIC8vIFRoZSBuZXcgZGVzY3JpcHRvciBtdXN0IGJlIG1vcmUgZ2VuZXJhbCB0aGFuIHRoZSBw cmV2aW91cyBvbmUuCiAgICAgQVNTRVJUKG5ld0Rlc2NyaXB0b3Iuc3Vic3VtZXMoZGVzY3JpcHRv cihsb2NrZXIpKSk7CiAKQEAgLTQ0NiwxNSArNDY0LDEyIEBAIHZvaWQgSW5mZXJyZWRUeXBlOjpz ZXQoCiAgICAgICAgIC8vIFdlIGNhbm5vdCBoYXZlIGJlZW4gaW52YWxpZGF0ZWQsIHNpbmNlIGlm IHdlIHdlcmUsIHRoZW4gd2UnZCBhbHJlYWR5IGJlIGF0IFRvcC4KICAgICAgICAgQVNTRVJUKG1f d2F0Y2hwb2ludFNldC5zdGF0ZSgpICE9IElzSW52YWxpZGF0ZWQpOwogCi0gICAgICAgIEluZmVy cmVkVHlwZUZpcmVEZXRhaWwgZGV0YWlsKAotICAgICAgICAgICAgdGhpcywgcHJvcGVydHlOYW1l LnVpZCgpLCBkZXNjcmlwdG9yKGxvY2tlciksIG5ld0Rlc2NyaXB0b3IsIG9mZmVuZGluZ1ZhbHVl KTsKLSAgICAgICAgCiAgICAgICAgIC8vIFdlJ3JlIGFib3V0IHRvIGRvIGV4cGVuc2l2ZSB0aGlu Z3MgYmVjYXVzZSBzb21lIGNvbXBpbGVyIHRocmVhZCBkZWNpZGVkIHRvIHdhdGNoIHRoaXMgdHlw ZSBhbmQKICAgICAgICAgLy8gdGhlbiB0aGUgdHlwZSBjaGFuZ2VkLiBBc3N1bWUgdGhhdCB0aGlz IHByb3BlcnR5IGlzIGNyYXp5LCBhbmQgZG9uJ3QgZXZlciBkbyBhbnkgbW9yZSB0aGluZ3MgZm9y CiAgICAgICAgIC8vIGl0LgogICAgICAgICBuZXdEZXNjcmlwdG9yID0gVG9wOwogCi0gICAgICAg IG1fd2F0Y2hwb2ludFNldC5maXJlQWxsKGRldGFpbCk7CisgICAgICAgIHNob3VsZEZpcmVXYXRj aHBvaW50U2V0ID0gdHJ1ZTsKICAgICB9CiAKICAgICAvLyBSZW1vdmUgdGhlIG9sZCBJbmZlcnJl ZFN0cnVjdHVyZSBvYmplY3QgaWYgd2Ugbm8gbG9uZ2VyIG5lZWQgaXQuCkBAIC00NzcsNiArNDky LDggQEAgdm9pZCBJbmZlcnJlZFR5cGU6OnNldCgKIAogICAgIC8vIEFzc2VydCB0aGF0IHdlIGRp ZCB0aGluZ3MuCiAgICAgQVNTRVJUKGRlc2NyaXB0b3IobG9ja2VyKSA9PSBuZXdEZXNjcmlwdG9y KTsKKworICAgIHJldHVybiBzaG91bGRGaXJlV2F0Y2hwb2ludFNldDsKIH0KIAogdm9pZCBJbmZl cnJlZFR5cGU6OnJlbW92ZVN0cnVjdHVyZSgpCkBAIC00ODYsMTIgKzUwMywyMCBAQCB2b2lkIElu ZmVycmVkVHlwZTo6cmVtb3ZlU3RydWN0dXJlKCkKICAgICAKICAgICBWTSYgdm0gPSAqSGVhcDo6 aGVhcCh0aGlzKS0+dm0oKTsKIAotICAgIENvbmN1cnJlbnRKSVRMb2NrZXIgbG9ja2VyKG1fbG9j ayk7Ci0gICAgCi0gICAgRGVzY3JpcHRvciBuZXdEZXNjcmlwdG9yID0gZGVzY3JpcHRvcihsb2Nr ZXIpOwotICAgIG5ld0Rlc2NyaXB0b3IucmVtb3ZlU3RydWN0dXJlKCk7Ci0gICAgCi0gICAgc2V0 KGxvY2tlciwgdm0sIFByb3BlcnR5TmFtZShudWxscHRyKSwgSlNWYWx1ZSgpLCBuZXdEZXNjcmlw dG9yKTsKKyAgICBEZXNjcmlwdG9yIG9sZERlc2NyaXB0b3I7CisgICAgRGVzY3JpcHRvciBuZXdE ZXNjcmlwdG9yOworICAgIHsKKyAgICAgICAgQ29uY3VycmVudEpJVExvY2tlciBsb2NrZXIobV9s b2NrKTsKKyAgICAgICAgb2xkRGVzY3JpcHRvciA9IGRlc2NyaXB0b3IobG9ja2VyKTsKKyAgICAg ICAgbmV3RGVzY3JpcHRvciA9IG9sZERlc2NyaXB0b3I7CisgICAgICAgIG5ld0Rlc2NyaXB0b3Iu cmVtb3ZlU3RydWN0dXJlKCk7CisgICAgICAgIAorICAgICAgICBpZiAoIXNldChsb2NrZXIsIHZt LCBuZXdEZXNjcmlwdG9yKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBJbmZl cnJlZFR5cGVGaXJlRGV0YWlsIGRldGFpbCh0aGlzLCBudWxscHRyLCBvbGREZXNjcmlwdG9yLCBu ZXdEZXNjcmlwdG9yLCBKU1ZhbHVlKCkpOworICAgIG1fd2F0Y2hwb2ludFNldC5maXJlQWxsKGRl dGFpbCk7CiB9CiAKIHZvaWQgSW5mZXJyZWRUeXBlOjpJbmZlcnJlZFN0cnVjdHVyZVdhdGNocG9p bnQ6OmZpcmVJbnRlcm5hbChjb25zdCBGaXJlRGV0YWlsJikKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0luZmVycmVkVHlwZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0luZmVycmVkVHlwZS5oCShyZXZpc2lvbiAxOTczNzIpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbmZlcnJlZFR5cGUuaAkod29ya2luZyBjb3B5 KQpAQCAtMjI5LDcgKzIyOSwxMSBAQCBwcml2YXRlOgogCiAgICAgYm9vbCB3aWxsU3RvcmVWYWx1 ZVNsb3coVk0mLCBQcm9wZXJ0eU5hbWUsIEpTVmFsdWUpOwogICAgIHZvaWQgbWFrZVRvcFNsb3co Vk0mLCBQcm9wZXJ0eU5hbWUpOwotICAgIHZvaWQgc2V0KGNvbnN0IENvbmN1cnJlbnRKSVRMb2Nr ZXImLCBWTSYsIFByb3BlcnR5TmFtZSwgSlNWYWx1ZSwgRGVzY3JpcHRvcik7CisKKyAgICAvLyBI ZWxwZXIgZm9yIHdpbGxTdG9yZVZhbHVlU2xvdygpIGFuZCBtYWtlVG9wU2xvdygpLiBUaGlzIHJl dHVybnMgdHJ1ZSBpZiB3ZSBzaG91bGQgZmlyZSB0aGUKKyAgICAvLyB3YXRjaHBvaW50IHNldC4K KyAgICBib29sIHNldChjb25zdCBDb25jdXJyZW50SklUTG9ja2VyJiwgVk0mLCBEZXNjcmlwdG9y KTsKKyAgICAKICAgICB2b2lkIHJlbW92ZVN0cnVjdHVyZSgpOwogCiAgICAgbXV0YWJsZSBDb25j dXJyZW50SklUTG9jayBtX2xvY2s7Cg==