102630 2012-11-18 18:23:16 -0800 JSC should have more logging in structure-related code 2012-11-18 18:59:35 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 770262 0 fpizlo 2012-11-18 18:23:16 -0800 Patch forthcoming. 770265 1 174875 fpizlo 2012-11-18 18:29:13 -0800 Created attachment 174875 the patch 770268 2 174875 simon.fraser 2012-11-18 18:34:57 -0800 Comment on attachment 174875 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=174875&action=review > Source/JavaScriptCore/bytecode/CodeBlock.cpp:2202 > + JSCell* origin = m_dfgData->transitions[i].m_codeOrigin.get(); > + JSCell* from = m_dfgData->transitions[i].m_from.get(); > + JSCell* to = m_dfgData->transitions[i].m_to.get(); You could use a local reference to m_dfgData->transitions[i] to avoid getting it thrice. 770269 3 fpizlo 2012-11-18 18:52:50 -0800 (In reply to comment #2) > (From update of attachment 174875 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=174875&action=review > > > Source/JavaScriptCore/bytecode/CodeBlock.cpp:2202 > > + JSCell* origin = m_dfgData->transitions[i].m_codeOrigin.get(); > > + JSCell* from = m_dfgData->transitions[i].m_from.get(); > > + JSCell* to = m_dfgData->transitions[i].m_to.get(); > > You could use a local reference to m_dfgData->transitions[i] to avoid getting it thrice. Good point, that would be clearer. THanks! 770270 4 174875 buildbot 2012-11-18 18:56:25 -0800 Comment on attachment 174875 the patch Attachment 174875 did not pass win-ews (win): Output: http://queues.webkit.org/results/14907014 770273 5 fpizlo 2012-11-18 18:58:27 -0800 Landed in http://trac.webkit.org/changeset/135097 770274 6 fpizlo 2012-11-18 18:59:35 -0800 Windows build fix landed in http://trac.webkit.org/changeset/135099 174875 2012-11-18 18:29:13 -0800 2012-11-18 18:56:25 -0800 the patch logging.patch text/plain 7274 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTM1MDk2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDEyLTExLTE4ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg SlNDIHNob3VsZCBoYXZlIG1vcmUgbG9nZ2luZyBpbiBzdHJ1Y3R1cmUtcmVsYXRlZCBjb2RlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI2MzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIEpTVmFsdWU6 OmRlc2NyaXB0aW9uKCkgbm93IHRlbGxzIHlvdSBpZiBzb21ldGhpbmcgaXMgYSBzdHJ1Y3R1cmUs IGFuZCBpZiBzbywKKyAgICAgICAgICB3aGF0IGtpbmQgb2Ygc3RydWN0dXJlIGl0IGlzLgorICAg ICAgICAKKyAgICAgICAgLSBKZXR0aXNvbmluZyBsb2dpYyBub3cgdGVsbHMgeW91IHdoeSB0aGlu Z3MgYXJlIGJlaW5nIGpldHRpc29uZWQuCisgICAgICAgIAorICAgICAgICAtIEl0J3Mgbm93IHBv c3NpYmxlIHRvIHR1cm4gb2ZmIEdDLXRyaWdnZXJlZCBqZXR0aXNvbmluZyBlbnRpcmVseS4KKwor ICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVCbG9j azo6ZmluYWxpemVVbmNvbmRpdGlvbmFsbHkpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OnJl b3B0aW1pemUpOgorICAgICAgICAoSlNDOjpQcm9ncmFtQ29kZUJsb2NrOjpqZXR0aXNvbik6Cisg ICAgICAgIChKU0M6OkV2YWxDb2RlQmxvY2s6OmpldHRpc29uKToKKyAgICAgICAgKEpTQzo6RnVu Y3Rpb25Db2RlQmxvY2s6OmpldHRpc29uKToKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2su aDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpzaG91bGRJbW1lZGlhdGVseUFzc3VtZUxpdmVu ZXNzRHVyaW5nU2Nhbik6CisgICAgICAgICogcnVudGltZS9KU1ZhbHVlLmNwcDoKKyAgICAgICAg KEpTQzo6SlNWYWx1ZTo6ZGVzY3JpcHRpb24pOgorICAgICAgICAqIHJ1bnRpbWUvT3B0aW9ucy5o OgorICAgICAgICAoSlNDKToKKwogMjAxMi0xMS0xOCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBw bGUuY29tPgogCiAgICAgICAgIERGRyBjb25zdGFudCBmb2xkaW5nIHBoYXNlIHNob3VsZCBzYXkg J2NoYW5nZWQgPSB0cnVlJyB3aGVuZXZlciBpdCBjaGFuZ2VzIHRoZSBncmFwaApJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDEz NTA0MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAKICNpbmNsdWRlICJCeXRlY29kZUdlbmVy YXRvci5oIgogI2luY2x1ZGUgIkRGR0NhcGFiaWxpdGllcy5oIgorI2luY2x1ZGUgIkRGR0NvbW1v bi5oIgogI2luY2x1ZGUgIkRGR05vZGUuaCIKICNpbmNsdWRlICJERkdSZXBhdGNoLmgiCiAjaW5j bHVkZSAiRGVidWdnZXIuaCIKQEAgLTIxOTMsNiArMjE5NCwyNiBAQCB2b2lkIENvZGVCbG9jazo6 ZmluYWxpemVVbmNvbmRpdGlvbmFsbHkoCiAgICAgICAgIC8vIG9wdGltaXppbmcuCiAgICAgICAg IGFsdGVybmF0aXZlKCktPm9wdGltaXplQWZ0ZXJXYXJtVXAoKTsKICAgICAgICAgCisgICAgICAg IGlmIChERkc6OnNob3VsZFNob3dEaXNhc3NlbWJseSgpKSB7CisgICAgICAgICAgICBkYXRhTG9n KCJERkcgQ29kZUJsb2NrICVwIHdpbGwgYmUgamV0dGlzb25lZCBiZWNhdXNlIG9mIHRoZSBmb2xs b3dpbmcgZGVhZCByZWZlcmVuY2VzOlxuIiwgdGhpcyk7CisgICAgICAgICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgbV9kZmdEYXRhLT50cmFuc2l0aW9ucy5zaXplKCk7ICsraSkgeworICAg ICAgICAgICAgICAgIEpTQ2VsbCogb3JpZ2luID0gbV9kZmdEYXRhLT50cmFuc2l0aW9uc1tpXS5t X2NvZGVPcmlnaW4uZ2V0KCk7CisgICAgICAgICAgICAgICAgSlNDZWxsKiBmcm9tID0gbV9kZmdE YXRhLT50cmFuc2l0aW9uc1tpXS5tX2Zyb20uZ2V0KCk7CisgICAgICAgICAgICAgICAgSlNDZWxs KiB0byA9IG1fZGZnRGF0YS0+dHJhbnNpdGlvbnNbaV0ubV90by5nZXQoKTsKKyAgICAgICAgICAg ICAgICBpZiAoKCFvcmlnaW4gfHwgSGVhcDo6aXNNYXJrZWQob3JpZ2luKSkgJiYgSGVhcDo6aXNN YXJrZWQoZnJvbSkpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAg ICAgIGRhdGFMb2coIiAgICBUcmFuc2l0aW9uIHVuZGVyICVzLCAiLCBKU1ZhbHVlKG9yaWdpbiku ZGVzY3JpcHRpb24oKSk7CisgICAgICAgICAgICAgICAgZGF0YUxvZygiJXMgLT4gIiwgSlNWYWx1 ZShmcm9tKS5kZXNjcmlwdGlvbigpKTsKKyAgICAgICAgICAgICAgICBkYXRhTG9nKCIlcy5cbiIs IEpTVmFsdWUodG8pLmRlc2NyaXB0aW9uKCkpOworICAgICAgICAgICAgfQorICAgICAgICAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fZGZnRGF0YS0+d2Vha1JlZmVyZW5jZXMuc2l6ZSgp OyArK2kpIHsKKyAgICAgICAgICAgICAgICBKU0NlbGwqIHdlYWsgPSBtX2RmZ0RhdGEtPndlYWtS ZWZlcmVuY2VzW2ldLmdldCgpOworICAgICAgICAgICAgICAgIGlmIChIZWFwOjppc01hcmtlZCh3 ZWFrKSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgZGF0 YUxvZygiICAgIFdlYWsgcmVmZXJlbmNlICVzLlxuIiwgSlNWYWx1ZSh3ZWFrKS5kZXNjcmlwdGlv bigpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICAKICAgICAgICAgamV0dGlz b24oKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTI2NjgsNiArMjY4OSw4IEBAIHZvaWQg Q29kZUJsb2NrOjpyZW9wdGltaXplKCkKICAgICBBU1NFUlQocmVwbGFjZW1lbnQoKSAhPSB0aGlz KTsKICAgICBBU1NFUlQocmVwbGFjZW1lbnQoKS0+YWx0ZXJuYXRpdmUoKSA9PSB0aGlzKTsKICAg ICByZXBsYWNlbWVudCgpLT50YWxseUZyZXF1ZW50RXhpdFNpdGVzKCk7CisgICAgaWYgKERGRzo6 c2hvdWxkU2hvd0Rpc2Fzc2VtYmx5KCkpCisgICAgICAgIGRhdGFMb2coIkRGRyBDb2RlQmxvY2sg JXAgd2lsbCBiZSBqZXR0aXNvbmVkIGR1ZSB0byByZW9wdGltaXphdGlvbiBvZiAlcC5cbiIsIHJl cGxhY2VtZW50KCksIHRoaXMpOwogICAgIHJlcGxhY2VtZW50KCktPmpldHRpc29uKCk7CiAgICAg Y291bnRSZW9wdGltaXphdGlvbigpOwogICAgIG9wdGltaXplQWZ0ZXJXYXJtVXAoKTsKQEAgLTI3 MzMsNiArMjc1Niw4IEBAIHZvaWQgUHJvZ3JhbUNvZGVCbG9jazo6amV0dGlzb24oKQogewogICAg IEFTU0VSVChKSVRDb2RlOjppc09wdGltaXppbmdKSVQoZ2V0SklUVHlwZSgpKSk7CiAgICAgQVNT RVJUKHRoaXMgPT0gcmVwbGFjZW1lbnQoKSk7CisgICAgaWYgKERGRzo6c2hvdWxkU2hvd0Rpc2Fz c2VtYmx5KCkpCisgICAgICAgIGRhdGFMb2coIkpldHRpc29uaW5nIERGRyBDb2RlQmxvY2sgJXAu XG4iLCB0aGlzKTsKICAgICBzdGF0aWNfY2FzdDxQcm9ncmFtRXhlY3V0YWJsZSo+KG93bmVyRXhl Y3V0YWJsZSgpKS0+amV0dGlzb25PcHRpbWl6ZWRDb2RlKCpnbG9iYWxEYXRhKCkpOwogfQogCkBA IC0yNzQwLDYgKzI3NjUsOCBAQCB2b2lkIEV2YWxDb2RlQmxvY2s6OmpldHRpc29uKCkKIHsKICAg ICBBU1NFUlQoSklUQ29kZTo6aXNPcHRpbWl6aW5nSklUKGdldEpJVFR5cGUoKSkpOwogICAgIEFT U0VSVCh0aGlzID09IHJlcGxhY2VtZW50KCkpOworICAgIGlmIChERkc6OnNob3VsZFNob3dEaXNh c3NlbWJseSgpKQorICAgICAgICBkYXRhTG9nKCJKZXR0aXNvbmluZyBERkcgQ29kZUJsb2NrICVw LlxuIiwgdGhpcyk7CiAgICAgc3RhdGljX2Nhc3Q8RXZhbEV4ZWN1dGFibGUqPihvd25lckV4ZWN1 dGFibGUoKSktPmpldHRpc29uT3B0aW1pemVkQ29kZSgqZ2xvYmFsRGF0YSgpKTsKIH0KIApAQCAt Mjc0Nyw2ICsyNzc0LDggQEAgdm9pZCBGdW5jdGlvbkNvZGVCbG9jazo6amV0dGlzb24oKQogewog ICAgIEFTU0VSVChKSVRDb2RlOjppc09wdGltaXppbmdKSVQoZ2V0SklUVHlwZSgpKSk7CiAgICAg QVNTRVJUKHRoaXMgPT0gcmVwbGFjZW1lbnQoKSk7CisgICAgaWYgKERGRzo6c2hvdWxkU2hvd0Rp c2Fzc2VtYmx5KCkpCisgICAgICAgIGRhdGFMb2coIkpldHRpc29uaW5nIERGRyBDb2RlQmxvY2sg JXAuXG4iLCB0aGlzKTsKICAgICBzdGF0aWNfY2FzdDxGdW5jdGlvbkV4ZWN1dGFibGUqPihvd25l ckV4ZWN1dGFibGUoKSktPmpldHRpc29uT3B0aW1pemVkQ29kZUZvcigqZ2xvYmFsRGF0YSgpLCBt X2lzQ29uc3RydWN0b3IgPyBDb2RlRm9yQ29uc3RydWN0IDogQ29kZUZvckNhbGwpOwogfQogCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCShyZXZpc2lv biAxMzUwNDEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmgJ KHdvcmtpbmcgY29weSkKQEAgLTEyMzksNiArMTIzOSw5IEBAIG5hbWVzcGFjZSBKU0MgewogICAg ICAgICAgICAgLy8gYWxsb3cgdGhlbSB0byBjb250aW51ZSB0byBleGVjdXRlIHNvdW5kbHkuCiAg ICAgICAgICAgICBpZiAobV9kZmdEYXRhLT5tYXlCZUV4ZWN1dGluZykKICAgICAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgaWYgKE9wdGlvbnM6OmZv cmNlREZHQ29kZUJsb2NrTGl2ZW5lc3MoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK IAogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU1ZhbHVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU1ZhbHVlLmNwcAkocmV2aXNpb24gMTM1MDQxKQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNWYWx1ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIxNCwxMCArMjE0LDE4IEBAIGNoYXIqIEpTVmFsdWU6OmRlc2NyaXB0aW9uKCkgY29uc3QKICAg ICAgICAgc25wcmludGYoZGVzY3JpcHRpb24sIHNpemUsICJEb3VibGU6ICUwOHg6JTA4eCwgJWxm IiwgdS5hc1R3b0ludDMyc1sxXSwgdS5hc1R3b0ludDMyc1swXSwgYXNEb3VibGUoKSk7CiAjZW5k aWYKICAgICB9IGVsc2UgaWYgKGlzQ2VsbCgpKSB7Ci0gICAgICAgIHNucHJpbnRmKAotICAgICAg ICAgICAgZGVzY3JpcHRpb24sIHNpemUsICJDZWxsOiAlcCAtPiAlcCAoJXA6ICVzLCAlcykiLAot ICAgICAgICAgICAgYXNDZWxsKCksIGlzT2JqZWN0KCkgPyBhc09iamVjdCgqdGhpcyktPmJ1dHRl cmZseSgpIDogMCwgYXNDZWxsKCktPnN0cnVjdHVyZSgpLCBhc0NlbGwoKS0+c3RydWN0dXJlKCkt PmNsYXNzSW5mbygpLT5jbGFzc05hbWUsCi0gICAgICAgICAgICBpbmRleGluZ1R5cGVUb1N0cmlu Zyhhc0NlbGwoKS0+c3RydWN0dXJlKCktPmluZGV4aW5nVHlwZUluY2x1ZGluZ0hpc3RvcnkoKSkp OworICAgICAgICBpZiAoYXNDZWxsKCktPmluaGVyaXRzKCZTdHJ1Y3R1cmU6OnNfaW5mbykpIHsK KyAgICAgICAgICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0ganNDYXN0PFN0cnVjdHVyZSo+KGFz Q2VsbCgpKTsKKyAgICAgICAgICAgIHNucHJpbnRmKAorICAgICAgICAgICAgICAgIGRlc2NyaXB0 aW9uLCBzaXplLCAiU3RydWN0dXJlOiAlcDogJXMsICVzIiwKKyAgICAgICAgICAgICAgICBzdHJ1 Y3R1cmUsIHN0cnVjdHVyZS0+Y2xhc3NJbmZvKCktPmNsYXNzTmFtZSwKKyAgICAgICAgICAgICAg ICBpbmRleGluZ1R5cGVUb1N0cmluZyhzdHJ1Y3R1cmUtPmluZGV4aW5nVHlwZUluY2x1ZGluZ0hp c3RvcnkoKSkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgc25wcmludGYoCisgICAg ICAgICAgICAgICAgZGVzY3JpcHRpb24sIHNpemUsICJDZWxsOiAlcCAtPiAlcCAoJXA6ICVzLCAl cykiLAorICAgICAgICAgICAgICAgIGFzQ2VsbCgpLCBpc09iamVjdCgpID8gYXNPYmplY3QoKnRo aXMpLT5idXR0ZXJmbHkoKSA6IDAsIGFzQ2VsbCgpLT5zdHJ1Y3R1cmUoKSwgYXNDZWxsKCktPnN0 cnVjdHVyZSgpLT5jbGFzc0luZm8oKS0+Y2xhc3NOYW1lLAorICAgICAgICAgICAgICAgIGluZGV4 aW5nVHlwZVRvU3RyaW5nKGFzQ2VsbCgpLT5zdHJ1Y3R1cmUoKS0+aW5kZXhpbmdUeXBlSW5jbHVk aW5nSGlzdG9yeSgpKSk7CisgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKGlzVHJ1ZSgpKQogICAg ICAgICBzbnByaW50ZihkZXNjcmlwdGlvbiwgc2l6ZSwgIlRydWUiKTsKICAgICBlbHNlIGlmIChp c0ZhbHNlKCkpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCShy ZXZpc2lvbiAxMzUwNDEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25z LmgJKHdvcmtpbmcgY29weSkKQEAgLTY2LDYgKzY2LDggQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAg dihib29sLCB1c2VERkdKSVQsIHRydWUpIFwKICAgICB2KGJvb2wsIHVzZVJlZ0V4cEpJVCwgdHJ1 ZSkgXAogICAgIFwKKyAgICB2KGJvb2wsIGZvcmNlREZHQ29kZUJsb2NrTGl2ZW5lc3MsIGZhbHNl KSBcCisgICAgXAogICAgIC8qIHNob3dEaXNhc3NlbWJseSBpbXBsaWVzIHNob3dERkdEaXNhc3Nl bWJseS4gKi8gXAogICAgIHYoYm9vbCwgc2hvd0Rpc2Fzc2VtYmx5LCBmYWxzZSkgXAogICAgIHYo Ym9vbCwgc2hvd0RGR0Rpc2Fzc2VtYmx5LCBmYWxzZSkgXAo=