Changeset 220834 in webkit

Timestamp:

Aug 17, 2017 12:04:19 AM (7 years ago)

Author:

mark.lam@apple.com

Message:

Gardening: build fix for ARM_TRADITIONAL after r220807.
​https://bugs.webkit.org/show_bug.cgi?id=175617

Not reviewed.

• assembler/MacroAssemblerARM.cpp:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerARM.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-08-17  Mark Lam  <mark.lam@apple.com>
+
+        Gardening: build fix for ARM_TRADITIONAL after r220807.
+        https://bugs.webkit.org/show_bug.cgi?id=175617
+
+        Not reviewed.
+
+        * assembler/MacroAssemblerARM.cpp:
+
 2017-08-16  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp

@@ -337 +337 @@
     LOCAL_LABEL_STRING(ctiMasmProbeTrampolineProbeContextIsSafe) ":" "\n"
     "ldr       r2, [fp, #" STRINGIZE_VALUE_OF(PROBE_INIT_STACK_FUNCTION_OFFSET) "]" "\n"
-    "cbz       r2, " LOCAL_LABEL_STRING(ctiMasmProbeTrampolineRestoreRegisters) "\n"
+    "cmp       r2, #0" "\n"
+    "beq       r2, " LOCAL_LABEL_STRING(ctiMasmProbeTrampolineRestoreRegisters) "\n"
 
     "mov       r0, fp" "\n" // Set the ProbeContext* arg.