From a072edf190cd489a90c053e1530f7bf25c2e6387 Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Fri, 8 May 2009 16:32:35 -0400
Subject: [PATCH] Bug 492040 - js_Execute must bail off trace, r=jorendorff
 a=josh for CLOSED TREE checkin

---
 js/src/jsinterp.cpp | 2 ++
 js/src/jsinterp.h   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 5e04d8795c07..a52d55fa72fd 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1501,6 +1501,8 @@ js_Execute(JSContext *cx, JSObject *chain, JSScript *script,
     JSObject *obj, *tmp;
     JSBool ok;
 
+    js_LeaveTrace(cx);
+
 #ifdef INCLUDE_MOZILLA_DTRACE
     if (JAVASCRIPT_EXECUTE_START_ENABLED())
         jsdtrace_execute_start(script);
diff --git a/js/src/jsinterp.h b/js/src/jsinterp.h
index a2ced5ea0541..a5cea0228d78 100644
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -529,7 +529,7 @@ extern JSBool
 js_InternalGetOrSet(JSContext *cx, JSObject *obj, jsid id, jsval fval,
                     JSAccessMode mode, uintN argc, jsval *argv, jsval *rval);
 
-extern JSBool
+extern JS_FORCES_STACK JSBool
 js_Execute(JSContext *cx, JSObject *chain, JSScript *script,
            JSStackFrame *down, uintN flags, jsval *result);