Bug 1037470 - Fix debug build bustage with Ion disabled. r=jandem
authorMartin Stransky <stransky@redhat.com>
Fri, 11 Jul 2014 08:28:00 -0400
changeset 215730 46229cdd48f4bafbb5660d1a533449deff0c6bd3
parent 215729 c274ab1b4086c248d1e0a21f33b38043c4f1f184
child 215731 8b9e1310637c46d865b3f180efb36e0ba6ea72d5
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem
bugs1037470
milestone33.0a1
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
Bug 1037470 - Fix debug build bustage with Ion disabled. r=jandem
js/src/vm/Debugger.cpp
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -4178,17 +4178,17 @@ static const JSFunctionSpec DebuggerSour
 
 
 /*** Debugger.Frame ******************************************************************************/
 
 static void
 UpdateFrameIterPc(FrameIter &iter)
 {
     if (iter.abstractFramePtr().isRematerializedFrame()) {
-#ifdef DEBUG
+#if defined(DEBUG) && defined(JS_ION)
         // Rematerialized frames don't need their pc updated. The reason we
         // need to update pc is because we might get the same Debugger.Frame
         // object for multiple re-entries into debugger code from debuggee
         // code. This reentrancy is not possible with rematerialized frames,
         // because when returning to debuggee code, we would have bailed out
         // to baseline.
         //
         // We walk the stack to assert that it doesn't need updating.