Merge.
authorDavid Anderson <danderson@mozilla.com>
Wed, 13 Aug 2008 17:46:58 -0700
changeset 18153 8c2a3e462e6c807154095fee051f92205e4df931
parent 18152 4d81cfd3f6e4bd20bc76626faffd39ff770c629c (current diff)
parent 18150 3f7b8558a1a7ca6d5f0162dcd0d33e94240502fd (diff)
child 18155 58d063dff82eadb93211cc48e054dec0acd5e4f6
child 18161 a7108427de3e55f120b5f2204c151cc792d50587
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1a2pre
Merge.
js/src/jstracer.cpp
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -2689,27 +2689,27 @@ TraceRecorder::record_EnterFrame()
     return true;
 }
 
 bool
 TraceRecorder::record_LeaveFrame()
 {
 #ifdef DEBUG
     if (cx->fp->fun)
-        printf("LeaveFrame (back to %s), callDept=%d\n", 
+        printf("LeaveFrame (back to %s), callDepth=%d\n", 
                js_AtomToPrintableString(cx, cx->fp->fun->atom),
                callDepth);
 #endif    
     if (callDepth-- <= 0)
         return false;
 
     // LeaveFrame gets called after the interpreter popped the frame and
     // stored rval, so cx->fp not cx->fp->down, and -1 not 0.
     atoms = cx->fp->script->atomMap.vector;
-    stack(-1, rval_ins);
+    set(&stackval(-1), rval_ins, true);
     return true;
 }
 
 bool TraceRecorder::record_JSOP_INTERRUPT()
 {
     return false;
 }