Unify MachineType and RepType.

src/compiler/machine-operator.h

Index: src/compiler/machine-operator.h
diff --git a/src/compiler/machine-operator.h b/src/compiler/machine-operator.h
index 93ccedc2c80401c0d106d044a67b236ff6506a96..d4de40a6870250c291ecb6ee67e2442686f211cf 100644
--- a/src/compiler/machine-operator.h
+++ b/src/compiler/machine-operator.h
@@ -21,7 +21,7 @@ enum WriteBarrierKind { kNoWriteBarrier, kFullWriteBarrier };
 // A Store needs a MachineType and a WriteBarrierKind
 // in order to emit the correct write barrier.
 struct StoreRepresentation {
-  MachineType rep;
+  MachineType machine_type;
   WriteBarrierKind write_barrier_kind;
 };
 
@@ -33,7 +33,7 @@ class MachineOperatorBuilder {
  public:
   explicit MachineOperatorBuilder(Zone* zone, MachineType word = pointer_rep())
       : zone_(zone), word_(word) {
-    CHECK(word == kMachineWord32 || word == kMachineWord64);
+    CHECK(word == rWord32 || word == rWord64);
   }
 
 #define SIMPLE(name, properties, inputs, outputs) \
@@ -143,12 +143,12 @@ class MachineOperatorBuilder {
   Operator* Float64LessThan() { BINOP(Float64LessThan); }
   Operator* Float64LessThanOrEqual() { BINOP(Float64LessThanOrEqual); }
 
-  inline bool is32() const { return word_ == kMachineWord32; }
-  inline bool is64() const { return word_ == kMachineWord64; }
+  inline bool is32() const { return word_ == rWord32; }
+  inline bool is64() const { return word_ == rWord64; }
   inline MachineType word() const { return word_; }
 
   static inline MachineType pointer_rep() {
-    return kPointerSize == 8 ? kMachineWord64 : kMachineWord32;
+    return kPointerSize == 8 ? rWord64 : rWord32;
   }
 
 #undef WORD_SIZE