Revert of [compiler] Pass deoptimization_kind through DeoptimizeParameters and FlagsContinuation

src/compiler/instruction-selector-impl.h

 // Copyright 2014 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_INSTRUCTION_SELECTOR_IMPL_H_
 #define V8_COMPILER_INSTRUCTION_SELECTOR_IMPL_H_
 
 #include "src/compiler/instruction-selector.h"
 #include "src/compiler/instruction.h"
 #include "src/compiler/linkage.h"
@@ skipping 332 matching lines @@
       : mode_(kFlags_branch),
         condition_(condition),
         true_block_(true_block),
         false_block_(false_block) {
     DCHECK_NOT_NULL(true_block);
     DCHECK_NOT_NULL(false_block);
   }
 
   // Creates a new flags continuation for an eager deoptimization exit.
   static FlagsContinuation ForDeoptimize(FlagsCondition condition,
-                                         DeoptimizeKind kind,
                                          DeoptimizeReason reason,
                                          Node* frame_state) {
-    return FlagsContinuation(condition, kind, reason, frame_state);
+    return FlagsContinuation(condition, reason, frame_state);
   }
 
   // Creates a new flags continuation for a boolean value.
   static FlagsContinuation ForSet(FlagsCondition condition, Node* result) {
     return FlagsContinuation(condition, result);
   }
 
   // Creates a new flags continuation for a wasm trap.
   static FlagsContinuation ForTrap(FlagsCondition condition,
                                    Runtime::FunctionId trap_id, Node* result) {
     return FlagsContinuation(condition, trap_id, result);
   }
 
   bool IsNone() const { return mode_ == kFlags_none; }
   bool IsBranch() const { return mode_ == kFlags_branch; }
   bool IsDeoptimize() const { return mode_ == kFlags_deoptimize; }
   bool IsSet() const { return mode_ == kFlags_set; }
   bool IsTrap() const { return mode_ == kFlags_trap; }
   FlagsCondition condition() const {
     DCHECK(!IsNone());
     return condition_;
   }
-  DeoptimizeKind kind() const {
-    DCHECK(IsDeoptimize());
-    return kind_;
-  }
   DeoptimizeReason reason() const {
     DCHECK(IsDeoptimize());
     return reason_;
   }
   Node* frame_state() const {
     DCHECK(IsDeoptimize());
     return frame_state_or_result_;
   }
   Node* result() const {
     DCHECK(IsSet());
@@ skipping 53 matching lines @@
   // Encodes this flags continuation into the given opcode.
   InstructionCode Encode(InstructionCode opcode) {
     opcode |= FlagsModeField::encode(mode_);
     if (mode_ != kFlags_none) {
       opcode |= FlagsConditionField::encode(condition_);
     }
     return opcode;
   }
 
  private:
-  FlagsContinuation(FlagsCondition condition, DeoptimizeKind kind,
-                    DeoptimizeReason reason, Node* frame_state)
+  FlagsContinuation(FlagsCondition condition, DeoptimizeReason reason,
+                    Node* frame_state)
       : mode_(kFlags_deoptimize),
         condition_(condition),
-        kind_(kind),
         reason_(reason),
         frame_state_or_result_(frame_state) {
     DCHECK_NOT_NULL(frame_state);
   }
   FlagsContinuation(FlagsCondition condition, Node* result)
       : mode_(kFlags_set),
         condition_(condition),
         frame_state_or_result_(result) {
     DCHECK_NOT_NULL(result);
   }
 
   FlagsContinuation(FlagsCondition condition, Runtime::FunctionId trap_id,
                     Node* result)
       : mode_(kFlags_trap),
         condition_(condition),
         frame_state_or_result_(result),
         trap_id_(trap_id) {
     DCHECK_NOT_NULL(result);
   }
 
   FlagsMode const mode_;
   FlagsCondition condition_;
-  DeoptimizeKind kind_;          // Only valid if mode_ == kFlags_deoptimize
-  DeoptimizeReason reason_;      // Only valid if mode_ == kFlags_deoptimize
+  DeoptimizeReason reason_;      // Only value if mode_ == kFlags_deoptimize
   Node* frame_state_or_result_;  // Only valid if mode_ == kFlags_deoptimize
                                  // or mode_ == kFlags_set.
   BasicBlock* true_block_;       // Only valid if mode_ == kFlags_branch.
   BasicBlock* false_block_;      // Only valid if mode_ == kFlags_branch.
   Runtime::FunctionId trap_id_;  // Only valid if mode_ == kFlags_trap.
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_INSTRUCTION_SELECTOR_IMPL_H_