Bug 650874 - Fix correctness issue with JSOP_CALLGVAR, r=gal,dvander, a=LegNeato
authorLuke Wagner <luke@mozilla.com>
Fri, 10 Jun 2011 15:23:26 -0700
changeset 27424 d21c370f100927128401abeddfb3d59dabd873b8
parent 27423 5eb1fd50c7ad37149f47dcfd916e25ed97b84329
child 27425 df1ac32df5d51eecbb5eeb8bc27de79aa7e9461d
push id2729
push userclegnitto@mozilla.com
push dateFri, 10 Jun 2011 22:23:50 +0000
reviewersgal, dvander, LegNeato
bugs650874
milestone1.9.1.20pre
Bug 650874 - Fix correctness issue with JSOP_CALLGVAR, r=gal,dvander, a=LegNeato
js/src/jstracer.cpp
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -10718,17 +10718,17 @@ TraceRecorder::record_JSOP_CALLGVAR()
 
     uint32 slot = JSVAL_TO_INT(slotval);
 
     if (!lazilyImportGlobalSlot(slot))
          ABORT_TRACE("lazy import of global slot failed");
 
     jsval& v = STOBJ_GET_SLOT(globalObj, slot);
     stack(0, get(&v));
-    stack(1, INS_CONSTPTR(NULL));
+    stack(1, INS_CONSTOBJ(globalObj));
     return JSRS_CONTINUE;
 }
 
 JS_REQUIRES_STACK JSRecordingStatus
 TraceRecorder::record_JSOP_CALLLOCAL()
 {
     uintN slot = GET_SLOTNO(cx->fp->regs->pc);
     stack(0, var(slot));