Removal of the deoptimization block from Turbofan

src/compiler/common-operator.h

Index: src/compiler/common-operator.h
diff --git a/src/compiler/common-operator.h b/src/compiler/common-operator.h
index d39cd3e8a563d7b35a044e0fe1842caef91dc9f5..6fde9f181692da4f9e92b094a0ffa19903a73d2d 100644
--- a/src/compiler/common-operator.h
+++ b/src/compiler/common-operator.h
@@ -44,6 +44,28 @@ class CallOperator : public Operator1<CallDescriptor*> {
   }
 };
 
+// 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.
@@ -67,13 +89,6 @@ class CommonOperatorBuilder {
   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");
@@ -149,9 +164,10 @@ class CommonOperatorBuilder {
     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");