Fix breakage from bug 621137 fix.
authorBrian Hackett <bhackett1024@gmail.com>
Thu, 30 Dec 2010 06:53:18 -0800
changeset 59964 41957753e5dff95f260b1511f9034db57fc2e905
parent 59963 49eb06696448b3170d13cd63f592fde77de43e8b
child 59965 37ebdb3e7617a84ccd2f83517514eb79f812bc31
push id17820
push usercleary@mozilla.com
push dateTue, 04 Jan 2011 21:40:57 +0000
treeherdermozilla-central@969691cfe40e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs621137
milestone2.0b9pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fix breakage from bug 621137 fix.
js/src/jsopcode.cpp
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -5162,17 +5162,17 @@ js_DecompileValueGenerator(JSContext *cx
 
       release_pcstack:
         cx->free(pcstack);
         if (pcdepth < 0)
             goto do_fallback;
     }
 
     {
-        jsbytecode* pc = cx->regs->pc;
+        jsbytecode* basepc = cx->regs->pc;
         jsbytecode* savedImacropc = fp->maybeImacropc();
         if (savedImacropc) {
             JS_ASSERT(cx->hasfp());
             cx->regs->pc = savedImacropc;
             fp->clearImacropc();
         }
 
         /*
@@ -5182,17 +5182,17 @@ js_DecompileValueGenerator(JSContext *cx
         char *name;
         if (savedImacropc && size_t(pc - script->code) >= script->length)
             name = FAILED_EXPRESSION_DECOMPILER;
         else
             name = DecompileExpression(cx, script, fp->maybeFun(), pc);
 
         if (savedImacropc) {
             JS_ASSERT(cx->hasfp());
-            cx->regs->pc = pc;
+            cx->regs->pc = basepc;
             fp->setImacropc(savedImacropc);
         }
 
         if (name != FAILED_EXPRESSION_DECOMPILER)
             return name;
     }
 
   do_fallback: