Changeset 158541 in webkit for trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp

Timestamp:

Nov 3, 2013, 1:52:56 PM (12 years ago)

Author:

[email protected]

Message:

Assertion failure in non-JIT'ed LLInt on ARM Thumb.
​https://bugs.webkit.org/show_bug.cgi?id=97569.

Reviewed by Geoffrey Garen.

• assembler/MacroAssemblerCodeRef.h:
• Thumb2 alignment assertions do not apply to the C Loop LLINT because the arguments passed to those assertions are actually OpcodeIDs masquerading as addresses.
• llint/LLIntOfflineAsmConfig.h:
• Some of the #defines belong in the !ENABLE(LLINT_C_LOOP) section. Moving them there.
• llint/LowLevelInterpreter.cpp:
• Keep the compiler happy from some unreferenced C Loop labels.

File:

• trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp

@@ -91 +91 @@
 #define OFFLINE_ASM_END
 
-
-#define OFFLINE_ASM_OPCODE_LABEL(opcode) DEFINE_OPCODE(opcode)
+// To keep compilers happy in case of unused labels, force usage of the label:
+#define USE_LABEL(label) \
+    do { \
+        if (false) \
+            goto label; \
+    } while (false)
+
+#define OFFLINE_ASM_OPCODE_LABEL(opcode) DEFINE_OPCODE(opcode) USE_LABEL(opcode);
+
 #if ENABLE(COMPUTED_GOTO_OPCODES)
-    #define OFFLINE_ASM_GLUE_LABEL(label)  label:
+#define OFFLINE_ASM_GLUE_LABEL(label)  label: USE_LABEL(label);
 #else
-    #define OFFLINE_ASM_GLUE_LABEL(label)  case label: label:
-#endif
-
-#define OFFLINE_ASM_LOCAL_LABEL(label) \
-    label: \
-        if (false) \
-            goto label;
+#define OFFLINE_ASM_GLUE_LABEL(label)  case label: label: USE_LABEL(label);
+#endif
+
+#define OFFLINE_ASM_LOCAL_LABEL(label) label: USE_LABEL(label);