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

Wed, 14 Nov 2012 08:16:34 -0800

Title: [134612] trunk/Source/_javascript_Core
Revision
134612
Author
[email protected]
Date
2012-11-14 08:18:10 -0800 (Wed, 14 Nov 2012)

Log Message

[Qt][ARM]REGRESSION(r133985): It broke the build
https://bugs.webkit.org/show_bug.cgi?id=101740

Patch by Peter Gal <[email protected]> on 2012-11-14
Reviewed by Csaba Osztrogonác.

Changed the emitGenericContiguousPutByVal to accept the additional IndexingType argument.
This information was passed as a template parameter.

* jit/JIT.h:
(JSC::JIT::emitInt32PutByVal):
(JSC::JIT::emitDoublePutByVal):
(JSC::JIT::emitContiguousPutByVal):
(JIT):
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emitGenericContiguousPutByVal):
* jit/JITPropertyAccess32_64.cpp:
(JSC::JIT::emitGenericContiguousPutByVal):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (134611 => 134612)


--- trunk/Source/_javascript_Core/ChangeLog	2012-11-14 16:02:43 UTC (rev 134611)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-11-14 16:18:10 UTC (rev 134612)
@@ -1,5 +1,25 @@
 2012-11-14  Peter Gal  <[email protected]>
 
+        [Qt][ARM]REGRESSION(r133985): It broke the build
+        https://bugs.webkit.org/show_bug.cgi?id=101740
+
+        Reviewed by Csaba Osztrogonác.
+
+        Changed the emitGenericContiguousPutByVal to accept the additional IndexingType argument.
+        This information was passed as a template parameter.        
+
+        * jit/JIT.h:
+        (JSC::JIT::emitInt32PutByVal):
+        (JSC::JIT::emitDoublePutByVal):
+        (JSC::JIT::emitContiguousPutByVal):
+        (JIT):
+        * jit/JITPropertyAccess.cpp:
+        (JSC::JIT::emitGenericContiguousPutByVal):
+        * jit/JITPropertyAccess32_64.cpp:
+        (JSC::JIT::emitGenericContiguousPutByVal):
+
+2012-11-14  Peter Gal  <[email protected]>
+
         Fix the MIPS build after r134332
         https://bugs.webkit.org/show_bug.cgi?id=102227

Modified: trunk/Source/_javascript_Core/jit/JIT.h (134611 => 134612)


--- trunk/Source/_javascript_Core/jit/JIT.h	2012-11-14 16:02:43 UTC (rev 134611)
+++ trunk/Source/_javascript_Core/jit/JIT.h	2012-11-14 16:18:10 UTC (rev 134612)
@@ -487,18 +487,17 @@
         // returns the slow cases.
         JumpList emitInt32PutByVal(Instruction* currentInstruction, PatchableJump& badType)
         {
-            return emitGenericContiguousPutByVal<Int32Shape>(currentInstruction, badType);
+            return emitGenericContiguousPutByVal(currentInstruction, badType, Int32Shape);
         }
         JumpList emitDoublePutByVal(Instruction* currentInstruction, PatchableJump& badType)
         {
-            return emitGenericContiguousPutByVal<DoubleShape>(currentInstruction, badType);
+            return emitGenericContiguousPutByVal(currentInstruction, badType, DoubleShape);
         }
         JumpList emitContiguousPutByVal(Instruction* currentInstruction, PatchableJump& badType)
         {
-            return emitGenericContiguousPutByVal<ContiguousShape>(currentInstruction, badType);
+            return emitGenericContiguousPutByVal(currentInstruction, badType);
         }
-        template<IndexingType indexingShape>
-        JumpList emitGenericContiguousPutByVal(Instruction*, PatchableJump& badType);
+        JumpList emitGenericContiguousPutByVal(Instruction*, PatchableJump& badType, IndexingType indexingShape = ContiguousShape);
         JumpList emitArrayStoragePutByVal(Instruction*, PatchableJump& badType);
         JumpList emitIntTypedArrayPutByVal(Instruction*, PatchableJump& badType, const TypedArrayDescriptor&, size_t elementSize, TypedArraySignedness, TypedArrayRounding);
         JumpList emitFloatTypedArrayPutByVal(Instruction*, PatchableJump& badType, const TypedArrayDescriptor&, size_t elementSize);

Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp (134611 => 134612)


--- trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp	2012-11-14 16:02:43 UTC (rev 134611)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp	2012-11-14 16:18:10 UTC (rev 134612)
@@ -352,8 +352,7 @@
     emitWriteBarrier(regT0, regT3, regT1, regT3, ShouldFilterImmediates, WriteBarrierForPropertyAccess);
 }
 
-template<IndexingType indexingShape>
-JIT::JumpList JIT::emitGenericContiguousPutByVal(Instruction* currentInstruction, PatchableJump& badType)
+JIT::JumpList JIT::emitGenericContiguousPutByVal(Instruction* currentInstruction, PatchableJump& badType, IndexingType indexingShape)
 {
     unsigned value = currentInstruction[3].u.operand;
     ArrayProfile* profile = ""

Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp (134611 => 134612)


--- trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp	2012-11-14 16:02:43 UTC (rev 134611)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp	2012-11-14 16:18:10 UTC (rev 134612)
@@ -317,8 +317,7 @@
     m_byValCompilationInfo.append(ByValCompilationInfo(m_bytecodeOffset, badType, mode, done));
 }
 
-template<IndexingType indexingShape>
-JIT::JumpList JIT::emitGenericContiguousPutByVal(Instruction* currentInstruction, PatchableJump& badType)
+JIT::JumpList JIT::emitGenericContiguousPutByVal(Instruction* currentInstruction, PatchableJump& badType, IndexingType indexingShape)
 {
     unsigned value = currentInstruction[3].u.operand;
     ArrayProfile* profile = ""

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to