Merge backout.
authorDavid Anderson <danderson@mozilla.com>
Thu, 02 Sep 2010 16:15:11 -0700
changeset 74522 1939c7289f0c17888d9f39d6c4466285ca7976ba
parent 74520 1a3627a83d9d0ebe5f2c9154b5719be9fa8494f3 (current diff)
parent 74521 073cf20fe43920cd81dd292e5f4f56fb45788aec (diff)
child 74524 0ce92e8280e679c2cf0c7cc94ddf798ab54c80af
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone2.0b5pre
Merge backout.
--- 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)));