[strong] Refactor ObjectStrength into a replacement for strong boolean args

src/compiler/js-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/js-operator.h"
 
 #include <limits>
 
 #include "src/base/lazy-instance.h"
 #include "src/compiler/opcodes.h"
@@ skipping 316 matching lines @@
   V(ForInPrepare, Operator::kNoProperties, 1, 3)          \
   V(ForInStep, Operator::kPure, 1, 1)                     \
   V(StackCheck, Operator::kNoProperties, 0, 0)            \
   V(CreateFunctionContext, Operator::kNoProperties, 1, 1) \
   V(CreateWithContext, Operator::kNoProperties, 2, 1)     \
   V(CreateBlockContext, Operator::kNoProperties, 2, 1)    \
   V(CreateModuleContext, Operator::kNoProperties, 2, 1)   \
   V(CreateScriptContext, Operator::kNoProperties, 2, 1)
 
 
-#define CACHED_OP_LIST_WITH_LANGUAGE_MODE(V)           \
+#define CACHED_OP_LIST_WITH_STRENGTH(V)                \
   V(LessThan, Operator::kNoProperties, 2, 1)           \
   V(GreaterThan, Operator::kNoProperties, 2, 1)        \
   V(LessThanOrEqual, Operator::kNoProperties, 2, 1)    \
   V(GreaterThanOrEqual, Operator::kNoProperties, 2, 1) \
   V(BitwiseOr, Operator::kNoProperties, 2, 1)          \
   V(BitwiseXor, Operator::kNoProperties, 2, 1)         \
   V(BitwiseAnd, Operator::kNoProperties, 2, 1)         \
   V(ShiftLeft, Operator::kNoProperties, 2, 1)          \
   V(ShiftRight, Operator::kNoProperties, 2, 1)         \
   V(ShiftRightLogical, Operator::kNoProperties, 2, 1)  \
   V(Add, Operator::kNoProperties, 2, 1)                \
   V(Subtract, Operator::kNoProperties, 2, 1)           \
   V(Multiply, Operator::kNoProperties, 2, 1)           \
   V(Divide, Operator::kNoProperties, 2, 1)             \
-  V(Modulus, Operator::kNoProperties, 2, 1)            \
-  V(StoreProperty, Operator::kNoProperties, 3, 0)
+  V(Modulus, Operator::kNoProperties, 2, 1)
 
 
 struct JSOperatorGlobalCache final {
 #define CACHED(Name, properties, value_input_count, value_output_count)  \
   struct Name##Operator final : public Operator {                        \
     Name##Operator()                                                     \
         : Operator(IrOpcode::kJS##Name, properties, "JS" #Name,          \
                    value_input_count, Operator::ZeroIfPure(properties),  \
                    Operator::ZeroIfEliminatable(properties),             \
                    value_output_count, Operator::ZeroIfPure(properties), \
                    Operator::ZeroIfNoThrow(properties)) {}               \
   };                                                                     \
   Name##Operator k##Name##Operator;
   CACHED_OP_LIST(CACHED)
 #undef CACHED
 
 
-#define CACHED_WITH_LANGUAGE_MODE(Name, properties, value_input_count,        \
-                                  value_output_count)                         \
-  template <LanguageMode kLanguageMode>                                       \
-  struct Name##Operator final : public Operator1<LanguageMode> {              \
+#define CACHED_WITH_STRENGTH(Name, properties, value_input_count,             \
+                             value_output_count)                              \
+  template <Strength kStrength>                                               \
+  struct Name##Operator final : public Operator1<Strength> {                  \
     Name##Operator()                                                          \
-        : Operator1<LanguageMode>(                                            \
+        : Operator1<Strength>(                                                \
               IrOpcode::kJS##Name, properties, "JS" #Name, value_input_count, \
               Operator::ZeroIfPure(properties),                               \
               Operator::ZeroIfEliminatable(properties), value_output_count,   \
               Operator::ZeroIfPure(properties),                               \
-              Operator::ZeroIfNoThrow(properties), kLanguageMode) {}          \
+              Operator::ZeroIfNoThrow(properties), kStrength) {}              \
   };                                                                          \
-  Name##Operator<SLOPPY> k##Name##SloppyOperator;                             \
-  Name##Operator<STRICT> k##Name##StrictOperator;                             \
-  Name##Operator<STRONG> k##Name##StrongOperator;
-  CACHED_OP_LIST_WITH_LANGUAGE_MODE(CACHED_WITH_LANGUAGE_MODE)
-#undef CACHED_WITH_LANGUAGE_MODE
+  Name##Operator<Strength::NORMAL> k##Name##SloppyOperator;                   \
+  Name##Operator<Strength::STRONG> k##Name##StrongOperator;
+  CACHED_OP_LIST_WITH_STRENGTH(CACHED_WITH_STRENGTH)
+#undef CACHED_WITH_STRENGTH
+
+
+  template <LanguageMode kLanguageMode>
+  struct StorePropertyOperator final : public Operator1<LanguageMode> {
+    StorePropertyOperator()
+        : Operator1<LanguageMode>(IrOpcode::kJSStoreProperty,
+                                  Operator::kNoProperties, "JSStoreProperty", 3,
+                                  1, 1, 0, 1, 2, kLanguageMode) {}
+  };
+  StorePropertyOperator<SLOPPY> kStorePropertySloppyOperator;
+  StorePropertyOperator<STRICT> kStorePropertyStrictOperator;
+  StorePropertyOperator<STRONG> kStorePropertyStrongOperator;
 };
 
 
 static base::LazyInstance<JSOperatorGlobalCache>::type kCache =
     LAZY_INSTANCE_INITIALIZER;
 
 
 JSOperatorBuilder::JSOperatorBuilder(Zone* zone)
     : cache_(kCache.Get()), zone_(zone) {}
 
 
 #define CACHED(Name, properties, value_input_count, value_output_count) \
   const Operator* JSOperatorBuilder::Name() {                           \
     return &cache_.k##Name##Operator;                                   \
   }
 CACHED_OP_LIST(CACHED)
 #undef CACHED
 
 
-#define CACHED_WITH_LANGUAGE_MODE(Name, properties, value_input_count,  \
-                                  value_output_count)                   \
-  const Operator* JSOperatorBuilder::Name(LanguageMode language_mode) { \
-    switch (language_mode) {                                            \
-      case SLOPPY:                                                      \
-        return &cache_.k##Name##SloppyOperator;                         \
-      case STRICT:                                                      \
-        return &cache_.k##Name##StrictOperator;                         \
-      case STRONG:                                                      \
-        return &cache_.k##Name##StrongOperator;                         \
-      case STRONG_BIT:                                                  \
-        break; /* %*!%^$#@ */                                           \
-    }                                                                   \
-    UNREACHABLE();                                                      \
-    return nullptr;                                                     \
+#define CACHED_WITH_STRENGTH(Name, properties, value_input_count, \
+                             value_output_count)                  \
+  const Operator* JSOperatorBuilder::Name(Strength strength) {    \
+    if (is_strong(strength)) {                                    \
+      return &cache_.k##Name##StrongOperator;                     \
+    }                                                             \
+    return &cache_.k##Name##SloppyOperator;                       \
   }
-CACHED_OP_LIST_WITH_LANGUAGE_MODE(CACHED_WITH_LANGUAGE_MODE)
-#undef CACHED_WITH_LANGUAGE_MODE
+CACHED_OP_LIST_WITH_STRENGTH(CACHED_WITH_STRENGTH)
+#undef CACHED_WITH_STRENGTH
+
+const Operator* JSOperatorBuilder::StoreProperty(LanguageMode language_mode) {
+  switch (language_mode) {
+    case SLOPPY:
+      return &cache_.kStorePropertySloppyOperator;
+    case STRICT:
+      return &cache_.kStorePropertyStrictOperator;
+    case STRONG:
+      return &cache_.kStorePropertyStrongOperator;
+    default:
+      UNREACHABLE();
+      return nullptr;
+  }
+}
 
 
 const Operator* JSOperatorBuilder::CallFunction(size_t arity,
                                                 CallFunctionFlags flags,
                                                 LanguageMode language_mode) {
   CallFunctionParameters parameters(arity, flags, language_mode);
   return new (zone()) Operator1<CallFunctionParameters>(   // --
       IrOpcode::kJSCallFunction, Operator::kNoProperties,  // opcode
       "JSCallFunction",                                    // name
       parameters.arity(), 1, 1, 1, 1, 2,                   // inputs/outputs
@@ skipping 148 matching lines @@
   return new (zone()) Operator1<Unique<String>>(                 // --
       IrOpcode::kJSCreateCatchContext, Operator::kNoProperties,  // opcode
       "JSCreateCatchContext",                                    // name
       2, 1, 1, 1, 1, 2,                                          // counts
       name);                                                     // parameter
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8