Changeset 157932 in webkit

Timestamp:

Oct 24, 2013, 9:10:59 AM (12 years ago)

Author:

mark.lam@apple.com

Message:

Fix broken C Loop LLINT build.
​https://bugs.webkit.org/show_bug.cgi?id=123271.

Reviewed by Michael Saboff.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::printGetByIdCacheStatus): Added an UNUSED_PARAM().
(JSC::CodeBlock::dumpBytecode): Added #if ENABLE(JIT) to JIT only code.

• bytecode/GetByIdStatus.cpp:

(JSC::GetByIdStatus::computeFor): Added an UNUSED_PARAM().

• bytecode/PutByIdStatus.cpp:

(JSC::PutByIdStatus::computeFor): Added an UNUSED_PARAM().

• bytecode/StructureStubInfo.h:
• Added a stub StubInfoMap for non-JIT builds. StubInfoMap is still used in function prototypes even when !ENABLE(JIT). Rather that adding #if's in many places, we just provide a stub/placeholder implementation that is unused but keeps the compiler happy.
• jit/JITOperations.h: Added #if ENABLE(JIT).
• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• The putByVal() macro reifies a slow path which is never taken in one case. This translates into a label that is never used in the C Loop LLINT. The C++ compiler doesn't like unused labels. So, we fix this by adding a cloopUnusedLabel offline asm instruction that synthesizes the following:

if (false) goto unusedLabel;

This keeps the C++ compiler happy without changing code behavior.

• offlineasm/cloop.rb: Implementing cloopUnusedLabel.
• offlineasm/instructions.rb: Declaring cloopUnusedLabel.
• runtime/Executable.cpp:

(JSC::setupJIT): Added UNUSED_PARAM()s.
(JSC::ScriptExecutable::prepareForExecutionImpl):

• run-javascriptcore-tests have phases that forces the LLINT to be off which in turn asserts that the JIT is enabled. With the C Loop LLINT, this combination is illegal. So, we override the setup code here to always use the LLINT if !ENABLE(JIT) regardless of what options are passed in.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (2 diffs)
• bytecode/GetByIdStatus.cpp (modified) (1 diff)
• bytecode/PutByIdStatus.cpp (modified) (1 diff)
• bytecode/StructureStubInfo.h (modified) (3 diffs)
• jit/JITOperations.h (modified) (2 diffs)
• llint/LowLevelInterpreter32_64.asm (modified) (1 diff)
• llint/LowLevelInterpreter64.asm (modified) (1 diff)
• offlineasm/cloop.rb (modified) (1 diff)
• offlineasm/instructions.rb (modified) (1 diff)
• runtime/Executable.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-10-24  Mark Lam  <mark.lam@apple.com>
+
+        Fix broken C Loop LLINT build.
+        https://bugs.webkit.org/show_bug.cgi?id=123271.
+
+        Reviewed by Michael Saboff.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::printGetByIdCacheStatus): Added an UNUSED_PARAM().
+        (JSC::CodeBlock::dumpBytecode): Added #if ENABLE(JIT) to JIT only code.
+        * bytecode/GetByIdStatus.cpp:
+        (JSC::GetByIdStatus::computeFor): Added an UNUSED_PARAM().
+        * bytecode/PutByIdStatus.cpp:
+        (JSC::PutByIdStatus::computeFor): Added an UNUSED_PARAM().
+        * bytecode/StructureStubInfo.h:
+        - Added a stub StubInfoMap for non-JIT builds. StubInfoMap is still used
+          in function prototypes even when !ENABLE(JIT). Rather that adding #if's
+          in many places, we just provide a stub/placeholder implementation that
+          is unused but keeps the compiler happy.
+        * jit/JITOperations.h: Added #if ENABLE(JIT).
+        * llint/LowLevelInterpreter32_64.asm:
+        * llint/LowLevelInterpreter64.asm:
+        - The putByVal() macro reifies a slow path which is never taken in one case.
+          This translates into a label that is never used in the C Loop LLINT. The
+          C++ compiler doesn't like unused labels. So, we fix this by adding a
+          cloopUnusedLabel offline asm instruction that synthesizes the following:
+
+              if (false) goto unusedLabel;
+
+          This keeps the C++ compiler happy without changing code behavior.
+        * offlineasm/cloop.rb: Implementing cloopUnusedLabel.
+        * offlineasm/instructions.rb: Declaring cloopUnusedLabel.
+        * runtime/Executable.cpp:
+        (JSC::setupJIT): Added UNUSED_PARAM()s.
+        (JSC::ScriptExecutable::prepareForExecutionImpl):
+        - run-javascriptcore-tests have phases that forces the LLINT to be off
+          which in turn asserts that the JIT is enabled. With the C Loop LLINT,
+          this combination is illegal. So, we override the setup code here to
+          always use the LLINT if !ENABLE(JIT) regardless of what options are
+          passed in.
+
 2013-10-24  peavo@outlook.com  <peavo@outlook.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -445 +445 @@
         }
     }
+#else
+    UNUSED_PARAM(map);
 #endif
 }
@@ -523 +525 @@
     
     StubInfoMap stubInfos;
+#if ENABLE(JIT)
     {
         ConcurrentJITLocker locker(m_lock);
         getStubInfoMap(locker, stubInfos);
     }
+#endif
     
     const Instruction* begin = instructions().begin();

trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp

@@ -247 +247 @@
     return result;
 #else // ENABLE(JIT)
+    UNUSED_PARAM(map);
     return GetByIdStatus(NoInformation, false);
 #endif // ENABLE(JIT)

trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp

@@ -144 +144 @@
     }
 #else // ENABLE(JIT)
+    UNUSED_PARAM(map);
     return PutByIdStatus(NoInformation, 0, 0, 0, invalidOffset);
 #endif // ENABLE(JIT)

trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h

@@ -29 +29 @@
 #include <wtf/Platform.h>
 
-#if ENABLE(JIT)
-
 #include "CodeOrigin.h"
 #include "Instruction.h"
@@ -43 +41 @@
 
 namespace JSC {
+
+#if ENABLE(JIT)
 
 class PolymorphicPutByIdList;
@@ -302 +302 @@
 typedef HashMap<CodeOrigin, StructureStubInfo*> StubInfoMap;
 
+#else
+
+typedef HashMap<int, void*> StubInfoMap;
+
+#endif // ENABLE(JIT)
+
 } // namespace JSC
 
-#endif // ENABLE(JIT)
-
 #endif // StructureStubInfo_h

trunk/Source/JavaScriptCore/jit/JITOperations.h

@@ -26 +26 @@
 #ifndef JITOperations_h
 #define JITOperations_h
+
+#if ENABLE(JIT)
 
 #include "CallFrame.h"
@@ -276 +278 @@
 } // namespace JSC
 
+#endif // ENABLE(JIT)
+
 #endif // JITOperations_h
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -1390 +1390 @@
 _llint_op_put_by_val_direct:
     putByVal(macro(addr, slowPath)
+        if C_LOOP
+            cloopUnusedLabel slowPath
+        end
     end, _llint_slow_path_put_by_val_direct)
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -1249 +1249 @@
 _llint_op_put_by_val_direct:
     putByVal(macro(slot, slowPath)
+        if C_LOOP
+            cloopUnusedLabel slowPath
+        end
     end, _llint_slow_path_put_by_val_direct)
 

trunk/Source/JavaScriptCore/offlineasm/cloop.rb

@@ -1111 +1111 @@
             cloopEmitCallSlowPath(operands)
 
+        when "cloopUnusedLabel"
+            $asm.putc "if (false) goto #{operands[0].cLabel};"
+
         # For debugging only. This is used to insert instrumentation into the
         # generated LLIntAssembly.h during llint development only. Do not use

trunk/Source/JavaScriptCore/offlineasm/instructions.rb

@@ -296 +296 @@
      "cloopCallNative",      # operands: callee
      "cloopCallSlowPath",    # operands: callTarget, currentFrame, currentPC
+     "cloopUnusedLabel",     # operands: label
 
      # For debugging only:

trunk/Source/JavaScriptCore/runtime/Executable.cpp

@@ -278 +278 @@
     RELEASE_ASSERT(result == CompilationSuccessful);
 #else
+    UNUSED_PARAM(vm);
+    UNUSED_PARAM(codeBlock);
     UNREACHABLE_FOR_PLATFORM();
 #endif
@@ -296 +298 @@
     
     bool shouldUseLLInt;
-#if ENABLE(LLINT)
+#if !ENABLE(JIT)
+    // No JIT implies use of the C Loop LLINT. Override the options to reflect this. 
+    Options::useLLInt() = true;
+    shouldUseLLInt = true;
+#elif ENABLE(LLINT)
     shouldUseLLInt = Options::useLLInt();
 #else