From 9936709fd757d1b790e50cc87fc4d810d9b0306d Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 15 Oct 2009 15:57:15 -0700 Subject: [PATCH] Fixed another bogus assertion (bug 522569, r=brendan). --- js/src/jstracer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp index 2f945993cc9..5eef4f86287 100644 --- a/js/src/jstracer.cpp +++ b/js/src/jstracer.cpp @@ -6374,7 +6374,12 @@ ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount, state->sp = stack_buffer + (ti->nativeStackBase/sizeof(double)); state->eos = stack_buffer + MAX_NATIVE_STACK_SLOTS; - JS_ASSERT(JS_MAX_INLINE_CALL_COUNT > inlineCallCount); + /* + * inlineCallCount has already been incremented, if being invoked from + * EnterFrame. It is okay to have a 0-frame restriction since the JIT + * might not need any frames. + */ + JS_ASSERT(inlineCallCount <= JS_MAX_INLINE_CALL_COUNT); /* Set up the native call stack frame. */ FrameInfo* callstack_buffer[MAX_CALL_STACK_ENTRIES];