[webkit-changes] [174360] trunk/Source/JavaScriptCore

[mark . lam]

Title: [174360] trunk/Source/_javascript_Core

Revision

174360

Author

mark....@apple.com

Date

2014-10-06 13:18:05 -0700 (Mon, 06 Oct 2014)

Log Message

Unreviewed build fix.
<https://webkit.org/b/137279>

* jit/CCallHelpers.h:
(JSC::CCallHelpers::setupArgumentsWithExecState):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/CCallHelpers.h

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (174359 => 174360)

--- trunk/Source/_javascript_Core/ChangeLog	2014-10-06 19:29:27 UTC (rev 174359)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-10-06 20:18:05 UTC (rev 174360)
@@ -1,3 +1,11 @@
+2014-10-06  Mark Lam  <mark....@apple.com>
+
+        Unreviewed build fix.
+        <https://webkit.org/b/137279>
+
+        * jit/CCallHelpers.h:
+        (JSC::CCallHelpers::setupArgumentsWithExecState):
+
 2014-10-06  Oliver Hunt  <oli...@apple.com>
 
         REGRESSION(r174226): [JSC] Crash when running the perf test Speedometer/Full.html

Modified: trunk/Source/_javascript_Core/jit/CCallHelpers.h (174359 => 174360)

--- trunk/Source/_javascript_Core/jit/CCallHelpers.h	2014-10-06 19:29:27 UTC (rev 174359)
+++ trunk/Source/_javascript_Core/jit/CCallHelpers.h	2014-10-06 20:18:05 UTC (rev 174360)
@@ -1296,17 +1296,6 @@
         move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
     }
 
-#if CPU(X86_64) || CPU(ARM64)
-    ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImm32 arg4)
-    {
-        move(arg2, GPRInfo::argumentGPR2); // In case arg2 is argumentGPR1.
-        move(arg1, GPRInfo::argumentGPR1);
-        move(arg3, GPRInfo::argumentGPR3);
-        move(arg4, GPRInfo::argumentGPR4);
-        move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
-    }
-#endif
-
     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, TrustedImmPtr arg3)
     {
         move(arg2, GPRInfo::argumentGPR2); // In case arg2 is argumentGPR1.
@@ -1380,6 +1369,12 @@
         setupArgumentsWithExecState(arg1, arg2, arg3);
     }
 
+    ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImm32 arg4)
+    {
+        poke(arg4, POKE_ARGUMENT_OFFSET);
+        setupArgumentsWithExecState(arg1, arg2, arg3);
+    }
+
     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImmPtr arg4)
     {
         poke(arg4, POKE_ARGUMENT_OFFSET);
@@ -1674,6 +1669,15 @@
         move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
     }
     
+    ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImm32 arg4)
+    {
+        move(arg2, GPRInfo::argumentGPR2); // In case arg2 is argumentGPR1.
+        move(arg1, GPRInfo::argumentGPR1);
+        move(arg3, GPRInfo::argumentGPR3);
+        move(arg4, GPRInfo::argumentGPR4);
+        move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
+    }
+
     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImmPtr arg1, GPRReg arg2, GPRReg arg3, TrustedImm32 arg4, TrustedImm32 arg5)
     {
         setupTwoStubArgsGPR<GPRInfo::argumentGPR2, GPRInfo::argumentGPR3>(arg2, arg3);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes