Changeset 134612 in webkit

Timestamp:

Nov 14, 2012 8:18:10 AM (11 years ago)

Author:

Csaba Osztrogonác

Message:

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

Patch by Peter Gal <​galpeter@inf.u-szeged.hu> 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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JIT.h (modified) (1 diff)
• jit/JITPropertyAccess.cpp (modified) (1 diff)
• jit/JITPropertyAccess32_64.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-11-14  Peter Gal  <galpeter@inf.u-szeged.hu>
+
+        [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  <galpeter@inf.u-szeged.hu>
 

trunk/Source/JavaScriptCore/jit/JIT.h

@@ -488 +488 @@
         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);
-        }
-        template<IndexingType indexingShape>
-        JumpList emitGenericContiguousPutByVal(Instruction*, PatchableJump& badType);
+            return emitGenericContiguousPutByVal(currentInstruction, 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);

trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp

@@ -353 +353 @@
 }
 
-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;

trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp

@@ -318 +318 @@
 }
 
-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;