Backout 476a4bbbfdb2 (bug 890722) on a CLOSED TREE for breaking debug mochitests

js/src/ion/IonBuilder.cpp

@@ -50,8 +50,7 @@ IonBuilder::IonBuilder(JSContext *cx, TempAllocator *temp, MIRGraph *graph,
     failedShapeGuard_(info->script()->failedShapeGuard),
     nonStringIteration_(false),
     lazyArguments_(NULL),
-    inlineCallInfo_(NULL),
-    retval_(NULL)
+    inlineCallInfo_(NULL)
 {
     script_.init(info->script());
     pc = info->startPC();
@@ -1101,7 +1100,6 @@ IonBuilder::snoopControlFlow(JSOp op)
 
       case JSOP_RETURN:
       case JSOP_STOP:
-      case JSOP_RETRVAL:
         return processReturn(op);
 
       case JSOP_THROW:
@@ -1513,11 +1511,6 @@ IonBuilder::inspectOpcode(JSOp op)
       case JSOP_INSTANCEOF:
         return jsop_instanceof();
 
-      case JSOP_SETRVAL:
-        JS_ASSERT(!retval_);
-        retval_ = current->pop();
-        return true;
-
       default:
 #ifdef DEBUG
         return abort("Unsupported opcode: %s (line %d)", js_CodeName[op], info().lineno(cx, pc));
@@ -3195,12 +3188,6 @@ IonBuilder::processReturn(JSOp op)
         break;
       }
 
-      case JSOP_RETRVAL:
-        JS_ASSERT(retval_ && current == retval_->block());
-        def = retval_;
-        retval_ = NULL;
-        break;
-
       default:
         def = NULL;
         MOZ_ASSUME_UNREACHABLE("unknown return op");

js/src/ion/IonBuilder.h

@@ -649,9 +649,6 @@ class IonBuilder : public MIRGenerator
 
     // If this is an inline builder, the call info for the builder.
     const CallInfo *inlineCallInfo_;
-
-    // return value (if not immediatly returning)
-    MDefinition *retval_;
 };
 
 class CallInfo