Bug 663666 - Backed out changeset d21c370f1009 (backs out bug 650874), a=LegNeato
authorChristian Legnitto <clegnitto@mozilla.com>
Mon, 13 Jun 2011 12:53:00 -0700
changeset 27425 df1ac32df5d51eecbb5eeb8bc27de79aa7e9461d
parent 27424 d21c370f100927128401abeddfb3d59dabd873b8
child 27426 0efb6d76d4192e2bd657780dea0facaaf98d6cad
push id2730
push userclegnitto@mozilla.com
push dateMon, 13 Jun 2011 19:53:13 +0000
reviewersLegNeato
bugs663666, 650874
milestone1.9.1.20pre
Bug 663666 - Backed out changeset d21c370f1009 (backs out bug 650874), 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_CONSTOBJ(globalObj));
+    stack(1, INS_CONSTPTR(NULL));
     return JSRS_CONTINUE;
 }
 
 JS_REQUIRES_STACK JSRecordingStatus
 TraceRecorder::record_JSOP_CALLLOCAL()
 {
     uintN slot = GET_SLOTNO(cx->fp->regs->pc);
     stack(0, var(slot));