| Index: src/compiler/move-optimizer.cc
|
| diff --git a/src/compiler/move-optimizer.cc b/src/compiler/move-optimizer.cc
|
| index 7c2bbe06b874005e74b3260fbcb8275e28df9978..7d574dfbe00d37e5d6d4c4c0323208f9aa3fa70f 100644
|
| --- a/src/compiler/move-optimizer.cc
|
| +++ b/src/compiler/move-optimizer.cc
|
| @@ -14,10 +14,10 @@ typedef std::pair<InstructionOperand, InstructionOperand> MoveKey;
|
|
|
| struct MoveKeyCompare {
|
| bool operator()(const MoveKey& a, const MoveKey& b) const {
|
| - if (a.first.EqualsModuloType(b.first)) {
|
| - return a.second.CompareModuloType(b.second);
|
| + if (a.first.EqualsCanonicalizeType(b.first)) {
|
| + return a.second.CompareCanonicalizeType(b.second);
|
| }
|
| - return a.first.CompareModuloType(b.first);
|
| + return a.first.CompareCanonicalizeType(b.first);
|
| }
|
| };
|
|
|
| @@ -245,12 +245,12 @@ bool IsSlot(const InstructionOperand& op) {
|
|
|
|
|
| bool LoadCompare(const MoveOperands* a, const MoveOperands* b) {
|
| - if (!a->source().EqualsModuloType(b->source())) {
|
| - return a->source().CompareModuloType(b->source());
|
| + if (!a->source().EqualsCanonicalizeType(b->source())) {
|
| + return a->source().CompareCanonicalizeType(b->source());
|
| }
|
| if (IsSlot(a->destination()) && !IsSlot(b->destination())) return false;
|
| if (!IsSlot(a->destination()) && IsSlot(b->destination())) return true;
|
| - return a->destination().CompareModuloType(b->destination());
|
| + return a->destination().CompareCanonicalizeType(b->destination());
|
| }
|
|
|
| } // namespace
|
| @@ -276,7 +276,7 @@ void MoveOptimizer::FinalizeMoves(Instruction* instr) {
|
| for (auto load : loads) {
|
| // New group.
|
| if (group_begin == nullptr ||
|
| - !load->source().EqualsModuloType(group_begin->source())) {
|
| + !load->source().EqualsCanonicalizeType(group_begin->source())) {
|
| group_begin = load;
|
| continue;
|
| }
|
|
|