Import http://hg.mozilla.org/mozilla-central/rev/a94142e82a0d to TM since it seems to be horking my shell builds (but not a browser build? odd, I thought I'd tested both)
authorJeff Walden <jwalden@mit.edu>
Sat, 11 Apr 2009 15:01:17 -0700
changeset 24912 254332d567d89b688728d0a6f3cba550f361443b
parent 24911 6fd196ae4f20e08fac113d3de838518c1fe0c69f
child 24913 4fd30c64c5ed13c68dcf3b86544f7d3ac8b477a4
push id1267
push userrsayre@mozilla.com
push dateSun, 19 Apr 2009 02:47:24 +0000
milestone1.9.1b4pre
Import http://hg.mozilla.org/mozilla-central/rev/a94142e82a0d to TM since it seems to be horking my shell builds (but not a browser build? odd, I thought I'd tested both)
js/src/jsinterp.h
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -129,21 +129,17 @@ struct JSStackFrame {
     JSObject        *xmlNamespace;  /* null or default xml namespace in E4X */
     JSStackFrame    *displaySave;   /* previous value of display entry for
                                        script->staticLevel */
 #ifdef DEBUG
     jsrefcount      pcDisabledSave; /* for balanced property cache control */
 #endif
 
 #ifdef __cplusplus /* Aargh, LiveConnect, bug 442399. */
-    void assertValidStackDepth(uintN depth) {
-        extern jsval *StackBase(JSStackFrame *fp);
-        JS_ASSERT(0 <= regs->sp - StackBase(this));
-        JS_ASSERT(depth <= uintptr_t(regs->sp - StackBase(this)));
-    }
+    inline void assertValidStackDepth(uintN depth);
 #endif
 };
 
 #ifdef __cplusplus
 static JS_INLINE uintN
 FramePCOffset(JSStackFrame* fp)
 {
     return uintN((fp->imacpc ? fp->imacpc : fp->regs->pc) - fp->script->code);
@@ -151,16 +147,25 @@ FramePCOffset(JSStackFrame* fp)
 #endif
 
 static JS_INLINE jsval *
 StackBase(JSStackFrame *fp)
 {
     return fp->slots + fp->script->nfixed;
 }
 
+#ifdef __cplusplus /* Aargh, LiveConnect, bug 442399. */
+void
+JSStackFrame::assertValidStackDepth(uintN depth)
+{
+    JS_ASSERT(0 <= regs->sp - StackBase(this));
+    JS_ASSERT(depth <= uintptr_t(regs->sp - StackBase(this)));
+}
+#endif
+
 static JS_INLINE uintN
 GlobalVarCount(JSStackFrame *fp)
 {
     uintN n;
     
     JS_ASSERT(!fp->fun);
     n = fp->script->nfixed;
     if (fp->script->regexpsOffset != 0)