Fix --disable-tracejit bustage, make some headers #include some files they need, add a forward declaration to produce the same effect in another. r=¬t-redness

js/src/jsapi-tests/testArgumentsObject.cpp

@@ -4,8 +4,6 @@
 
 #include "tests.h"
 
-#include "jscntxt.h"
-#include "jstracer.h"
 #include "vm/Stack-inl.h"
 
 using namespace js;

js/src/vm/Stack-inl.h

@@ -41,6 +41,9 @@
 #ifndef Stack_inl_h__
 #define Stack_inl_h__
 
+#include "jscntxt.h"
+#include "jstracer.h"
+
 #include "Stack.h"
 
 #include "ArgumentsObject-inl.h"
@@ -738,6 +741,7 @@ StackSpace::activeFirstUnused() const
     return max;
 }
 
+#ifdef JS_TRACER
 JS_ALWAYS_INLINE bool
 StackSpace::ensureEnoughSpaceToEnterTrace()
 {
@@ -749,6 +753,7 @@ StackSpace::ensureEnoughSpaceToEnterTrace()
     return end_ - firstUnused() > needed;
 #endif
 }
+#endif
 
 STATIC_POSTCONDITION(!return || ubound(from) >= nvals)
 JS_ALWAYS_INLINE bool

js/src/vm/Stack.h

@@ -43,6 +43,8 @@
 
 #include "jsfun.h"
 
+struct JSContext;
+
 namespace js {
 
 class StackFrame;
@@ -1082,6 +1084,7 @@ class StackSpace
      */
     JSObject &varObjForFrame(const StackFrame *fp);
 
+#ifdef JS_TRACER
     /*
      * LeaveTree requires stack allocation to rebuild the stack. There is no
      * good way to handle an OOM for these allocations, so this function checks
@@ -1089,6 +1092,7 @@ class StackSpace
      * conservative upper bound.
      */
     inline bool ensureEnoughSpaceToEnterTrace();
+#endif
 
     /*
      * If we let infinite recursion go until it hit the end of the contiguous