Removal of the deoptimization block from Turbofan

src/compiler/common-operator.h

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_COMPILER_COMMON_OPERATOR_H_
 #define V8_COMPILER_COMMON_OPERATOR_H_
 
 #include "src/v8.h"
 
 #include "src/assembler.h"
@@ skipping 26 matching lines @@
       : Operator1<CallDescriptor*>(
             IrOpcode::kCall, descriptor->properties(),
             descriptor->InputCount() + descriptor->FrameStateCount(),
             descriptor->ReturnCount(), mnemonic, descriptor) {}
 
   virtual OStream& PrintParameter(OStream& os) const {  // NOLINT
     return os << "[" << *parameter() << "]";
   }
 };
 
+// Flag that describes how to combine the current environment with
+// the output of a node to obtain a framestate for lazy bailout.
+enum OutputFrameStateCombine {
+  PUSH_OUTPUT,   // Push the output on the expression stack.

[Benedikt Meurer, 2014/09/01 09:07:05]

Nit: Can we use kPushOutput and kIgnoreOutput here? I kinda prefer to use
capitalized naming for #define's only, at least in new code.

[Jarin, 2014/09/01 09:23:34]

Done.

+  IGNORE_OUTPUT  // Use the frame state as-is.
+};
+
+
+class FrameStateCallInfo {
+ public:
+  FrameStateCallInfo(BailoutId bailout_id,
+                     OutputFrameStateCombine state_combine)
+      : bailout_id_(bailout_id), frame_state_combine_(state_combine) {}
+
+  BailoutId bailout_id() const { return bailout_id_; }
+  OutputFrameStateCombine state_combine() const { return frame_state_combine_; }
+
+ private:
+  BailoutId bailout_id_;
+  OutputFrameStateCombine frame_state_combine_;
+};
+
 // Interface for building common operators that can be used at any level of IR,
 // including JavaScript, mid-level, and low-level.
 // TODO(titzer): Move the mnemonics into SimpleOperator and Operator1 classes.
 class CommonOperatorBuilder {
  public:
   explicit CommonOperatorBuilder(Zone* zone) : zone_(zone) {}
 
 #define CONTROL_OP(name, inputs, controls)                                   \
   return new (zone_) ControlOperator(IrOpcode::k##name, Operator::kFoldable, \
                                      inputs, 0, controls, #name);
 
   Operator* Start(int num_formal_parameters) {
     // Outputs are formal parameters, plus context, receiver, and JSFunction.
     int outputs = num_formal_parameters + 3;
     return new (zone_) ControlOperator(IrOpcode::kStart, Operator::kFoldable, 0,
                                        outputs, 0, "Start");
   }
   Operator* Dead() { CONTROL_OP(Dead, 0, 0); }
   Operator* End() { CONTROL_OP(End, 0, 1); }
   Operator* Branch() { CONTROL_OP(Branch, 1, 1); }
   Operator* IfTrue() { CONTROL_OP(IfTrue, 0, 1); }
   Operator* IfFalse() { CONTROL_OP(IfFalse, 0, 1); }
   Operator* Throw() { CONTROL_OP(Throw, 1, 1); }
-  Operator* LazyDeoptimization() { CONTROL_OP(LazyDeoptimization, 0, 1); }
-  Operator* Continuation() { CONTROL_OP(Continuation, 0, 1); }
-
-  Operator* Deoptimize() {
-    return new (zone_)
-        ControlOperator(IrOpcode::kDeoptimize, 0, 1, 0, 1, "Deoptimize");
-  }
 
   Operator* Return() {
     return new (zone_) ControlOperator(IrOpcode::kReturn, 0, 1, 0, 1, "Return");
   }
 
   Operator* Merge(int controls) {
     return new (zone_) ControlOperator(IrOpcode::kMerge, Operator::kFoldable, 0,
                                        0, controls, "Merge");
   }
 
@@ skipping 55 matching lines @@
   }
   Operator* Finish(int arguments) {
     DCHECK(arguments > 0);  // Disallow empty finishes.
     return new (zone_) Operator1<int>(IrOpcode::kFinish, Operator::kPure, 1, 1,
                                       "Finish", arguments);
   }
   Operator* StateValues(int arguments) {
     return new (zone_) Operator1<int>(IrOpcode::kStateValues, Operator::kPure,
                                       arguments, 1, "StateValues", arguments);
   }
-  Operator* FrameState(BailoutId ast_id) {
-    return new (zone_) Operator1<BailoutId>(
-        IrOpcode::kFrameState, Operator::kPure, 3, 1, "FrameState", ast_id);
+  Operator* FrameState(BailoutId bailout_id, OutputFrameStateCombine combine) {
+    return new (zone_) Operator1<FrameStateCallInfo>(
+        IrOpcode::kFrameState, Operator::kPure, 4, 1, "FrameState",
+        FrameStateCallInfo(bailout_id, combine));
   }
   Operator* Call(CallDescriptor* descriptor) {
     return new (zone_) CallOperator(descriptor, "Call");
   }
   Operator* Projection(int index) {
     return new (zone_) Operator1<int>(IrOpcode::kProjection, Operator::kPure, 1,
                                       1, "Projection", index);
   }
 
  private:
@@ skipping 125 matching lines @@
 
 template <typename T>
 inline T ValueOf(Operator* op) {
   return CommonOperatorTraits<T>::ValueOf(op);
 }
 }
 }
 }  // namespace v8::internal::compiler
 
 #endif  // V8_COMPILER_COMMON_OPERATOR_H_