| Index: src/compiler/instruction.cc
|
| diff --git a/src/compiler/instruction.cc b/src/compiler/instruction.cc
|
| index 5ca3600375aafd8f4b7bd5d55a0742235d732702..1ef42d6bccee432e02db647cbe9631b8c76e2177 100644
|
| --- a/src/compiler/instruction.cc
|
| +++ b/src/compiler/instruction.cc
|
| @@ -61,16 +61,14 @@ FlagsCondition CommuteFlagsCondition(FlagsCondition condition) {
|
| }
|
|
|
| bool InstructionOperand::InterferesWith(const InstructionOperand& that) const {
|
| - if (!IsFPRegister() || !that.IsFPRegister()) return EqualsCanonicalized(that);
|
| -
|
| + if (!IsFPRegister() || !that.IsFPRegister() || kSimpleFPAliasing)
|
| + return EqualsCanonicalized(that);
|
| + // Both operands are fp registers and aliasing is non-simple.
|
| const LocationOperand& loc1 = *LocationOperand::cast(this);
|
| const LocationOperand& loc2 = LocationOperand::cast(that);
|
| - const RegisterConfiguration* config = GetRegConfig();
|
| - if (config->fp_aliasing_kind() != RegisterConfiguration::COMBINE)
|
| - return loc1.register_code() == loc2.register_code();
|
| -
|
| - return config->AreAliases(loc1.representation(), loc1.register_code(),
|
| - loc2.representation(), loc2.register_code());
|
| + return GetRegConfig()->AreAliases(loc1.representation(), loc1.register_code(),
|
| + loc2.representation(),
|
| + loc2.register_code());
|
| }
|
|
|
| void InstructionOperand::Print(const RegisterConfiguration* config) const {
|
|
|