[turbofan] Remove IfExceptionHint from exception projections.

src/compiler/common-operator.cc

 // 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.
 
 #include "src/compiler/common-operator.h"
 
 #include "src/assembler.h"
 #include "src/base/lazy-instance.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/opcodes.h"
@@ skipping 57 matching lines @@
 
 std::ostream& operator<<(std::ostream& os, DeoptimizeParameters p) {
   return os << p.kind() << ":" << p.reason();
 }
 
 DeoptimizeParameters const& DeoptimizeParametersOf(Operator const* const op) {
   DCHECK_EQ(IrOpcode::kDeoptimize, op->opcode());
   return OpParameter<DeoptimizeParameters>(op);
 }
 
-IfExceptionHint ExceptionHintFromCatchPrediction(
-    HandlerTable::CatchPrediction prediction) {
-  switch (prediction) {
-    case HandlerTable::UNCAUGHT:
-      return IfExceptionHint::kLocallyUncaught;
-    case HandlerTable::CAUGHT:
-      return IfExceptionHint::kLocallyCaught;
-    case HandlerTable::PROMISE:
-      return IfExceptionHint::kLocallyCaughtForPromiseReject;
-  }
-  UNREACHABLE();
-  return IfExceptionHint::kLocallyUncaught;
-}
-
-size_t hash_value(IfExceptionHint hint) { return static_cast<size_t>(hint); }
-
-
-std::ostream& operator<<(std::ostream& os, IfExceptionHint hint) {
-  switch (hint) {
-    case IfExceptionHint::kLocallyUncaught:
-      return os << "Uncaught";
-    case IfExceptionHint::kLocallyCaught:
-      return os << "Caught";
-    case IfExceptionHint::kLocallyCaughtForPromiseReject:
-      return os << "CaughtForPromiseReject";
-  }
-  UNREACHABLE();
-  return os;
-}
-
 
 bool operator==(SelectParameters const& lhs, SelectParameters const& rhs) {
   return lhs.representation() == rhs.representation() &&
          lhs.hint() == rhs.hint();
 }
 
 
 bool operator!=(SelectParameters const& lhs, SelectParameters const& rhs) {
   return !(lhs == rhs);
 }
@@ skipping 115 matching lines @@
     os << elem;
   }
   return os;
 }
 
 #define CACHED_OP_LIST(V)                                  \
   V(Dead, Operator::kFoldable, 0, 0, 0, 1, 1, 1)           \
   V(IfTrue, Operator::kKontrol, 0, 0, 1, 0, 0, 1)          \
   V(IfFalse, Operator::kKontrol, 0, 0, 1, 0, 0, 1)         \
   V(IfSuccess, Operator::kKontrol, 0, 0, 1, 0, 0, 1)       \
+  V(IfException, Operator::kKontrol, 0, 1, 1, 1, 1, 1)     \
   V(IfDefault, Operator::kKontrol, 0, 0, 1, 0, 0, 1)       \
   V(Throw, Operator::kKontrol, 1, 1, 1, 0, 0, 1)           \
   V(Terminate, Operator::kKontrol, 0, 1, 1, 0, 0, 1)       \
   V(OsrNormalEntry, Operator::kFoldable, 0, 1, 1, 0, 1, 1) \
   V(OsrLoopEntry, Operator::kFoldable, 0, 1, 1, 0, 1, 1)   \
   V(LoopExit, Operator::kKontrol, 0, 0, 2, 0, 0, 1)        \
   V(LoopExitValue, Operator::kPure, 1, 0, 1, 1, 0, 0)      \
   V(LoopExitEffect, Operator::kNoThrow, 0, 1, 1, 0, 1, 0)  \
   V(Checkpoint, Operator::kKontrol, 0, 1, 1, 0, 1, 0)      \
   V(FinishRegion, Operator::kKontrol, 1, 1, 0, 1, 1, 0)    \
@@ skipping 98 matching lines @@
     Name##Operator()                                                         \
         : Operator(IrOpcode::k##Name, properties, #Name, value_input_count,  \
                    effect_input_count, control_input_count,                  \
                    value_output_count, effect_output_count,                  \
                    control_output_count) {}                                  \
   };                                                                         \
   Name##Operator k##Name##Operator;
   CACHED_OP_LIST(CACHED)
 #undef CACHED
 
-  template <IfExceptionHint kCaughtLocally>
-  struct IfExceptionOperator final : public Operator1<IfExceptionHint> {
-    IfExceptionOperator()
-        : Operator1<IfExceptionHint>(                      // --
-              IrOpcode::kIfException, Operator::kKontrol,  // opcode
-              "IfException",                               // name
-              0, 1, 1, 1, 1, 1,                            // counts
-              kCaughtLocally) {}                           // parameter
-  };
-  IfExceptionOperator<IfExceptionHint::kLocallyUncaught> kIfExceptionUOperator;
-  IfExceptionOperator<IfExceptionHint::kLocallyCaught> kIfExceptionCOperator;
-  IfExceptionOperator<IfExceptionHint::kLocallyCaughtForPromiseReject>
-      kIfExceptionPOperator;
-
   template <size_t kInputCount>
   struct EndOperator final : public Operator {
     EndOperator()
         : Operator(                                // --
               IrOpcode::kEnd, Operator::kKontrol,  // opcode
               "End",                               // name
               0, 0, kInputCount, 0, 0, 0) {}       // counts
   };
 #define CACHED_END(input_count) \
   EndOperator<input_count> kEnd##input_count##Operator;
@@ skipping 246 matching lines @@
     DeoptimizeReason reason) {
   // TODO(turbofan): Cache the most common versions of this.
   return new (zone()) Operator1<DeoptimizeReason>(  // --
       IrOpcode::kDeoptimizeUnless,                  // opcode
       Operator::kFoldable | Operator::kNoThrow,     // properties
       "DeoptimizeUnless",                           // name
       2, 1, 1, 0, 1, 1,                             // counts
       reason);                                      // parameter
 }
 
-const Operator* CommonOperatorBuilder::IfException(IfExceptionHint hint) {
-  switch (hint) {
-    case IfExceptionHint::kLocallyUncaught:
-      return &cache_.kIfExceptionUOperator;
-    case IfExceptionHint::kLocallyCaught:
-      return &cache_.kIfExceptionCOperator;
-    case IfExceptionHint::kLocallyCaughtForPromiseReject:
-      return &cache_.kIfExceptionPOperator;
-  }
-  UNREACHABLE();
-  return nullptr;
-}
-
 
 const Operator* CommonOperatorBuilder::Switch(size_t control_output_count) {
   return new (zone()) Operator(               // --
       IrOpcode::kSwitch, Operator::kKontrol,  // opcode
       "Switch",                               // name
       1, 0, 1, 0, 0, control_output_count);   // counts
 }
 
 
 const Operator* CommonOperatorBuilder::IfValue(int32_t index) {
@@ skipping 367 matching lines @@
 CommonOperatorBuilder::CreateFrameStateFunctionInfo(
     FrameStateType type, int parameter_count, int local_count,
     Handle<SharedFunctionInfo> shared_info) {
   return new (zone()->New(sizeof(FrameStateFunctionInfo)))
       FrameStateFunctionInfo(type, parameter_count, local_count, shared_info);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8