Changeset 168178 in webkit for trunk/Source/JavaScriptCore/dfg/DFGCapabilities.h

Timestamp:

May 2, 2014, 11:52:10 AM (11 years ago)

Author:

[email protected]

Message:

Add a DFG function whitelist
​https://bugs.webkit.org/show_bug.cgi?id=132437

Reviewed by Geoffrey Garen.

Often times when debugging, using bytecode ranges isn't enough to narrow down to the
particular DFG block that's causing issues. This patch adds the ability to whitelist
specific functions specified in a file to enable further filtering without having to recompile.

• CMakeLists.txt:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• JavaScriptCore.xcodeproj/project.pbxproj:
• dfg/DFGCapabilities.cpp:

(JSC::DFG::isSupported):
(JSC::DFG::mightInlineFunctionForCall):
(JSC::DFG::mightInlineFunctionForClosureCall):
(JSC::DFG::mightInlineFunctionForConstruct):

• dfg/DFGFunctionWhitelist.cpp: Added.

(JSC::DFG::FunctionWhitelist::ensureGlobalWhitelist):
(JSC::DFG::FunctionWhitelist::FunctionWhitelist):
(JSC::DFG::FunctionWhitelist::parseFunctionNamesInFile):
(JSC::DFG::FunctionWhitelist::contains):

• dfg/DFGFunctionWhitelist.h: Added.
• runtime/Options.cpp:

(JSC::parse):
(JSC::Options::dumpOption):

• runtime/Options.h:

File:

• trunk/Source/JavaScriptCore/dfg/DFGCapabilities.h (modified) (1 diff)

trunk/Source/JavaScriptCore/dfg/DFGCapabilities.h

@@ -80 +80 @@
 }
 
+inline CapabilityLevel functionCapabilityLevel(bool mightCompile, bool mightInline, CapabilityLevel computedCapabilityLevel)
+{
+    if (mightCompile && mightInline)
+        return leastUpperBound(CanCompileAndInline, computedCapabilityLevel);
+    if (mightCompile && !mightInline)
+        return leastUpperBound(CanCompile, computedCapabilityLevel);
+    if (!mightCompile && mightInline)
+        return leastUpperBound(CanInline, computedCapabilityLevel);
+    if (!mightCompile && !mightInline)
+        return CannotCompile;
+    RELEASE_ASSERT_NOT_REACHED();
+    return CannotCompile;
+}
+
 inline CapabilityLevel functionForCallCapabilityLevel(CodeBlock* codeBlock)
 {
-    if (!mightCompileFunctionForCall(codeBlock))
-        return CannotCompile;
-    
-    return capabilityLevel(codeBlock);
+    return functionCapabilityLevel(
+        mightCompileFunctionForCall(codeBlock),
+        mightInlineFunctionForCall(codeBlock),
+        capabilityLevel(codeBlock));
 }
 
 inline CapabilityLevel functionForConstructCapabilityLevel(CodeBlock* codeBlock)
 {
-    if (!mightCompileFunctionForConstruct(codeBlock))
-        return CannotCompile;
-    
-    return capabilityLevel(codeBlock);
+    return functionCapabilityLevel(
+        mightCompileFunctionForConstruct(codeBlock),
+        mightInlineFunctionForConstruct(codeBlock),
+        capabilityLevel(codeBlock));
 }