Changeset 155090 in webkit for trunk/Source/JavaScriptCore/API/JSCTestRunnerUtils.cpp

Timestamp:

Sep 4, 2013, 8:09:57 PM (12 years ago)

Author:

[email protected]

Message:

run-fast-jsc should work with new-school fast/js tests that loop until the DFG tiers up
​https://bugs.webkit.org/show_bug.cgi?id=120697

Reviewed by Mark Hahnenberg.

Source/JavaScriptCore:

• API/JSCTestRunnerUtils.cpp:

(JSC::numberOfDFGCompiles):
(JSC::setNeverInline):

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• jsc.cpp:

(GlobalObject::finishCreation):
(functionNeverInlineFunction):
(functionNumberOfDFGCompiles):

• runtime/TestRunnerUtils.cpp: Added.

(JSC::getExecutable):
(JSC::numberOfDFGCompiles):
(JSC::setNeverInline):

• runtime/TestRunnerUtils.h: Added.

LayoutTests:

• fast/js/resources/standalone-pre.js:

(testPassed):
(testFailed):
(dfgCompiled):

File:

• trunk/Source/JavaScriptCore/API/JSCTestRunnerUtils.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSCTestRunnerUtils.cpp

@@ -28 +28 @@
 
 #include "APICast.h"
-#include "CodeBlock.h"
 #include "Operations.h"
+#include "TestRunnerUtils.h"
 
 namespace JSC {
 
-static FunctionExecutable* getExecutable(JSContextRef context, JSValueRef theFunctionValueRef)
-{
-    ExecState* exec = toJS(context);
-    JSValue theFunctionValue = toJS(exec, theFunctionValueRef);
-    
-    JSFunction* theFunction = jsDynamicCast<JSFunction*>(theFunctionValue);
-    if (!theFunction)
-        return 0;
-    
-    FunctionExecutable* executable = jsDynamicCast<FunctionExecutable*>(
-        theFunction->executable());
-    return executable;
-}
-
 JSValueRef numberOfDFGCompiles(JSContextRef context, JSValueRef theFunctionValueRef)
 {
-    bool pretendToHaveManyCompiles = false;
-#if ENABLE(DFG_JIT)
-    if (!Options::useJIT() || !Options::useDFGJIT())
-        pretendToHaveManyCompiles = true;
-#else
-    pretendToHaveManyCompiles = true;
-#endif
-    
-    if (FunctionExecutable* executable = getExecutable(context, theFunctionValueRef)) {
-        CodeBlock* baselineCodeBlock = executable->baselineCodeBlockFor(CodeForCall);
-        
-        if (!baselineCodeBlock)
-            return JSValueMakeNumber(context, 0);
-
-        if (pretendToHaveManyCompiles)
-            return JSValueMakeNumber(context, 1000000.0);
-        return JSValueMakeNumber(context, baselineCodeBlock->numberOfDFGCompiles());
-    }
-    
-    return JSValueMakeUndefined(context);
+    ExecState* exec= toJS(context);
+    return toRef(exec, numberOfDFGCompiles(toJS(exec, theFunctionValueRef)));
 }
 
 JSValueRef setNeverInline(JSContextRef context, JSValueRef theFunctionValueRef)
 {
-    if (FunctionExecutable* executable = getExecutable(context, theFunctionValueRef))
-        executable->setNeverInline(true);
-    
-    return JSValueMakeUndefined(context);
+    ExecState* exec= toJS(context);
+    return toRef(exec, setNeverInline(toJS(exec, theFunctionValueRef)));
 }