115576 2013-05-03 15:38:07 -0700 There should be a runtime option to constrain what functions get DFG compiled 2013-05-04 00:54:53 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 msaboff msaboff commit-queue oldest_to_newest 884413 0 msaboff 2013-05-03 15:38:07 -0700 Often when debugging a problem in the DFG, one wants to constrain DFG compilation down to one function. Usually this can be done by checking the bytecode count of the code block by adding an if statement at the top of compile() in DFGDriver.cpp. This should be done through an runtime option. 884425 1 200504 msaboff 2013-05-03 15:58:38 -0700 Created attachment 200504 Patch 884426 2 commit-queue 2013-05-03 16:00:13 -0700 Attachment 200504 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source/JavaScriptCore/dfg/DFGDriver.cpp', u'Source/JavaScriptCore/runtime/Options.cpp', u'Source/JavaScriptCore/runtime/Options.h']" exit_code: 1 Source/JavaScriptCore/runtime/Options.h:220: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 884455 3 200504 mhahnenberg 2013-05-03 18:48:46 -0700 Comment on attachment 200504 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=200504&action=review r=me with comments. > Source/JavaScriptCore/runtime/Options.cpp:75 > +static bool parse(const char* string, optionRange& value) Does it work correctly if you use OptionRange& here instead of the typedef? I know there are some subtleties with how the macros automatically generate stuff, but I dislike how this looks. 884478 4 msaboff 2013-05-03 21:23:42 -0700 (In reply to comment #3) > (From update of attachment 200504 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=200504&action=review > > r=me with comments. > > > Source/JavaScriptCore/runtime/Options.cpp:75 > > +static bool parse(const char* string, optionRange& value) > > Does it work correctly if you use OptionRange& here instead of the typedef? I know there are some subtleties with how the macros automatically generate stuff, but I dislike how this looks. We can use OptionRange& here. The typedef was put in so the enum and union type work with the FOR_EACH_OPTION macros. 884496 5 200504 msaboff 2013-05-04 00:53:45 -0700 Comment on attachment 200504 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=200504&action=review >>> Source/JavaScriptCore/runtime/Options.cpp:75 >>> +static bool parse(const char* string, optionRange& value) >> >> Does it work correctly if you use OptionRange& here instead of the typedef? I know there are some subtleties with how the macros automatically generate stuff, but I dislike how this looks. > > We can use OptionRange& here. The typedef was put in so the enum and union type work with the FOR_EACH_OPTION macros. We can use OptionRange here. The typedef was put in for the enum and type within the union. 884498 6 msaboff 2013-05-04 00:54:30 -0700 Clearing flags on attachment: 200504 Committed r149552: <http://trac.webkit.org/changeset/149552> 884499 7 msaboff 2013-05-04 00:54:53 -0700 All reviewed patches have been landed. Closing bug. 200504 2013-05-03 15:58:38 -0700 2013-05-04 00:53:45 -0700 Patch 115576.patch text/plain 6909 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ5NTQyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDEzLTA1LTAzICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIFRoZXJlIHNob3VsZCBiZSBhIHJ1bnRpbWUgb3B0aW9uIHRvIGNvbnN0cmFpbiB3aGF0IGZ1 bmN0aW9ucyBnZXQgREZHIGNvbXBpbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTU1NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGRlZCBPcHRpb25SYW5nZSB0byBPcHRpb25zIHRvIGFsbG93IGNo ZWNraW5nIHRoYXQgc29tZXRoaW5nIGlzIHdpdGhpbiBhbiBvcHRpb24KKyAgICAgICAgb3Igbm90 LiAgVGhlIG5ldyBPcHRpb25DbGFzcyBzdXBwb3J0cyByYW5nZSBzdHJpbmdzIGluIHRoZSBmb3Jt IG9mIFshXTxsb3c+Wzo8aGlnaD5dLgorICAgICAgICBJZiBvbmx5IG9uZSB2YWx1ZSBpcyBnaXZl biwgdGhlbiBpdCB3aWxsIGJlIHVzZWQgZm9yIGJvdGggbG93IGFuZCBoaWdoLiAgQSBsZWFkaW5n CisgICAgICAgICchJyBpbnZlcnRzIHRoZSBjaGVjay4gIElmIG5vIHJhbmdlIGlzIGdpdmVuLCB0 aGVuIGNoZWNraW5nIGZvciBhIHZhbHVlIHdpdGhpbiBhIHJhbmdlCisgICAgICAgIHdpbGwgYWx3 YXlzIHJldHVybiB0cnVlLiAgQWRkZWQgdGhlIG9wdGlvbiAiYnl0ZWNvZGVSYW5nZVRvREZHQ29t cGlsZSIgdGhhdCB0YWtlcyBhbgorICAgICAgICBPcHRpb25SYW5nZSBzdHJpbmcgdG8gc2VsZWN0 IHRoZSBieXRlY29kZSByYW5nZSBvZiBjb2RlIGJsb2NrcyB0byBERkcgY29tcGlsZS4KKworICAg ICAgICAqIGRmZy9ERkdEcml2ZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6OmNvbXBpbGUpOiBB ZGRlZCBuZXcgY2hlY2sgZm9yIGJ5dGVjb2RlIGNvdW50IHdpdGhpbiBieXRlY29kZVJhbmdlVG9E RkdDb21waWxlCisgICAgICAgIHJhbmdlLgorICAgICAgICAqIHJ1bnRpbWUvT3B0aW9ucy5jcHA6 CisgICAgICAgIChKU0M6OnBhcnNlKTogQWRkZWQgb3ZlcmxvYWRlZCBwYXJzZSgpIGZvciBPcHRp b25SYW5nZS4KKyAgICAgICAgKEpTQzo6T3B0aW9uUmFuZ2U6OmluaXQpOiBQYXJzZSByYW5nZSBz dHJpbmcgYW5kIHRoZW4gaW5pdGlhbGl6ZSB0aGUgcmFuZ2UuCisgICAgICAgIChKU0M6Ok9wdGlv blJhbmdlOjppc0luUmFuZ2UpOiBGdW5jdGlvbiB1c2VkIGJ5IGNvbnN1bWVyIHRvIGNoZWNrIGlm IGEgdmFsdWUgaXMgd2l0aGluCisgICAgICAgIHRoZSBzcGVjaWZpZWQgcmFuZ2UuCisgICAgICAg IChKU0M6Ok9wdGlvbnM6OmR1bXBPcHRpb24pOiBBZGRlZCBjb2RlIHRvIGR1bXAgT3B0aW9uUmFu Z2Ugb3B0aW9ucy4KKyAgICAgICAgKiBydW50aW1lL09wdGlvbnMuaDoKKyAgICAgICAgKE9wdGlv blJhbmdlKTogTmV3IGNsYXNzLgorICAgICAgICAoSlNDOjpPcHRpb25SYW5nZTo6b3BlcmF0b3I9 ICk6IFRoaXMgaXMgcmVhbGx5IHVzZWQgYXMgYSBkZWZhdWx0IGN0b3IgZm9yIHVzZSB3aXRoaW4K KyAgICAgICAgdGhlIE9wdGlvbiBzdGF0aWMgYXJyYXkgaW5pdGlhbGl6YXRpb24uCisgICAgICAg IChKU0M6Ok9wdGlvblJhbmdlOjpyYW5nZVN0cmluZyk6IFRoaXMgaXMgdXNlZCBmb3IgZGVidWcu ICBJdCBhc3N1bWVzIHRoYXQgdGhlIGNoYXIqCisgICAgICAgIHBhc3NlZCBpbnRvIE9wdGlvblJh bmdlOjppbml0IGlzIHZhbGlkIHdoZW4gdGhpcyBmdW5jdGlvbiBpcyBjYWxsZWQuCisKIDIwMTMt MDUtMDIgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggcG90 ZW50aWFsIGJ1ZyBpbiBsb29rdXAgbG9naWMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHRHJpdmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR0RyaXZlci5jcHAJKHJldmlzaW9uIDE0OTQ4MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHRHJpdmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzYsNyArNzYsMTAgQEAgaW5s aW5lIGJvb2wgY29tcGlsZShDb21waWxlTW9kZSBjb21waWxlTQogCiAgICAgaWYgKCFPcHRpb25z Ojp1c2VERkdKSVQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIAorCisgICAgaWYgKCFP cHRpb25zOjpieXRlY29kZVJhbmdlVG9ERkdDb21waWxlKCkuaXNJblJhbmdlKGNvZGVCbG9jay0+ aW5zdHJ1Y3Rpb25Db3VudCgpKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgaWYgKGxv Z0NvbXBpbGF0aW9uQ2hhbmdlcygpKQogICAgICAgICBkYXRhTG9nKCJERkcgY29tcGlsaW5nICIs ICpjb2RlQmxvY2ssICIsIG51bWJlciBvZiBpbnN0cnVjdGlvbnMgPSAiLCBjb2RlQmxvY2stPmlu c3RydWN0aW9uQ291bnQoKSwgIlxuIik7CiAgICAgCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9PcHRpb25zLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9PcHRpb25zLmNwcAkocmV2aXNpb24gMTQ5NDgzKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyLDYgKzcy LDExIEBAIHN0YXRpYyBib29sIHBhcnNlKGNvbnN0IGNoYXIqIHN0cmluZywgZG8KICAgICByZXR1 cm4gc3NjYW5mKHN0cmluZywgIiVsZiIsICZ2YWx1ZSkgPT0gMTsKIH0KIAorc3RhdGljIGJvb2wg cGFyc2UoY29uc3QgY2hhciogc3RyaW5nLCBvcHRpb25SYW5nZSYgdmFsdWUpCit7CisgICAgcmV0 dXJuIHZhbHVlLmluaXQoc3RyaW5nKTsKK30KKwogdGVtcGxhdGU8dHlwZW5hbWUgVD4KIHZvaWQg b3ZlcnJpZGVPcHRpb25XaXRoSGV1cmlzdGljKFQmIHZhcmlhYmxlLCBjb25zdCBjaGFyKiBuYW1l KQogewpAQCAtMTA1LDYgKzExMCw1OSBAQCBzdGF0aWMgdW5zaWduZWQgY29tcHV0ZU51bWJlck9m R0NNYXJrZXJzCiAgICAgcmV0dXJuIGNwdXNUb1VzZTsKIH0KIAorYm9vbCBPcHRpb25SYW5nZTo6 aW5pdChjb25zdCBjaGFyKiByYW5nZVN0cmluZykKK3sKKyAgICAvLyByYW5nZVN0cmluZyBzaG91 bGQgYmUgaW4gdGhlIGZvcm0gb2YgWyFdPGxvdz5bOjxoaWdoPl0KKyAgICAvLyB3aGVyZSBsb3cg YW5kIGhpZ2ggYXJlIHVuc2lnbmVkCisKKyAgICBib29sIGludmVydCA9IGZhbHNlOworCisgICAg aWYgKG1fc3RhdGUgPiBVbmluaXRpYWxpemVkKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAg IGlmICghcmFuZ2VTdHJpbmcpIHsKKyAgICAgICAgbV9zdGF0ZSA9IEluaXRFcnJvcjsKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIG1fcmFuZ2VTdHJpbmcgPSByYW5nZVN0cmlu ZzsKKworICAgIGlmICgqcmFuZ2VTdHJpbmcgPT0gJyEnKSB7CisgICAgICAgIGludmVydCA9IHRy dWU7CisgICAgICAgIHJhbmdlU3RyaW5nKys7CisgICAgfQorCisgICAgaW50IHNjYW5SZXN1bHQg PSBzc2NhbmYocmFuZ2VTdHJpbmcsICIgJXU6JXUiLCAmbV9sb3dMaW1pdCwgJm1faGlnaExpbWl0 KTsKKworICAgIGlmICghc2NhblJlc3VsdCB8fCBzY2FuUmVzdWx0ID09IEVPRikgeworICAgICAg ICBtX3N0YXRlID0gSW5pdEVycm9yOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisg ICAgaWYgKHNjYW5SZXN1bHQgPT0gMSkKKyAgICAgICAgbV9oaWdoTGltaXQgPSBtX2xvd0xpbWl0 OworCisgICAgaWYgKG1fbG93TGltaXQgPiBtX2hpZ2hMaW1pdCkgeworICAgICAgICBtX3N0YXRl ID0gSW5pdEVycm9yOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgbV9zdGF0 ZSA9IGludmVydCA/IEludmVydGVkIDogTm9ybWFsOworCisgICAgcmV0dXJuIHRydWU7Cit9CisK K2Jvb2wgT3B0aW9uUmFuZ2U6OmlzSW5SYW5nZSh1bnNpZ25lZCBjb3VudCkKK3sKKyAgICBpZiAo bV9zdGF0ZSA8IE5vcm1hbCkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBpZiAoKG1fbG93 TGltaXQgPD0gY291bnQpICYmIChjb3VudCA8PSBtX2hpZ2hMaW1pdCkpCisgICAgICAgIHJldHVy biBtX3N0YXRlID09IE5vcm1hbCA/IHRydWUgOiBmYWxzZTsKKworICAgIHJldHVybiBtX3N0YXRl ID09IE5vcm1hbCA/IGZhbHNlIDogdHJ1ZTsKK30KKwogT3B0aW9uczo6RW50cnkgT3B0aW9uczo6 c19vcHRpb25zW09wdGlvbnM6Om51bWJlck9mT3B0aW9uc107CiAKIC8vIFJlYWxpemUgdGhlIG5h bWVzIGZvciBlYWNoIG9mIHRoZSBvcHRpb25zOgpAQCAtMjI3LDYgKzI4NSw5IEBAIHZvaWQgT3B0 aW9uczo6ZHVtcE9wdGlvbihPcHRpb25JRCBpZCwgRkkKICAgICBjYXNlIGludDMyVHlwZToKICAg ICAgICAgZnByaW50ZihzdHJlYW0sICIlZCIsIHNfb3B0aW9uc1tpZF0udS5pbnQzMlZhbCk7CiAg ICAgICAgIGJyZWFrOworICAgIGNhc2Ugb3B0aW9uUmFuZ2VUeXBlOgorICAgICAgICBmcHJpbnRm KHN0cmVhbSwgIiVzIiwgc19vcHRpb25zW2lkXS51Lm9wdGlvblJhbmdlVmFsLnJhbmdlU3RyaW5n KCkpOworICAgICAgICBicmVhazsKICAgICB9CiAgICAgZnByaW50ZihzdHJlYW0sICIlcyIsIGZv b3Rlcik7CiB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCShy ZXZpc2lvbiAxNDk0ODMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25z LmgJKHdvcmtpbmcgY29weSkKQEAgLTYwLDYgKzYwLDQzIEBAIG5hbWVzcGFjZSBKU0MgewogLy8g dmFsdWVzIGFmdGVyIHRoZSBzYW5pdHkgY2hlY2tzIChmb3IgeW91ciBvd24gdGVzdGluZyksIHRo ZW4geW91J3JlIGxpYWJsZSB0bwogLy8gZW5zdXJlIHRoYXQgdGhlIG5ldyB2YWx1ZXMgc2V0IGFy ZSBzYW5lIGFuZCByZWFzb25hYmxlIGZvciB5b3VyIG93biBydW4uCiAKK2NsYXNzIE9wdGlvblJh bmdlIHsKK3ByaXZhdGU6CisgICAgZW51bSBSYW5nZVN0YXRlIHsgVW5pbml0aWFsaXplZCwgSW5p dEVycm9yLCBOb3JtYWwsIEludmVydGVkIH07CitwdWJsaWM6CisgICAgLyoKKyAgICBPcHRpb25S YW5nZSgpCisgICAgICAgIDogbV9zdGF0ZShVbmluaXRpYWxpemVkKQorICAgICAgICAsIG1fcmFu Z2VTdHJpbmcoMCkKKyAgICAgICAgLCBtX2xvd0xpbWl0KDApCisgICAgICAgICwgbV9oaWdoTGlt aXQoMCkKKyAgICB7CisgICAgfQorICAgICovCisKKyAgICBPcHRpb25SYW5nZSYgb3BlcmF0b3I9 IChjb25zdCBpbnQmIHJocykKKyAgICB7IC8vIE9ubHkgbmVlZGVkIGZvciBpbml0aWFsaXphdGlv bgorICAgICAgICBpZiAoIXJocykgeworICAgICAgICAgICAgbV9zdGF0ZSA9IFVuaW5pdGlhbGl6 ZWQ7CisgICAgICAgICAgICBtX3JhbmdlU3RyaW5nID0gMDsKKyAgICAgICAgICAgIG1fbG93TGlt aXQgPSAwOworICAgICAgICAgICAgbV9oaWdoTGltaXQgPSAwOworICAgICAgICB9CisgICAgICAg IHJldHVybiAqdGhpczsKKyAgICB9CisKKyAgICBib29sIGluaXQoY29uc3QgY2hhciopOworICAg IGJvb2wgaXNJblJhbmdlKHVuc2lnbmVkKTsKKyAgICBjb25zdCBjaGFyKiByYW5nZVN0cmluZygp IHsgcmV0dXJuIChtX3N0YXRlID4gSW5pdEVycm9yKSA/IG1fcmFuZ2VTdHJpbmcgOiAiPG51bGw+ IjsgfQorCitwcml2YXRlOgorICAgIFJhbmdlU3RhdGUgbV9zdGF0ZTsKKyAgICBjb25zdCBjaGFy KiBtX3JhbmdlU3RyaW5nOworICAgIHVuc2lnbmVkIG1fbG93TGltaXQ7CisgICAgdW5zaWduZWQg bV9oaWdoTGltaXQ7Cit9OworCit0eXBlZGVmIE9wdGlvblJhbmdlIG9wdGlvblJhbmdlOwogCiAj ZGVmaW5lIEpTQ19PUFRJT05TKHYpIFwKICAgICB2KGJvb2wsIHVzZUpJVCwgICAgdHJ1ZSkgXApA QCAtNzQsNiArMTExLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgdihib29sLCBzaG93RGlzYXNz ZW1ibHksIGZhbHNlKSBcCiAgICAgdihib29sLCBzaG93REZHRGlzYXNzZW1ibHksIGZhbHNlKSBc CiAgICAgdihib29sLCBzaG93QWxsREZHTm9kZXMsIGZhbHNlKSBcCisgICAgdihvcHRpb25SYW5n ZSwgYnl0ZWNvZGVSYW5nZVRvREZHQ29tcGlsZSwgMCkgXAogICAgIHYoYm9vbCwgZHVtcEJ5dGVj b2RlQXRERkdUaW1lLCBmYWxzZSkgXAogICAgIHYoYm9vbCwgZHVtcEdyYXBoQXRFYWNoUGhhc2Us IGZhbHNlKSBcCiAgICAgdihib29sLCB2ZXJib3NlQ29tcGlsYXRpb24sIGZhbHNlKSBcCkBAIC0x NzksNiArMjE3LDcgQEAgcHJpdmF0ZToKICAgICAgICAgdW5zaWduZWRUeXBlLAogICAgICAgICBk b3VibGVUeXBlLAogICAgICAgICBpbnQzMlR5cGUsCisgICAgICAgIG9wdGlvblJhbmdlVHlwZSwK ICAgICB9OwogCiAgICAgLy8gRm9yIHN0b3JpbmcgZm9yIGFuIG9wdGlvbiB2YWx1ZToKQEAgLTE4 OCw2ICsyMjcsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgdW5zaWduZWQgdW5zaWduZWRWYWw7 CiAgICAgICAgICAgICBkb3VibGUgZG91YmxlVmFsOwogICAgICAgICAgICAgaW50MzIgaW50MzJW YWw7CisgICAgICAgICAgICBPcHRpb25SYW5nZSBvcHRpb25SYW5nZVZhbDsKICAgICAgICAgfSB1 OwogICAgIH07CiAK