From bc12cb95d790185432996f1e3eb0cf584c0a3c02 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Wed, 9 Jan 2013 22:16:50 -0800
Subject: [PATCH] Bug 806206 - InlineFrameIterator: provide default scope chain
 value if unused. r=dvander

---
 js/src/ion/IonFrames.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/src/ion/IonFrames.cpp b/js/src/ion/IonFrames.cpp
index cd4ddfb6bbfd..08bc6672360f 100644
--- a/js/src/ion/IonFrames.cpp
+++ b/js/src/ion/IonFrames.cpp
@@ -1042,8 +1042,12 @@ InlineFrameIterator::scopeChain() const
 
     // scopeChain
     Value v = s.read();
-    JS_ASSERT(v.isObject());
-    return &v.toObject();
+    if (v.isObject()) {
+        JS_ASSERT_IF(script()->hasAnalysis(), script()->analysis()->usesScopeChain());
+        return &v.toObject();
+    }
+
+    return callee()->environment();
 }
 
 JSObject *