Changeset 161356 in webkit for trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

Timestamp:

Jan 6, 2014, 11:20:41 AM (12 years ago)

Author:

[email protected]

Message:

LLInt shouldn't check for ENABLE(JIT).

Rubber stamped by Mark Hahnenberg.

• llint/LLIntCommon.h:
• llint/LLIntOfflineAsmConfig.h:
• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::entryOSR):
(JSC::LLInt::LLINT_SLOW_PATH_DECL):

• llint/LowLevelInterpreter.asm:

File:

• trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

@@ -269 +269 @@
 }
 
+enum EntryKind { Prologue, ArityCheck };
+
 #if ENABLE(JIT)
 inline bool shouldJIT(ExecState* exec)
@@ -322 +324 @@
 }
 
-enum EntryKind { Prologue, ArityCheck };
 static SlowPathReturnType entryOSR(ExecState* exec, Instruction*, CodeBlock* codeBlock, const char *name, EntryKind kind)
 {
@@ -343 +344 @@
     LLINT_RETURN_TWO(codeBlock->jitCodeWithArityCheck().executableAddress(), exec);
 }
+#else // ENABLE(JIT)
+static SlowPathReturnType entryOSR(ExecState* exec, Instruction*, CodeBlock* codeBlock, const char*, EntryKind)
+{
+    codeBlock->dontJITAnytimeSoon();
+    LLINT_RETURN_TWO(0, exec);
+}
+#endif // ENABLE(JIT)
 
 LLINT_SLOW_PATH_DECL(entry_osr)
@@ -373 +381 @@
     CodeBlock* codeBlock = exec->codeBlock();
 
+#if ENABLE(JIT)
     if (Options::verboseOSR()) {
         dataLog(
@@ -399 +408 @@
     
     LLINT_RETURN_TWO(jumpTarget, exec);
+#else // ENABLE(JIT)
+    codeBlock->dontJITAnytimeSoon();
+    LLINT_RETURN_TWO(0, exec);
+#endif // ENABLE(JIT)
 }
 
@@ -405 +418 @@
     CodeBlock* codeBlock = exec->codeBlock();
 
+#if ENABLE(JIT)
     if (Options::verboseOSR()) {
         dataLog(
@@ -416 +430 @@
         codeBlock->dontJITAnytimeSoon();
     LLINT_END_IMPL();
-}
+#else // ENABLE(JIT)
+    codeBlock->dontJITAnytimeSoon();
+    LLINT_END_IMPL();
 #endif // ENABLE(JIT)
+}
 
 LLINT_SLOW_PATH_DECL(stack_check)