149729 2015-10-01 15:38:35 -0700 Remove unnecessary SpecialFastCaseProfiles. 2015-10-01 16:22:38 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149600 1 mark.lam mark.lam benjamin fpizlo ggaren keith_miller msaboff saam ysuzuki oldest_to_newest 1130061 0 mark.lam 2015-10-01 15:38:35 -0700 The current baseline code creates special fast case profiles records for bytecodes that don't need them. This was done to keep the DFG from crashing when it searches for such a profile and don't find one. Instead, we should fix the code to check for the existence of the profile before dereferencing it to get a count. 1130067 1 262293 mark.lam 2015-10-01 15:45:54 -0700 Created attachment 262293 the fix. 1130071 2 262293 saam 2015-10-01 15:59:16 -0700 Comment on attachment 262293 the fix. r=me 1130080 3 mark.lam 2015-10-01 16:22:38 -0700 Thanks. Landed in r190435: <http://trac.webkit.org/r190435>. 262293 2015-10-01 15:45:54 -0700 2015-10-01 15:59:16 -0700 the fix. bug-149729.patch text/plain 6599 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkwNDM0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDE1LTEwLTAxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW1vdmUgdW5uZWNlc3NhcnkgU3BlY2lhbEZhc3RDYXNlUHJvZmlsZXMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDk3MjkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3VycmVudCBiYXNlbGluZSBj b2RlIGNyZWF0ZXMgc3BlY2lhbCBmYXN0IGNhc2UgcHJvZmlsZXMgcmVjb3JkcyBmb3IKKyAgICAg ICAgYnl0ZWNvZGVzIHRoYXQgZG9uJ3QgbmVlZCB0aGVtLiAgVGhpcyB3YXMgZG9uZSB0byBrZWVw IHRoZSBERkcgZnJvbSBjcmFzaGluZyB3aGVuCisgICAgICAgIGl0IHNlYXJjaGVzIGZvciBzdWNo IGEgcHJvZmlsZSBhbmQgZG9uJ3QgZmluZCBvbmUuICBJbnN0ZWFkLCB3ZSB3aWxsIGZpeCB0aGUg Y29kZQorICAgICAgICB0byBjaGVjayBmb3IgdGhlIGV4aXN0ZW5jZSBvZiB0aGUgcHJvZmlsZSBi ZWZvcmUgZGVyZWZlcmVuY2luZyBpdCB0byBnZXQgYSBjb3VudC4KKworICAgICAgICAqIGJ5dGVj b2RlL0NvZGVCbG9jay5oOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OnNwZWNpYWxGYXN0Q2Fz ZVByb2ZpbGVDb3VudEZvckJ5dGVjb2RlT2Zmc2V0KToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2Nr Ojpjb3VsZFRha2VTcGVjaWFsRmFzdENhc2UpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6Omxp a2VseVRvVGFrZURlZXBlc3RTbG93Q2FzZSk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6bnVt YmVyT2ZBcnJheVByb2ZpbGVzKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjphcnJheVByb2Zp bGVzKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjphZGRBcnJheVByb2ZpbGUpOgorICAgICAg ICAoSlNDOjpDb2RlQmxvY2s6Omxpa2VseVRvVGFrZVNwZWNpYWxGYXN0Q2FzZSk6IERlbGV0ZWQu ICBOb3QgdXNlZC4KKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpsaWtlbHlUb1Rha2VBbnlTbG93 Q2FzZSk6IERlbGV0ZWQuICAgTm90IHVzZWQuCisgICAgICAgICogaml0L0pJVEFyaXRobWV0aWMu Y3BwOgorCisgICAgICAgIChKU0M6OkpJVDo6Y29tcGlsZUJpbmFyeUFyaXRoT3ApOgorICAgICAg ICAtIE9ubHkgb3BfbXVsIG5lZWRzIHRoZSBwcm9maWxlLiAgU28sIG9ubHkgYWxsb2NhdGUgaXQg aW4gdGhlIG9wX211bCBjYXNlLgorCisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9tdWwpOgor ICAgICAgICAtIFRoZXNlIG9wX211bCBjYXNlcyBjcmVhdGUgdGhlIHByb2ZpbGUgYnV0IG5ldmVy IGluY3JlbWVudHMgaXRzIGNvdW50ZXIuCisgICAgICAgICAgSGVuY2UsIHdlIGNhbiBnZXQgcmlk IG9mIHRoZXNlLgorCiAyMDE1LTEwLTAxICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBw bGUuY29tPgogCiAgICAgICAgIFtFUzZdIEFkZCBUeXBlZEFycmF5LnByb3RvdHlwZSBmdW5jdGlv bmFsaXR5LgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2su aAkocmV2aXNpb24gMTkwMzY2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0Nv ZGVCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC00MzgsMjAgKzQzOCwxOSBAQCBwdWJsaWM6CiAg ICAgICAgICAgICBtX3NwZWNpYWxGYXN0Q2FzZVByb2ZpbGVzLCBtX3NwZWNpYWxGYXN0Q2FzZVBy b2ZpbGVzLnNpemUoKSwgYnl0ZWNvZGVPZmZzZXQsCiAgICAgICAgICAgICBnZXRSYXJlQ2FzZVBy b2ZpbGVCeXRlY29kZU9mZnNldCk7CiAgICAgfQotCi0gICAgYm9vbCBsaWtlbHlUb1Rha2VTcGVj aWFsRmFzdENhc2UoaW50IGJ5dGVjb2RlT2Zmc2V0KQorICAgIHVuc2lnbmVkIHNwZWNpYWxGYXN0 Q2FzZVByb2ZpbGVDb3VudEZvckJ5dGVjb2RlT2Zmc2V0KGludCBieXRlY29kZU9mZnNldCkKICAg ICB7Ci0gICAgICAgIGlmICghaGFzQmFzZWxpbmVKSVRQcm9maWxpbmcoKSkKLSAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAgICAgdW5zaWduZWQgc3BlY2lhbEZhc3RDYXNlQ291bnQgPSBz cGVjaWFsRmFzdENhc2VQcm9maWxlRm9yQnl0ZWNvZGVPZmZzZXQoYnl0ZWNvZGVPZmZzZXQpLT5t X2NvdW50ZXI7Ci0gICAgICAgIHJldHVybiBzcGVjaWFsRmFzdENhc2VDb3VudCA+PSBPcHRpb25z OjpsaWtlbHlUb1Rha2VTbG93Q2FzZU1pbmltdW1Db3VudCgpOworICAgICAgICBSYXJlQ2FzZVBy b2ZpbGUqIHByb2ZpbGUgPSBzcGVjaWFsRmFzdENhc2VQcm9maWxlRm9yQnl0ZWNvZGVPZmZzZXQo Ynl0ZWNvZGVPZmZzZXQpOworICAgICAgICBpZiAoIXByb2ZpbGUpCisgICAgICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgcmV0dXJuIHByb2ZpbGUtPm1fY291bnRlcjsKICAgICB9CiAKICAgICBi b29sIGNvdWxkVGFrZVNwZWNpYWxGYXN0Q2FzZShpbnQgYnl0ZWNvZGVPZmZzZXQpCiAgICAgewog ICAgICAgICBpZiAoIWhhc0Jhc2VsaW5lSklUUHJvZmlsaW5nKCkpCiAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgICAgIHVuc2lnbmVkIHNwZWNpYWxGYXN0Q2FzZUNvdW50ID0gc3BlY2lh bEZhc3RDYXNlUHJvZmlsZUZvckJ5dGVjb2RlT2Zmc2V0KGJ5dGVjb2RlT2Zmc2V0KS0+bV9jb3Vu dGVyOworICAgICAgICB1bnNpZ25lZCBzcGVjaWFsRmFzdENhc2VDb3VudCA9IHNwZWNpYWxGYXN0 Q2FzZVByb2ZpbGVDb3VudEZvckJ5dGVjb2RlT2Zmc2V0KGJ5dGVjb2RlT2Zmc2V0KTsKICAgICAg ICAgcmV0dXJuIHNwZWNpYWxGYXN0Q2FzZUNvdW50ID49IE9wdGlvbnM6OmNvdWxkVGFrZVNsb3dD YXNlTWluaW11bUNvdW50KCk7CiAgICAgfQogCkBAIC00NjAsMjEgKzQ1OSwxMSBAQCBwdWJsaWM6 CiAgICAgICAgIGlmICghaGFzQmFzZWxpbmVKSVRQcm9maWxpbmcoKSkKICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgdW5zaWduZWQgc2xvd0Nhc2VDb3VudCA9IHJhcmVDYXNlUHJv ZmlsZUNvdW50Rm9yQnl0ZWNvZGVPZmZzZXQoYnl0ZWNvZGVPZmZzZXQpOwotICAgICAgICB1bnNp Z25lZCBzcGVjaWFsRmFzdENhc2VDb3VudCA9IHNwZWNpYWxGYXN0Q2FzZVByb2ZpbGVGb3JCeXRl Y29kZU9mZnNldChieXRlY29kZU9mZnNldCktPm1fY291bnRlcjsKKyAgICAgICAgdW5zaWduZWQg c3BlY2lhbEZhc3RDYXNlQ291bnQgPSBzcGVjaWFsRmFzdENhc2VQcm9maWxlQ291bnRGb3JCeXRl Y29kZU9mZnNldChieXRlY29kZU9mZnNldCk7CiAgICAgICAgIHVuc2lnbmVkIHZhbHVlID0gc2xv d0Nhc2VDb3VudCAtIHNwZWNpYWxGYXN0Q2FzZUNvdW50OwogICAgICAgICByZXR1cm4gdmFsdWUg Pj0gT3B0aW9uczo6bGlrZWx5VG9UYWtlU2xvd0Nhc2VNaW5pbXVtQ291bnQoKTsKICAgICB9CiAK LSAgICBib29sIGxpa2VseVRvVGFrZUFueVNsb3dDYXNlKGludCBieXRlY29kZU9mZnNldCkKLSAg ICB7Ci0gICAgICAgIGlmICghaGFzQmFzZWxpbmVKSVRQcm9maWxpbmcoKSkKLSAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAgICAgdW5zaWduZWQgc2xvd0Nhc2VDb3VudCA9IHJhcmVDYXNl UHJvZmlsZUNvdW50Rm9yQnl0ZWNvZGVPZmZzZXQoYnl0ZWNvZGVPZmZzZXQpOwotICAgICAgICB1 bnNpZ25lZCBzcGVjaWFsRmFzdENhc2VDb3VudCA9IHNwZWNpYWxGYXN0Q2FzZVByb2ZpbGVGb3JC eXRlY29kZU9mZnNldChieXRlY29kZU9mZnNldCktPm1fY291bnRlcjsKLSAgICAgICAgdW5zaWdu ZWQgdmFsdWUgPSBzbG93Q2FzZUNvdW50ICsgc3BlY2lhbEZhc3RDYXNlQ291bnQ7Ci0gICAgICAg IHJldHVybiB2YWx1ZSA+PSBPcHRpb25zOjpsaWtlbHlUb1Rha2VTbG93Q2FzZU1pbmltdW1Db3Vu dCgpOwotICAgIH0KLQogICAgIHVuc2lnbmVkIG51bWJlck9mQXJyYXlQcm9maWxlcygpIGNvbnN0 IHsgcmV0dXJuIG1fYXJyYXlQcm9maWxlcy5zaXplKCk7IH0KICAgICBjb25zdCBBcnJheVByb2Zp bGVWZWN0b3ImIGFycmF5UHJvZmlsZXMoKSB7IHJldHVybiBtX2FycmF5UHJvZmlsZXM7IH0KICAg ICBBcnJheVByb2ZpbGUqIGFkZEFycmF5UHJvZmlsZSh1bnNpZ25lZCBieXRlY29kZU9mZnNldCkK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUQXJpdGhtZXRpYy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRBcml0aG1ldGljLmNwcAkocmV2 aXNpb24gMTkwMzY2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRBcml0aG1ldGlj LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjY2LDcgKzY2Niw2IEBAIHZvaWQgSklUOjpjb21waWxl QmluYXJ5QXJpdGhPcChPcGNvZGVJRCAKICAgICBlbWl0R2V0VmlydHVhbFJlZ2lzdGVycyhvcDEs IHJlZ1QwLCBvcDIsIHJlZ1QxKTsKICAgICBlbWl0SnVtcFNsb3dDYXNlSWZOb3RJbnQocmVnVDAp OwogICAgIGVtaXRKdW1wU2xvd0Nhc2VJZk5vdEludChyZWdUMSk7Ci0gICAgUmFyZUNhc2VQcm9m aWxlKiBwcm9maWxlID0gbV9jb2RlQmxvY2stPmFkZFNwZWNpYWxGYXN0Q2FzZVByb2ZpbGUobV9i eXRlY29kZU9mZnNldCk7CiAgICAgaWYgKG9wY29kZUlEID09IG9wX2FkZCkKICAgICAgICAgYWRk U2xvd0Nhc2UoYnJhbmNoQWRkMzIoT3ZlcmZsb3csIHJlZ1QxLCByZWdUMCkpOwogICAgIGVsc2Ug aWYgKG9wY29kZUlEID09IG9wX3N1YikKQEAgLTY4OCw3ICs2ODcsNyBAQCB2b2lkIEpJVDo6Y29t cGlsZUJpbmFyeUFyaXRoT3AoT3Bjb2RlSUQgCiAgICAgICAgICAgICAvLyBXZSBvbmx5IGdldCBo ZXJlIGlmIHdlIGhhdmUgYSBnZW51aW5lIG5lZ2F0aXZlIHplcm8uIFJlY29yZCB0aGlzLAogICAg ICAgICAgICAgLy8gc28gdGhhdCB0aGUgc3BlY3VsYXRpdmUgSklUIGtub3dzIHRoYXQgd2UgZmFp bGVkIHNwZWN1bGF0aW9uCiAgICAgICAgICAgICAvLyBiZWNhdXNlIG9mIGEgbmVnYXRpdmUgemVy by4KLSAgICAgICAgICAgIGFkZDMyKFRydXN0ZWRJbW0zMigxKSwgQWJzb2x1dGVBZGRyZXNzKCZw cm9maWxlLT5tX2NvdW50ZXIpKTsKKyAgICAgICAgICAgIGFkZDMyKFRydXN0ZWRJbW0zMigxKSwg QWJzb2x1dGVBZGRyZXNzKCZtX2NvZGVCbG9jay0+YWRkU3BlY2lhbEZhc3RDYXNlUHJvZmlsZSht X2J5dGVjb2RlT2Zmc2V0KS0+bV9jb3VudGVyKSk7CiAgICAgICAgICAgICBhZGRTbG93Q2FzZShq dW1wKCkpOwogICAgICAgICAgICAgZG9uZS5saW5rKHRoaXMpOwogICAgICAgICAgICAgbW92ZShy ZWdUMiwgcmVnVDApOwpAQCAtODM2LDE1ICs4MzUsMTEgQEAgdm9pZCBKSVQ6OmVtaXRfb3BfbXVs KEluc3RydWN0aW9uKiBjdXJyZQogICAgIC8vIEZvciBub3csIG9ubHkgcGxhbnQgYSBmYXN0IGlu dCBjYXNlIGlmIHRoZSBjb25zdGFudCBvcGVyYW5kIGlzIGdyZWF0ZXIgdGhhbiB6ZXJvLgogICAg IGludDMyX3QgdmFsdWU7CiAgICAgaWYgKGlzT3BlcmFuZENvbnN0YW50SW50KG9wMSkgJiYgKCh2 YWx1ZSA9IGdldE9wZXJhbmRDb25zdGFudEludChvcDEpKSA+IDApKSB7Ci0gICAgICAgIC8vIEFk ZCBhIHNwZWNpYWwgZmFzdCBjYXNlIHByb2ZpbGUgYmVjYXVzZSB0aGUgREZHIEpJVCB3aWxsIGV4 cGVjdCBvbmUuCi0gICAgICAgIG1fY29kZUJsb2NrLT5hZGRTcGVjaWFsRmFzdENhc2VQcm9maWxl KG1fYnl0ZWNvZGVPZmZzZXQpOwogICAgICAgICBlbWl0R2V0VmlydHVhbFJlZ2lzdGVyKG9wMiwg cmVnVDApOwogICAgICAgICBlbWl0SnVtcFNsb3dDYXNlSWZOb3RJbnQocmVnVDApOwogICAgICAg ICBhZGRTbG93Q2FzZShicmFuY2hNdWwzMihPdmVyZmxvdywgSW1tMzIodmFsdWUpLCByZWdUMCwg cmVnVDEpKTsKICAgICAgICAgZW1pdFRhZ0ludChyZWdUMSwgcmVnVDApOwogICAgIH0gZWxzZSBp ZiAoaXNPcGVyYW5kQ29uc3RhbnRJbnQob3AyKSAmJiAoKHZhbHVlID0gZ2V0T3BlcmFuZENvbnN0 YW50SW50KG9wMikpID4gMCkpIHsKLSAgICAgICAgLy8gQWRkIGEgc3BlY2lhbCBmYXN0IGNhc2Ug cHJvZmlsZSBiZWNhdXNlIHRoZSBERkcgSklUIHdpbGwgZXhwZWN0IG9uZS4KLSAgICAgICAgbV9j b2RlQmxvY2stPmFkZFNwZWNpYWxGYXN0Q2FzZVByb2ZpbGUobV9ieXRlY29kZU9mZnNldCk7CiAg ICAgICAgIGVtaXRHZXRWaXJ0dWFsUmVnaXN0ZXIob3AxLCByZWdUMCk7CiAgICAgICAgIGVtaXRK dW1wU2xvd0Nhc2VJZk5vdEludChyZWdUMCk7CiAgICAgICAgIGFkZFNsb3dDYXNlKGJyYW5jaE11 bDMyKE92ZXJmbG93LCBJbW0zMih2YWx1ZSksIHJlZ1QwLCByZWdUMSkpOwo=