Fix Windows build.
☠☠ backed out by a0d8de655f06 ☠ ☠
authorDavid Anderson <dvander@alliedmods.net>
Fri, 03 Sep 2010 22:26:13 -0700
changeset 74538 210c7d2a0ddcd1bffdb133a94155ff31d65eb38e
parent 74537 40fe2614ef8e7a70f3f539cfa094bb4e4a39f1da
child 74539 23706a77784890da0d27b4380f097228920a49b1
child 74542 a0d8de655f06531cd898dfd171cd574231b6e783
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone2.0b6pre
Fix Windows build.
js/src/methodjit/InlineFrameAssembler.h
--- a/js/src/methodjit/InlineFrameAssembler.h
+++ b/js/src/methodjit/InlineFrameAssembler.h
@@ -103,30 +103,30 @@ class InlineFrameAssembler {
         isConstantThis = gen.isConstantThis;
         constantThis = gen.constantThis;
         frameDepth = gen.frameDepth;
         argc = gen.argc;
         funObjReg = gen.funObjReg;
         tempRegs.takeReg(funObjReg);
     }
 
+    struct AdjustedFrame {
+        AdjustedFrame(uint32 baseOffset)
+         : baseOffset(baseOffset)
+        { }
+
+        uint32 baseOffset;
+
+        Address addrOf(uint32 offset) {
+            return Address(JSFrameReg, baseOffset + offset);
+        }
+    };
+
     void assemble()
     {
-        struct AdjustedFrame {
-            AdjustedFrame(uint32 baseOffset)
-             : baseOffset(baseOffset)
-            { }
-
-            uint32 baseOffset;
-
-            Address addrOf(uint32 offset) {
-                return Address(JSFrameReg, baseOffset + offset);
-            }
-        };
-
         RegisterID t0 = tempRegs.takeAnyReg();
 
         /* Note: savedPC goes into the down frame. */
         masm.storePtr(ImmPtr(pc), Address(JSFrameReg, offsetof(JSStackFrame, savedPC)));
 
         AdjustedFrame adj(sizeof(JSStackFrame) + frameDepth * sizeof(Value));
         masm.store32(Imm32(argc), adj.addrOf(offsetof(JSStackFrame, argc)));
         masm.store32(Imm32(flags), adj.addrOf(offsetof(JSStackFrame, flags)));