Bug 474996 - JS_REQUIRES_STACK violation in TraceRecorder::hasIteratorMethod, r=jorendorff

js/src/jstracer.cpp

@@ -2805,7 +2805,7 @@ TraceRecorder::hasMethod(JSObject* obj, jsid id)
     return found;
 }
 
-bool
+JS_REQUIRES_STACK bool
 TraceRecorder::hasIteratorMethod(JSObject* obj)
 {
     JS_ASSERT(cx->fp->regs->sp + 2 <= cx->fp->slots + cx->fp->script->nslots);
@@ -3201,7 +3201,7 @@ js_RecordTree(JSContext* cx, JSTraceMonitor* tm, Fragment* f, Fragment* outer)
     return true;
 }
 
-static inline bool isSlotUndemotable(JSContext* cx, TreeInfo* ti, unsigned slot)
+JS_REQUIRES_STACK static inline bool isSlotUndemotable(JSContext* cx, TreeInfo* ti, unsigned slot)
 {
     if (slot < ti->stackSlots)
         return oracle.isStackSlotUndemotable(cx, slot);

js/src/jstracer.h

@@ -481,7 +481,7 @@ class TraceRecorder : public avmplus::GCObject {
     JS_REQUIRES_STACK void fuseIf(jsbytecode* pc, bool cond, nanojit::LIns* x);
 
     bool hasMethod(JSObject* obj, jsid id);
-    bool hasIteratorMethod(JSObject* obj);
+    JS_REQUIRES_STACK bool hasIteratorMethod(JSObject* obj);
 
 public:
     JS_REQUIRES_STACK