Modified: trunk/Source/_javascript_Core/ChangeLog (182810 => 182811)
--- trunk/Source/_javascript_Core/ChangeLog 2015-04-14 21:24:45 UTC (rev 182810)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-04-14 21:25:22 UTC (rev 182811)
@@ -1,3 +1,20 @@
+2015-04-14 Mark Lam <mark....@apple.com>
+
+ Rename JSC_dfgFunctionWhitelistFile to JSC_dfgWhitelist.
+ https://bugs.webkit.org/show_bug.cgi?id=143722
+
+ Reviewed by Michael Saboff.
+
+ Renaming JSC_dfgFunctionWhitelistFile to JSC_dfgWhitelist so that it is
+ shorter, and easier to remember (without having to look it up) and to
+ type. JSC options now support descriptions, and one can always look up
+ the description if the option's purpose is not already obvious.
+
+ * dfg/DFGFunctionWhitelist.cpp:
+ (JSC::DFG::FunctionWhitelist::ensureGlobalWhitelist):
+ (JSC::DFG::FunctionWhitelist::contains):
+ * runtime/Options.h:
+
2015-04-13 Filip Pizlo <fpi...@apple.com>
Unreviewed, fix Windows build. Windows doesn't take kindly to private classes that use FAST_ALLOCATED.
Modified: trunk/Source/_javascript_Core/dfg/DFGFunctionWhitelist.cpp (182810 => 182811)
--- trunk/Source/_javascript_Core/dfg/DFGFunctionWhitelist.cpp 2015-04-14 21:24:45 UTC (rev 182810)
+++ trunk/Source/_javascript_Core/dfg/DFGFunctionWhitelist.cpp 2015-04-14 21:25:22 UTC (rev 182811)
@@ -42,7 +42,7 @@
static LazyNeverDestroyed<FunctionWhitelist> functionWhitelist;
static std::once_flag initializeWhitelistFlag;
std::call_once(initializeWhitelistFlag, [] {
- const char* functionWhitelistFile = Options::dfgFunctionWhitelistFile();
+ const char* functionWhitelistFile = Options::dfgWhitelist();
functionWhitelist.construct(functionWhitelistFile);
});
return functionWhitelist;
@@ -92,7 +92,7 @@
bool FunctionWhitelist::contains(CodeBlock* codeBlock) const
{
ASSERT(!isCompilationThread());
- if (!Options::dfgFunctionWhitelistFile())
+ if (!Options::dfgWhitelist())
return true;
if (m_entries.isEmpty())
Modified: trunk/Source/_javascript_Core/runtime/Options.h (182810 => 182811)
--- trunk/Source/_javascript_Core/runtime/Options.h 2015-04-14 21:24:45 UTC (rev 182810)
+++ trunk/Source/_javascript_Core/runtime/Options.h 2015-04-14 21:25:22 UTC (rev 182811)
@@ -125,7 +125,7 @@
v(bool, showFTLDisassembly, false, "dumps disassembly of FTL function upon compilation") \
v(bool, showAllDFGNodes, false, nullptr) \
v(optionRange, bytecodeRangeToDFGCompile, 0, "bytecode size range to allow DFG compilation on, e.g. 1:100") \
- v(optionString, dfgFunctionWhitelistFile, nullptr, "file with list of function signatures to allow DFG compilation on") \
+ v(optionString, dfgWhitelist, nullptr, "file with list of function signatures to allow DFG compilation on") \
v(bool, dumpSourceAtDFGTime, false, "dumps source code of JS function being DFG compiled") \
v(bool, dumpBytecodeAtDFGTime, false, "dumps bytecode of JS function being DFG compiled") \
v(bool, dumpGraphAfterParsing, false, nullptr) \
