129435 2014-02-27 09:42:01 -0800 Octane/closure thrashes between flattening dictionaries during global object initialization in a global eval 2014-03-04 13:22:41 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All REOPENED P2 Normal --- 129490 129699 1 fpizlo fpizlo barraclough commit-queue ggaren mark.lam mhahnenberg mmirman msaboff nrotem oliver ossy sam oldest_to_newest 985214 0 fpizlo 2014-02-27 09:42:01 -0800 If the global object is already a dictionary even before we start adding things, then we should leave it that way. 985219 1 225386 fpizlo 2014-02-27 09:44:17 -0800 Created attachment 225386 the patch 985236 2 fpizlo 2014-02-27 10:29:08 -0800 Landed in http://trac.webkit.org/changeset/164812 985581 3 ossy 2014-02-28 08:59:46 -0800 (In reply to comment #2) > Landed in http://trac.webkit.org/changeset/164812 It caused regression on 32 bit platforms, see https://bugs.webkit.org/show_bug.cgi?id=129490 for details. 986943 4 commit-queue 2014-03-04 13:22:41 -0800 Re-opened since this is blocked by bug 129699 225386 2014-02-27 09:44:17 -0800 2014-02-27 09:46:41 -0800 the patch blah.patch text/plain 6032 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY0ODA2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDE0LTAyLTI3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg T2N0YW5lL2Nsb3N1cmUgdGhyYXNoZXMgYmV0d2VlbiBmbGF0dGVuaW5nIGRpY3Rpb25hcmllcyBk dXJpbmcgZ2xvYmFsIG9iamVjdCBpbml0aWFsaXphdGlvbiBpbiBhIGdsb2JhbCBldmFsCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk0MzUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRoaXMg aXMgYSA1LTEwJSBzcGVlZC11cCBvbiBPY3RhbmUvY2xvc3VyZS4KKworICAgICAgICAqIGludGVy cHJldGVyL0ludGVycHJldGVyLmNwcDoKKyAgICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OmV4ZWN1 dGUpOgorICAgICAgICAqIGpzYy5jcHA6CisgICAgICAgIChHbG9iYWxPYmplY3Q6OmZpbmlzaENy ZWF0aW9uKToKKyAgICAgICAgKGZ1bmN0aW9uQ2xlYXJDb2RlQ2FjaGUpOgorICAgICAgICAqIHJ1 bnRpbWUvQmF0Y2hlZFRyYW5zaXRpb25PcHRpbWl6ZXIuaDoKKyAgICAgICAgKEpTQzo6QmF0Y2hl ZFRyYW5zaXRpb25PcHRpbWl6ZXI6OkJhdGNoZWRUcmFuc2l0aW9uT3B0aW1pemVyKToKKyAgICAg ICAgKEpTQzo6QmF0Y2hlZFRyYW5zaXRpb25PcHRpbWl6ZXI6On5CYXRjaGVkVHJhbnNpdGlvbk9w dGltaXplcik6CisKIDIwMTQtMDItMjcgIEdhYm9yIFJhcGNzYW55aSAgPHJnYWJvckB3ZWJraXQu b3JnPgogCiAgICAgICAgIHIxNjQ3NjQgYnJva2UgdGhlIEFSTSBidWlsZApJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2pzYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2pzYy5jcHAJKHJldmlzaW9uIDE2NDc3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9q c2MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBACiAjaW5jbHVkZSAiQVBJU2hp bXMuaCIKICNpbmNsdWRlICJCdXR0ZXJmbHlJbmxpbmVzLmgiCiAjaW5jbHVkZSAiQnl0ZWNvZGVH ZW5lcmF0b3IuaCIKKyNpbmNsdWRlICJDb2RlQ2FjaGUuaCIKICNpbmNsdWRlICJDb21wbGV0aW9u LmgiCiAjaW5jbHVkZSAiQ29waWVkU3BhY2VJbmxpbmVzLmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9u SGVscGVycy5oIgpAQCAtMjM5LDYgKzI0MCw3IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0Nf SE9TVF9DQUxMIGZ1bmMKIHN0YXRpYyBOT19SRVRVUk5fV0lUSF9WQUxVRSBFbmNvZGVkSlNWYWx1 ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uUXVpdChFeGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVk SlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uRmFsc2UoRXhlY1N0YXRlKik7CiBzdGF0aWMg RW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jdGlvbkVmZmVjdGZ1bDQyKEV4ZWNTdGF0 ZSopOworc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25DbGVhckNv ZGVDYWNoZShFeGVjU3RhdGUqKTsKIAogI2lmIEVOQUJMRShTQU1QTElOR19GTEFHUykKIHN0YXRp YyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uU2V0U2FtcGxpbmdGbGFncyhF eGVjU3RhdGUqKTsKQEAgLTM3NSw2ICszNzcsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIHB1dERp cmVjdE5hdGl2ZUZ1bmN0aW9uKHZtLCB0aGlzLCBJZGVudGlmaWVyKCZ2bSwgIkRGR1RydWUiKSwg MCwgZnVuY3Rpb25GYWxzZSwgREZHVHJ1ZSwgRG9udEVudW0gfCBKU0M6OkZ1bmN0aW9uKTsKICAg ICAgICAgCiAgICAgICAgIGFkZEZ1bmN0aW9uKHZtLCAiZWZmZWN0ZnVsNDIiLCBmdW5jdGlvbkVm ZmVjdGZ1bDQyLCAwKTsKKyAgICAgICAgYWRkRnVuY3Rpb24odm0sICJjbGVhckNvZGVDYWNoZSIs IGZ1bmN0aW9uQ2xlYXJDb2RlQ2FjaGUsIDApOwogICAgICAgICAKICAgICAgICAgSlNBcnJheSog YXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5KGdsb2JhbEV4ZWMoKSwgMCk7CiAgICAgICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgYXJndW1lbnRzLnNpemUoKTsgKytpKQpAQCAtNzM1LDYgKzcz OCwxMyBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uRWZmCiAgICAgcmV0 dXJuIEpTVmFsdWU6OmVuY29kZShqc051bWJlcig0MikpOwogfQogCitFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIGZ1bmN0aW9uQ2xlYXJDb2RlQ2FjaGUoRXhlY1N0YXRlKiBleGVjKQorewor ICAgIGlmIChDb2RlQ2FjaGUqIGNhY2hlID0gZXhlYy0+dm0oKS5jb2RlQ2FjaGUoKSkKKyAgICAg ICAgY2FjaGUtPmNsZWFyKCk7CisgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5l ZCgpKTsKK30KKwogLy8gVXNlIFNFSCBmb3IgUmVsZWFzZSBidWlsZHMgb25seSB0byBnZXQgcmlk IG9mIHRoZSBjcmFzaCByZXBvcnQgZGlhbG9nCiAvLyAobHVja2lseSB0aGUgc2FtZSB0ZXN0cyBm YWlsIGluIFJlbGVhc2UgYW5kIERlYnVnIGJ1aWxkcyBzbyBmYXIpLiBOZWVkIHRvCiAvLyBiZSBp biBhIHNlcGFyYXRlIG1haW4gZnVuY3Rpb24gYmVjYXVzZSB0aGUganNjbWFpbiBmdW5jdGlvbiBy ZXF1aXJlcyBvYmplY3QKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9J bnRlcnByZXRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVy cHJldGVyL0ludGVycHJldGVyLmNwcAkocmV2aXNpb24gMTY0NzcxKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTE0NywxOCArMTE0NywyNiBAQCBKU1ZhbHVlIEludGVycHJldGVyOjpleGVjdXRlKEV2YWxFeGVj dXRhCiAgICAgICAgIGlmICh2YXJpYWJsZU9iamVjdC0+bmV4dCgpKQogICAgICAgICAgICAgdmFy aWFibGVPYmplY3QtPmdsb2JhbE9iamVjdCgpLT52YXJJbmplY3Rpb25XYXRjaHBvaW50KCktPmZp cmVBbGwoKTsKIAotICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbnVtVmFyaWFibGVz OyArK2kpIHsKLSAgICAgICAgICAgIGNvbnN0IElkZW50aWZpZXImIGlkZW50ID0gY29kZUJsb2Nr LT52YXJpYWJsZShpKTsKLSAgICAgICAgICAgIGlmICghdmFyaWFibGVPYmplY3QtPmhhc1Byb3Bl cnR5KGNhbGxGcmFtZSwgaWRlbnQpKSB7Ci0gICAgICAgICAgICAgICAgUHV0UHJvcGVydHlTbG90 IHNsb3QodmFyaWFibGVPYmplY3QpOwotICAgICAgICAgICAgICAgIHZhcmlhYmxlT2JqZWN0LT5t ZXRob2RUYWJsZSgpLT5wdXQodmFyaWFibGVPYmplY3QsIGNhbGxGcmFtZSwgaWRlbnQsIGpzVW5k ZWZpbmVkKCksIHNsb3QpOworICAgICAgICB7CisgICAgICAgICAgICBTYW1wbGluZ1JlZ2lvbiBz YW1wbGluZ1JlZ2lvbigidmFyaWFibGUgcHV0cyIpOworICAgICAgICAgICAgCisgICAgICAgICAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbnVtVmFyaWFibGVzOyArK2kpIHsKKyAgICAgICAg ICAgICAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVudCA9IGNvZGVCbG9jay0+dmFyaWFibGUoaSk7 CisgICAgICAgICAgICAgICAgaWYgKCF2YXJpYWJsZU9iamVjdC0+aGFzUHJvcGVydHkoY2FsbEZy YW1lLCBpZGVudCkpIHsKKyAgICAgICAgICAgICAgICAgICAgUHV0UHJvcGVydHlTbG90IHNsb3Qo dmFyaWFibGVPYmplY3QpOworICAgICAgICAgICAgICAgICAgICB2YXJpYWJsZU9iamVjdC0+bWV0 aG9kVGFibGUoKS0+cHV0KHZhcmlhYmxlT2JqZWN0LCBjYWxsRnJhbWUsIGlkZW50LCBqc1VuZGVm aW5lZCgpLCBzbG90KTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KIAotICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IG51bUZ1bmN0aW9uczsgKytpKSB7Ci0g ICAgICAgICAgICBGdW5jdGlvbkV4ZWN1dGFibGUqIGZ1bmN0aW9uID0gY29kZUJsb2NrLT5mdW5j dGlvbkRlY2woaSk7Ci0gICAgICAgICAgICBQdXRQcm9wZXJ0eVNsb3Qgc2xvdCh2YXJpYWJsZU9i amVjdCk7Ci0gICAgICAgICAgICB2YXJpYWJsZU9iamVjdC0+bWV0aG9kVGFibGUoKS0+cHV0KHZh cmlhYmxlT2JqZWN0LCBjYWxsRnJhbWUsIGZ1bmN0aW9uLT5uYW1lKCksIEpTRnVuY3Rpb246OmNy ZWF0ZSh2bSwgZnVuY3Rpb24sIHNjb3BlKSwgc2xvdCk7CisgICAgICAgIHsKKyAgICAgICAgICAg IFNhbXBsaW5nUmVnaW9uIHNhbXBsaW5nUmVnaW9uKCJmdW5jdGlvbiBwdXRzIik7CisgICAgICAg ICAgICAKKyAgICAgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbnVtRnVuY3Rpb25zOyArK2kp IHsKKyAgICAgICAgICAgICAgICBGdW5jdGlvbkV4ZWN1dGFibGUqIGZ1bmN0aW9uID0gY29kZUJs b2NrLT5mdW5jdGlvbkRlY2woaSk7CisgICAgICAgICAgICAgICAgUHV0UHJvcGVydHlTbG90IHNs b3QodmFyaWFibGVPYmplY3QpOworICAgICAgICAgICAgICAgIHZhcmlhYmxlT2JqZWN0LT5tZXRo b2RUYWJsZSgpLT5wdXQodmFyaWFibGVPYmplY3QsIGNhbGxGcmFtZSwgZnVuY3Rpb24tPm5hbWUo KSwgSlNGdW5jdGlvbjo6Y3JlYXRlKHZtLCBmdW5jdGlvbiwgc2NvcGUpLCBzbG90KTsKKyAgICAg ICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvQmF0Y2hlZFRyYW5zaXRpb25PcHRpbWl6ZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9CYXRjaGVkVHJhbnNpdGlvbk9wdGltaXplci5oCShy ZXZpc2lvbiAxNjQ3NzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9CYXRjaGVk VHJhbnNpdGlvbk9wdGltaXplci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNSBAQAotLy8g LSotIG1vZGU6IGMrKzsgYy1iYXNpYy1vZmZzZXQ6IDQgLSotCiAvKgotICogQ29weXJpZ2h0IChD KSAyMDA4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykg MjAwOCwgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTM2LDEzICszNSwxMyBAQCBjbGFzcyBCYXRjaGVkVHJhbnNp dGlvbk9wdGltaXplciB7CiBwdWJsaWM6CiAgICAgQmF0Y2hlZFRyYW5zaXRpb25PcHRpbWl6ZXIo Vk0mIHZtLCBKU09iamVjdCogb2JqZWN0KQogICAgICAgICA6IG1fdm0oJnZtKQotICAgICAgICAs IG1fb2JqZWN0KG9iamVjdCkKKyAgICAgICAgLCBtX29iamVjdChvYmplY3QtPnN0cnVjdHVyZSgp LT5pc0RpY3Rpb25hcnkoKSA/IG51bGxwdHIgOiBvYmplY3QpCiAgICAgewogICAgIH0KIAogICAg IH5CYXRjaGVkVHJhbnNpdGlvbk9wdGltaXplcigpCiAgICAgewotICAgICAgICBpZiAobV9vYmpl Y3QtPnN0cnVjdHVyZSgpLT5pc0RpY3Rpb25hcnkoKSkKKyAgICAgICAgaWYgKG1fb2JqZWN0ICYm IG1fb2JqZWN0LT5zdHJ1Y3R1cmUoKS0+aXNEaWN0aW9uYXJ5KCkpCiAgICAgICAgICAgICBtX29i amVjdC0+ZmxhdHRlbkRpY3Rpb25hcnlPYmplY3QoKm1fdm0pOwogICAgIH0KIAo=