Changeset 154833 in webkit for trunk/Source/JavaScriptCore/jit/JIT.h

Timestamp:

Aug 29, 2013, 12:28:55 PM (12 years ago)

Author:

[email protected]

Message:

CodeBlock::prepareForExecution() is silly
​https://bugs.webkit.org/show_bug.cgi?id=120453

Reviewed by Oliver Hunt.

Instead of saying:

codeBlock->prepareForExecution(stuff, BaselineJIT, more stuff)

we should just say:

JIT::compile(stuff, codeBlock, more stuff);

And similarly for the LLInt and DFG.

This kills a bunch of code, since CodeBlock::prepareForExecution() is just a
wrapper that uses the JITType argument to call into the appropriate execution
engine, which is what the user wanted to do in the first place.

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• bytecode/CodeBlock.cpp:
• bytecode/CodeBlock.h:
• dfg/DFGDriver.cpp:

(JSC::DFG::compileImpl):
(JSC::DFG::compile):

• dfg/DFGDriver.h:

(JSC::DFG::tryCompile):

• dfg/DFGOSRExitPreparation.cpp:

(JSC::DFG::prepareCodeOriginForOSRExit):

• dfg/DFGWorklist.cpp:

(JSC::DFG::globalWorklist):

• dfg/DFGWorklist.h:
• jit/JIT.cpp:

(JSC::JIT::privateCompile):

• jit/JIT.h:

(JSC::JIT::compile):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• llint/LLIntEntrypoint.cpp: Copied from Source/JavaScriptCore/llint/LLIntEntrypoints.cpp.

(JSC::LLInt::setFunctionEntrypoint):
(JSC::LLInt::setEvalEntrypoint):
(JSC::LLInt::setProgramEntrypoint):
(JSC::LLInt::setEntrypoint):

• llint/LLIntEntrypoint.h: Copied from Source/JavaScriptCore/llint/LLIntEntrypoints.h.
• llint/LLIntEntrypoints.cpp: Removed.
• llint/LLIntEntrypoints.h: Removed.
• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::jitCompileAndSetHeuristics):

• runtime/Executable.cpp:

(JSC::ScriptExecutable::prepareForExecutionImpl):

File:

• trunk/Source/JavaScriptCore/jit/JIT.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/JIT.h

@@ -299 +299 @@
 
     public:
-        static PassRefPtr<JITCode> compile(VM* vm, CodeBlock* codeBlock, JITCompilationEffort effort, CodePtr* functionEntryArityCheck = 0)
-        {
-            return JIT(vm, codeBlock).privateCompile(functionEntryArityCheck, effort);
+        static CompilationResult compile(VM* vm, CodeBlock* codeBlock, JITCompilationEffort effort)
+        {
+            return JIT(vm, codeBlock).privateCompile(effort);
         }
         
@@ -404 +404 @@
         void privateCompileLinkPass();
         void privateCompileSlowCases();
-        PassRefPtr<JITCode> privateCompile(CodePtr* functionEntryArityCheck, JITCompilationEffort);
+        CompilationResult privateCompile(JITCompilationEffort);
         
         void privateCompileClosureCall(CallLinkInfo*, CodeBlock* calleeCodeBlock, Structure*, ExecutableBase*, MacroAssemblerCodePtr);