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

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.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp

@@ -31 +31 @@
 #include "CodeBlock.h"
 #include "DFGCommon.h"
+#include "DFGFunctionWhitelist.h"
 #include "Interpreter.h"
 #include "JSCInlines.h"
@@ -41 +42 @@
     return Options::useDFGJIT()
         && MacroAssembler::supportsFloatingPoint()
-        && Options::bytecodeRangeToDFGCompile().isInRange(codeBlock->instructionCount());
+        && Options::bytecodeRangeToDFGCompile().isInRange(codeBlock->instructionCount())
+        && FunctionWhitelist::ensureGlobalWhitelist().contains(codeBlock);
 }
 
@@ -67 +69 @@
 bool mightInlineFunctionForCall(CodeBlock* codeBlock)
 {
-    return isSupported(codeBlock) 
-        && codeBlock->instructionCount() <= Options::maximumFunctionForCallInlineCandidateInstructionCount()
+    return codeBlock->instructionCount() <= Options::maximumFunctionForCallInlineCandidateInstructionCount()
         && !codeBlock->ownerExecutable()->needsActivation()
         && codeBlock->ownerExecutable()->isInliningCandidate();
@@ -74 +75 @@
 bool mightInlineFunctionForClosureCall(CodeBlock* codeBlock)
 {
-    return isSupported(codeBlock) 
-        && codeBlock->instructionCount() <= Options::maximumFunctionForClosureCallInlineCandidateInstructionCount()
+    return codeBlock->instructionCount() <= Options::maximumFunctionForClosureCallInlineCandidateInstructionCount()
         && !codeBlock->ownerExecutable()->needsActivation()
         && codeBlock->ownerExecutable()->isInliningCandidate();
@@ -81 +81 @@
 bool mightInlineFunctionForConstruct(CodeBlock* codeBlock)
 {
-    return isSupported(codeBlock) 
-        && codeBlock->instructionCount() <= Options::maximumFunctionForConstructInlineCandidateInstructionCount()
+    return codeBlock->instructionCount() <= Options::maximumFunctionForConstructInlineCandidateInstructionCount()
         && !codeBlock->ownerExecutable()->needsActivation()
         && codeBlock->ownerExecutable()->isInliningCandidate();