[turbofan] Store nodes use only MachineRepresentation, not MachineType.

src/compiler/machine-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/machine-operator.h"
 
 #include "src/base/lazy-instance.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator.h"
 
@@ skipping 29 matching lines @@
       return os << "PointerWriteBarrier";
     case kFullWriteBarrier:
       return os << "FullWriteBarrier";
   }
   UNREACHABLE();
   return os;
 }
 
 
 bool operator==(StoreRepresentation lhs, StoreRepresentation rhs) {
-  return lhs.machine_type() == rhs.machine_type() &&
+  return lhs.representation() == rhs.representation() &&
          lhs.write_barrier_kind() == rhs.write_barrier_kind();
 }
 
 
 bool operator!=(StoreRepresentation lhs, StoreRepresentation rhs) {
   return !(lhs == rhs);
 }
 
 
 size_t hash_value(StoreRepresentation rep) {
-  return base::hash_combine(rep.machine_type(), rep.write_barrier_kind());
+  return base::hash_combine(rep.representation(), rep.write_barrier_kind());
 }
 
 
 std::ostream& operator<<(std::ostream& os, StoreRepresentation rep) {
-  return os << "(" << rep.machine_type() << " : " << rep.write_barrier_kind()
+  return os << "(" << rep.representation() << " : " << rep.write_barrier_kind()
             << ")";
 }
 
 
 LoadRepresentation LoadRepresentationOf(Operator const* op) {
   DCHECK_EQ(IrOpcode::kLoad, op->opcode());
   return OpParameter<LoadRepresentation>(op);
 }
 
 
@@ skipping 136 matching lines @@
   V(Int16)                   \
   V(Uint16)                  \
   V(Int32)                   \
   V(Uint32)                  \
   V(Int64)                   \
   V(Uint64)                  \
   V(Pointer)                 \
   V(AnyTagged)
 
 
+#define MACHINE_REPRESENTATION_LIST(V) \
+  V(kFloat32)                          \
+  V(kFloat64)                          \
+  V(kWord8)                            \
+  V(kWord16)                           \
+  V(kWord32)                           \
+  V(kWord64)                           \
+  V(kTagged)
+
+
 struct MachineOperatorGlobalCache {
 #define PURE(Name, properties, value_input_count, control_input_count,         \
              output_count)                                                     \
   struct Name##Operator final : public Operator {                              \
     Name##Operator()                                                           \
         : Operator(IrOpcode::k##Name, Operator::kPure | properties, #Name,     \
                    value_input_count, 0, control_input_count, output_count, 0, \
                    0) {}                                                       \
   };                                                                           \
   Name##Operator k##Name;
@@ skipping 32 matching lines @@
   CheckedLoad##Type##Operator kCheckedLoad##Type;
   MACHINE_TYPE_LIST(LOAD)
 #undef LOAD
 
 #define STORE(Type)                                                            \
   struct Store##Type##Operator : public Operator1<StoreRepresentation> {       \
     explicit Store##Type##Operator(WriteBarrierKind write_barrier_kind)        \
         : Operator1<StoreRepresentation>(                                      \
               IrOpcode::kStore, Operator::kNoRead | Operator::kNoThrow,        \
               "Store", 3, 1, 1, 0, 1, 0,                                       \
-              StoreRepresentation(MachineType::Type(), write_barrier_kind)) {} \
+              StoreRepresentation(MachineRepresentation::Type,                 \
+                                  write_barrier_kind)) {}                      \
   };                                                                           \
   struct Store##Type##NoWriteBarrier##Operator final                           \
       : public Store##Type##Operator {                                         \
     Store##Type##NoWriteBarrier##Operator()                                    \
         : Store##Type##Operator(kNoWriteBarrier) {}                            \
   };                                                                           \
   struct Store##Type##MapWriteBarrier##Operator final                          \
       : public Store##Type##Operator {                                         \
     Store##Type##MapWriteBarrier##Operator()                                   \
         : Store##Type##Operator(kMapWriteBarrier) {}                           \
   };                                                                           \
   struct Store##Type##PointerWriteBarrier##Operator final                      \
       : public Store##Type##Operator {                                         \
     Store##Type##PointerWriteBarrier##Operator()                               \
         : Store##Type##Operator(kPointerWriteBarrier) {}                       \
   };                                                                           \
   struct Store##Type##FullWriteBarrier##Operator final                         \
       : public Store##Type##Operator {                                         \
     Store##Type##FullWriteBarrier##Operator()                                  \
         : Store##Type##Operator(kFullWriteBarrier) {}                          \
   };                                                                           \
   struct CheckedStore##Type##Operator final                                    \
       : public Operator1<CheckedStoreRepresentation> {                         \
     CheckedStore##Type##Operator()                                             \
         : Operator1<CheckedStoreRepresentation>(                               \
               IrOpcode::kCheckedStore, Operator::kNoRead | Operator::kNoThrow, \
-              "CheckedStore", 4, 1, 1, 0, 1, 0, MachineType::Type()) {}        \
+              "CheckedStore", 4, 1, 1, 0, 1, 0, MachineRepresentation::Type) { \
+    }                                                                          \
   };                                                                           \
   Store##Type##NoWriteBarrier##Operator kStore##Type##NoWriteBarrier;          \
   Store##Type##MapWriteBarrier##Operator kStore##Type##MapWriteBarrier;        \
   Store##Type##PointerWriteBarrier##Operator                                   \
       kStore##Type##PointerWriteBarrier;                                       \
   Store##Type##FullWriteBarrier##Operator kStore##Type##FullWriteBarrier;      \
   CheckedStore##Type##Operator kCheckedStore##Type;
-  MACHINE_TYPE_LIST(STORE)
+  MACHINE_REPRESENTATION_LIST(STORE)
 #undef STORE
 };
 
 
 static base::LazyInstance<MachineOperatorGlobalCache>::type kCache =
     LAZY_INSTANCE_INITIALIZER;
 
 
 MachineOperatorBuilder::MachineOperatorBuilder(Zone* zone,
                                                MachineRepresentation word,
@@ skipping 38 matching lines @@
     return &cache_.kLoad##Type;     \
   }
     MACHINE_TYPE_LIST(LOAD)
 #undef LOAD
   UNREACHABLE();
   return nullptr;
 }
 
 
 const Operator* MachineOperatorBuilder::Store(StoreRepresentation store_rep) {
-  MachineType type = store_rep.machine_type();
-#define STORE(Type)                                         \
-  if (type == MachineType::Type()) {                        \
+  switch (store_rep.representation()) {
+#define STORE(kRep)                                         \
+  case MachineRepresentation::kRep:                         \
     switch (store_rep.write_barrier_kind()) {               \
       case kNoWriteBarrier:                                 \
-        return &cache_.k##Store##Type##NoWriteBarrier;      \
+        return &cache_.k##Store##kRep##NoWriteBarrier;      \
       case kMapWriteBarrier:                                \
-        return &cache_.k##Store##Type##MapWriteBarrier;     \
+        return &cache_.k##Store##kRep##MapWriteBarrier;     \
       case kPointerWriteBarrier:                            \
-        return &cache_.k##Store##Type##PointerWriteBarrier; \
+        return &cache_.k##Store##kRep##PointerWriteBarrier; \
       case kFullWriteBarrier:                               \
-        return &cache_.k##Store##Type##FullWriteBarrier;    \
+        return &cache_.k##Store##kRep##FullWriteBarrier;    \
     }                                                       \
+    break;
+    MACHINE_REPRESENTATION_LIST(STORE)
+#undef STORE
+    default:
+      break;
   }
-    MACHINE_TYPE_LIST(STORE)
-#undef STORE
   UNREACHABLE();
   return nullptr;
 }
 
 
 const Operator* MachineOperatorBuilder::CheckedLoad(
     CheckedLoadRepresentation rep) {
 #define LOAD(Type)                     \
   if (rep == MachineType::Type()) {    \
     return &cache_.kCheckedLoad##Type; \
   }
     MACHINE_TYPE_LIST(LOAD)
 #undef LOAD
   UNREACHABLE();
   return nullptr;
 }
 
 
 const Operator* MachineOperatorBuilder::CheckedStore(
     CheckedStoreRepresentation rep) {
-#define STORE(Type)                     \
-  if (rep == MachineType::Type()) {     \
-    return &cache_.kCheckedStore##Type; \
+  switch (rep) {
+#define STORE(kRep)                 \
+  case MachineRepresentation::kRep: \
+    return &cache_.kCheckedStore##kRep;
+    MACHINE_REPRESENTATION_LIST(STORE)
+#undef STORE
+    default:
+      break;
   }
-    MACHINE_TYPE_LIST(STORE)
-#undef STORE
   UNREACHABLE();
   return nullptr;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8