Changeset 158692 in webkit

Timestamp:

Nov 5, 2013 2:30:15 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Fix build for architectures with 4 argument registers (broken since r158681).
​https://bugs.webkit.org/show_bug.cgi?id=123826

Patch by Julien Brianceau <​jbriance@cisco.com> on 2013-11-05
Reviewed by Michael Saboff.

• jit/CCallHelpers.h:

(JSC::CCallHelpers::setupArgumentsWithExecState):
(JSC::CCallHelpers::setupArguments):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/CCallHelpers.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-11-05  Julien Brianceau  <jbriance@cisco.com>
+
+        Fix build for architectures with 4 argument registers (broken since r158681).
+        https://bugs.webkit.org/show_bug.cgi?id=123826
+
+        Reviewed by Michael Saboff.
+
+        * jit/CCallHelpers.h:
+        (JSC::CCallHelpers::setupArgumentsWithExecState):
+        (JSC::CCallHelpers::setupArguments):
+
 2013-11-05  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/jit/CCallHelpers.h

@@ -914 +914 @@
     }
     
-    ALWAYS_INLINE void setupArguments(GPRReg arg1, TrustedImmPtr arg2, GPRReg arg3, GPRReg arg4, TrustedImmPtr arg5)
-    {
-        setupThreeStubArgsGPR<GPRInfo::argumentGPR0, GPRInfo::argumentGPR2, GPRInfo::argumentGPR3>(arg1, arg3, arg4);
-        move(arg2, GPRInfo::argumentGPR1);
-        move(arg5, GPRInfo::argumentGPR4);
-    }
-    
     ALWAYS_INLINE void setupArguments(TrustedImmPtr arg1)
     {
@@ -1464 +1457 @@
         move(arg4, GPRInfo::argumentGPR4);
         move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
+    }
+
+    ALWAYS_INLINE void setupArguments(GPRReg arg1, TrustedImmPtr arg2, GPRReg arg3, GPRReg arg4, TrustedImmPtr arg5)
+    {
+        setupThreeStubArgsGPR<GPRInfo::argumentGPR0, GPRInfo::argumentGPR2, GPRInfo::argumentGPR3>(arg1, arg3, arg4);
+        move(arg2, GPRInfo::argumentGPR1);
+        move(arg5, GPRInfo::argumentGPR4);
     }
 #endif