Another Windows build fix attempt.
☠☠ backed out by 073cf20fe439 ☠ ☠
authorDavid Anderson <danderson@mozilla.com>
Thu, 02 Sep 2010 05:48:02 -0700
changeset 74518 5d60ada03594e78290fe24b8a7c1ed57c9493413
parent 74517 809288d171630ab07bbec448281546302eb3ec8a
child 74519 d124082d9de2c3e956920b123b10a6cef1e0e281
child 74521 073cf20fe43920cd81dd292e5f4f56fb45788aec
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone2.0b5pre
Another Windows build fix attempt.
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 {
+        inline AdjustedFrame(uint32 baseOffset)
+         : baseOffset(baseOffset)
+        { }
+
+        uint32 baseOffset;
+
+        inline Address addrOf(uint32 offset) {
+            return Address(JSFrameReg, baseOffset + offset);
+        }
+    };
+
     inline 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)));