Changeset 189754 in webkit

Timestamp:

Sep 14, 2015 3:40:29 PM (9 years ago)

Author:

fpizlo@apple.com

Message:

Unreviewed, really fix non-x86 LLInt build without also breaking everything else.

• llint/LowLevelInterpreter64.asm:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter64.asm (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-09-14  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, really fix non-x86 LLInt build without also breaking everything else.
+
+        * llint/LowLevelInterpreter64.asm:
+
 2015-09-14  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -469 +469 @@
 end
 
-macro structureIDToStructureWithScratch(structureID, structure, scratch)
+macro structureIDToStructureWithScratch(structureIDThenStructure, scratch)
     loadp CodeBlock[cfr], scratch
     loadp CodeBlock::m_vm[scratch], scratch
     loadp VM::heap + Heap::m_structureIDTable + StructureIDTable::m_table[scratch], scratch
-    loadi structureID, structure
-    loadp [scratch, structure, 8], structure
+    loadp [scratch, structureIDThenStructure, 8], structureIDThenStructure
 end
 
 macro loadStructureWithScratch(cell, structure, scratch)
-    structureIDToStructureWithScratch(JSCell::m_structureID[cell], structure, scratch)
+    loadi JSCell::m_structureID[cell], structure
+    structureIDToStructureWithScratch(structure, scratch)
 end
 
@@ -1274 +1274 @@
     assert(macro (ok) btpnz t3, ok end)
 
-    structureIDToStructureWithScratch([t2], t2, t1)
+    structureIDToStructureWithScratch(t2, t1)
     loadq Structure::m_prototype[t2], t2
     bqeq t2, ValueNull, .opPutByIdTransitionChainDone