Changeset 236127 in webkit

Timestamp:

Sep 18, 2018, 8:38:58 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r235557 - Gardening: ARMv7 build fix.
​https://bugs.webkit.org/show_bug.cgi?id=158911

Not reviewed.

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::patchableBranch8):

Location:

releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerARMv7.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-08-31  Mark Lam  <mark.lam@apple.com>
+
+        Gardening: ARMv7 build fix.
+        https://bugs.webkit.org/show_bug.cgi?id=158911
+
+        Not reviewed.
+
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::patchableBranch8):
+
 2018-08-31  Mark Lam  <mark.lam@apple.com>
 

releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

@@ -1943 +1943 @@
     }
 
+    PatchableJump patchableBranch8(RelationalCondition cond, Address left, TrustedImm32 imm)
+    {
+        m_makeJumpPatchable = true;
+        Jump result = branch8(cond, left, imm);
+        m_makeJumpPatchable = false;
+        return PatchableJump(result);
+    }
+
     PatchableJump patchableBranch32(RelationalCondition cond, RegisterID reg, TrustedImm32 imm)
     {