Reland: [turbofan] add MachineType to AllocatedOperand

test/cctest/compiler/test-gap-resolver.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/gap-resolver.h"
 
 #include "src/base/utils/random-number-generator.h"
 #include "test/cctest/cctest.h"
 
 using namespace v8::internal;
@@ skipping 71 matching lines @@
     Key key = {is_constant, kind, index};
     return key;
   }
 
   static Value ValueFor(const InstructionOperand& op) { return KeyFor(op); }
 
   static InstructionOperand FromKey(Key key) {
     if (key.is_constant) {
       return ConstantOperand(key.index);
     }
-    return AllocatedOperand(key.kind, key.index);
+    return AllocatedOperand(
+        key.kind, InstructionSequence::DefaultRepresentation(), key.index);
   }
 
   friend std::ostream& operator<<(std::ostream& os,
                                   const InterpreterState& is) {
     for (OperandMap::const_iterator it = is.values_.begin();
          it != is.values_.end(); ++it) {
       if (it != is.values_.begin()) os << " ";
       InstructionOperand source = FromKey(it->first);
       InstructionOperand destination = FromKey(it->second);
       MoveOperands mo(source, destination);
@@ skipping 38 matching lines @@
   InterpreterState state_;
 };
 
 
 class ParallelMoveCreator : public HandleAndZoneScope {
  public:
   ParallelMoveCreator() : rng_(CcTest::random_number_generator()) {}
 
   ParallelMove* Create(int size) {
     ParallelMove* parallel_move = new (main_zone()) ParallelMove(main_zone());
-    std::set<InstructionOperand> seen;
+    std::set<InstructionOperand, CompareOperandModuloType> seen;
     for (int i = 0; i < size; ++i) {
       MoveOperands mo(CreateRandomOperand(true), CreateRandomOperand(false));
       if (!mo.IsRedundant() && seen.find(mo.destination()) == seen.end()) {
         parallel_move->AddMove(mo.source(), mo.destination());
         seen.insert(mo.destination());
       }
     }
     return parallel_move;
   }
 
  private:
+  MachineType RandomType() {
+    int index = rng_->NextInt(3);
+    switch (index) {
+      case 0:
+        return kRepWord32;
+      case 1:
+        return kRepWord64;
+      case 2:
+        return kRepTagged;
+    }
+    UNREACHABLE();
+    return kMachNone;
+  }
+
+  MachineType RandomDoubleType() {
+    int index = rng_->NextInt(2);
+    if (index == 0) return kRepFloat64;
+    return kRepFloat32;
+  }
+
   InstructionOperand CreateRandomOperand(bool is_source) {
     int index = rng_->NextInt(6);
     // destination can't be Constant.
     switch (rng_->NextInt(is_source ? 5 : 4)) {
       case 0:
-        return StackSlotOperand(index);
+        return StackSlotOperand(RandomType(), index);
       case 1:
-        return DoubleStackSlotOperand(index);
+        return DoubleStackSlotOperand(RandomDoubleType(), index);
       case 2:
-        return RegisterOperand(index);
+        return RegisterOperand(RandomType(), index);
       case 3:
-        return DoubleRegisterOperand(index);
+        return DoubleRegisterOperand(RandomDoubleType(), index);
       case 4:
         return ConstantOperand(index);
     }
     UNREACHABLE();
     return InstructionOperand();
   }
 
  private:
   v8::base::RandomNumberGenerator* rng_;
 };
@@ skipping 10 matching lines @@
       mi1.AssembleParallelMove(pm);
 
       MoveInterpreter mi2(pmc.main_zone());
       GapResolver resolver(&mi2);
       resolver.Resolve(pm);
 
       CHECK(mi1.state() == mi2.state());
     }
   }
 }