Mark some common operator with Property::kNoThrow.

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 100 matching lines @@
 
 size_t ProjectionIndexOf(const Operator* const op) {
   DCHECK_EQ(IrOpcode::kProjection, op->opcode());
   return OpParameter<size_t>(op);
 }
 
 
 #define CACHED_OP_LIST(V)                                  \
   V(Always, Operator::kPure, 0, 0, 0, 1, 0, 0)             \
   V(Dead, Operator::kFoldable, 0, 0, 0, 0, 0, 1)           \
-  V(End, Operator::kFoldable, 0, 0, 1, 0, 0, 0)            \
-  V(IfTrue, Operator::kFoldable, 0, 0, 1, 0, 0, 1)         \
-  V(IfFalse, Operator::kFoldable, 0, 0, 1, 0, 0, 1)        \
+  V(End, Operator::kKontrol, 0, 0, 1, 0, 0, 0)             \
+  V(IfTrue, Operator::kKontrol, 0, 0, 1, 0, 0, 1)          \
+  V(IfFalse, Operator::kKontrol, 0, 0, 1, 0, 0, 1)         \
   V(Throw, Operator::kFoldable, 1, 1, 1, 0, 0, 1)          \
-  V(Return, Operator::kNoProperties, 1, 1, 1, 0, 0, 1)     \
+  V(Return, Operator::kNoThrow, 1, 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)
 
 
 #define CACHED_LOOP_LIST(V) \
   V(1)                      \
   V(2)
 
 
 #define CACHED_MERGE_LIST(V) \
@@ skipping 28 matching lines @@
                    value_output_count, effect_output_count,                  \
                    control_output_count) {}                                  \
   };                                                                         \
   Name##Operator k##Name##Operator;
   CACHED_OP_LIST(CACHED)
 #undef CACHED
 
   template <BranchHint kBranchHint>
   struct BranchOperator FINAL : public Operator1<BranchHint> {
     BranchOperator()
-        : Operator1<BranchHint>(                       // --
-              IrOpcode::kBranch, Operator::kFoldable,  // opcode
-              "Branch",                                // name
-              1, 0, 1, 0, 0, 2,                        // counts
-              kBranchHint) {}                          // parameter
+        : Operator1<BranchHint>(                      // --
+              IrOpcode::kBranch, Operator::kKontrol,  // opcode
+              "Branch",                               // name
+              1, 0, 1, 0, 0, 2,                       // counts
+              kBranchHint) {}                         // parameter
   };
   BranchOperator<BranchHint::kNone> kBranchNoneOperator;
   BranchOperator<BranchHint::kTrue> kBranchTrueOperator;
   BranchOperator<BranchHint::kFalse> kBranchFalseOperator;
 
   template <size_t kInputCount>
   struct LoopOperator FINAL : public Operator {
     LoopOperator()
-        : Operator(                                  // --
-              IrOpcode::kLoop, Operator::kFoldable,  // opcode
-              "Loop",                                // name
-              0, 0, kInputCount, 0, 0, 1) {}         // counts
+        : Operator(                                 // --
+              IrOpcode::kLoop, Operator::kKontrol,  // opcode
+              "Loop",                               // name
+              0, 0, kInputCount, 0, 0, 1) {}        // counts
   };
 #define CACHED_LOOP(input_count) \
   LoopOperator<input_count> kLoop##input_count##Operator;
   CACHED_LOOP_LIST(CACHED_LOOP)
 #undef CACHED_LOOP
 
   template <size_t kInputCount>
   struct MergeOperator FINAL : public Operator {
     MergeOperator()
-        : Operator(                                   // --
-              IrOpcode::kMerge, Operator::kFoldable,  // opcode
-              "Merge",                                // name
-              0, 0, kInputCount, 0, 0, 1) {}          // counts
+        : Operator(                                  // --
+              IrOpcode::kMerge, Operator::kKontrol,  // opcode
+              "Merge",                               // name
+              0, 0, kInputCount, 0, 0, 1) {}         // counts
   };
 #define CACHED_MERGE(input_count) \
   MergeOperator<input_count> kMerge##input_count##Operator;
   CACHED_MERGE_LIST(CACHED_MERGE)
 #undef CACHED_MERGE
 
   template <int kIndex>
   struct ParameterOperator FINAL : public Operator1<int> {
     ParameterOperator()
-        : Operator1<int>(                                // --
-              IrOpcode::kParameter,                      // opcode
-              Operator::kFoldable | Operator::kNoThrow,  // flags
-              "Parameter",                               // name
-              1, 0, 0, 1, 0, 0,                          // counts,
-              kIndex) {}                                 // parameter
+        : Operator1<int>(                             // --
+              IrOpcode::kParameter, Operator::kPure,  // opcode
+              "Parameter",                            // name
+              1, 0, 0, 1, 0, 0,                       // counts,
+              kIndex) {}                              // parameter
   };
 #define CACHED_PARAMETER(index) \
   ParameterOperator<index> kParameter##index##Operator;
   CACHED_PARAMETER_LIST(CACHED_PARAMETER)
 #undef CACHED_PARAMETER
 };
 
 
 static base::LazyInstance<CommonOperatorGlobalCache>::type kCache =
     LAZY_INSTANCE_INITIALIZER;
@@ skipping 21 matching lines @@
       return &cache_.kBranchTrueOperator;
     case BranchHint::kFalse:
       return &cache_.kBranchFalseOperator;
   }
   UNREACHABLE();
   return nullptr;
 }
 
 
 const Operator* CommonOperatorBuilder::Switch(size_t control_output_count) {
-  DCHECK_GE(control_output_count, 2u);         // Disallow trivial switches.
-  return new (zone()) Operator(                // --
-      IrOpcode::kSwitch, Operator::kFoldable,  // opcode
-      "Switch",                                // name
-      1, 0, 1, 0, 0, control_output_count);    // counts
+  DCHECK_GE(control_output_count, 2u);        // Disallow trivial switches.
+  return new (zone()) Operator(               // --
+      IrOpcode::kSwitch, Operator::kKontrol,  // opcode
+      "Switch",                               // name
+      1, 0, 1, 0, 0, control_output_count);   // counts
 }
 
 
 const Operator* CommonOperatorBuilder::Case(size_t index) {
-  return new (zone()) Operator1<size_t>(     // --
-      IrOpcode::kCase, Operator::kFoldable,  // opcode
-      "Case",                                // name
-      0, 0, 1, 0, 0, 1,                      // counts
-      index);                                // parameter
+  return new (zone()) Operator1<size_t>(    // --
+      IrOpcode::kCase, Operator::kKontrol,  // opcode
+      "Case",                               // name
+      0, 0, 1, 0, 0, 1,                     // counts
+      index);                               // parameter
 }
 
 
 const Operator* CommonOperatorBuilder::Start(int num_formal_parameters) {
   // Outputs are formal parameters, plus context, receiver, and JSFunction.
   const int value_output_count = num_formal_parameters + 3;
   return new (zone()) Operator(               // --
       IrOpcode::kStart, Operator::kFoldable,  // opcode
       "Start",                                // name
       0, 0, 0, value_output_count, 1, 1);     // counts
 }
 
 
 const Operator* CommonOperatorBuilder::Loop(int control_input_count) {
   switch (control_input_count) {
 #define CACHED_LOOP(input_count) \
   case input_count:              \
     return &cache_.kLoop##input_count##Operator;
     CACHED_LOOP_LIST(CACHED_LOOP)
 #undef CACHED_LOOP
     default:
       break;
   }
   // Uncached.
-  return new (zone()) Operator(              // --
-      IrOpcode::kLoop, Operator::kFoldable,  // opcode
-      "Loop",                                // name
-      0, 0, control_input_count, 0, 0, 1);   // counts
+  return new (zone()) Operator(             // --
+      IrOpcode::kLoop, Operator::kKontrol,  // opcode
+      "Loop",                               // name
+      0, 0, control_input_count, 0, 0, 1);  // counts
 }
 
 
 const Operator* CommonOperatorBuilder::Merge(int control_input_count) {
   switch (control_input_count) {
 #define CACHED_MERGE(input_count) \
   case input_count:               \
     return &cache_.kMerge##input_count##Operator;
     CACHED_MERGE_LIST(CACHED_MERGE)
 #undef CACHED_MERGE
     default:
       break;
   }
   // Uncached.
-  return new (zone()) Operator(               // --
-      IrOpcode::kMerge, Operator::kFoldable,  // opcode
-      "Merge",                                // name
-      0, 0, control_input_count, 0, 0, 1);    // counts
+  return new (zone()) Operator(              // --
+      IrOpcode::kMerge, Operator::kKontrol,  // opcode
+      "Merge",                               // name
+      0, 0, control_input_count, 0, 0, 1);   // counts
 }
 
 
 const Operator* CommonOperatorBuilder::Parameter(int index) {
   switch (index) {
 #define CACHED_PARAMETER(index) \
   case index:                   \
     return &cache_.kParameter##index##Operator;
     CACHED_PARAMETER_LIST(CACHED_PARAMETER)
 #undef CACHED_PARAMETER
     default:
       break;
   }
   // Uncached.
-  return new (zone()) Operator1<int>(            // --
-      IrOpcode::kParameter,                      // opcode
-      Operator::kFoldable | Operator::kNoThrow,  // flags
-      "Parameter",                               // name
-      1, 0, 0, 1, 0, 0,                          // counts
-      index);                                    // parameter
+  return new (zone()) Operator1<int>(         // --
+      IrOpcode::kParameter, Operator::kPure,  // opcode
+      "Parameter",                            // name
+      1, 0, 0, 1, 0, 0,                       // counts
+      index);                                 // parameter
 }
 
 
 const Operator* CommonOperatorBuilder::OsrValue(int index) {
   return new (zone()) Operator1<int>(                // --
       IrOpcode::kOsrValue, Operator::kNoProperties,  // opcode
       "OsrValue",                                    // name
       0, 0, 1, 1, 0, 0,                              // counts
       index);                                        // parameter
 }
@@ skipping 185 matching lines @@
   } else {
     UNREACHABLE();
     return nullptr;
   }
 }
 
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8