| Index: runtime/vm/intermediate_language_mips.cc
|
| ===================================================================
|
| --- runtime/vm/intermediate_language_mips.cc (revision 30390)
|
| +++ runtime/vm/intermediate_language_mips.cc (working copy)
|
| @@ -140,7 +140,11 @@
|
| LocationSummary* locs =
|
| new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
|
| locs->set_in(0, Location::RegisterOrConstant(left()));
|
| - locs->set_in(1, Location::RegisterOrConstant(right()));
|
| + // Only one of the inputs can be a constant. Choose register if the first one
|
| + // is a constant.
|
| + locs->set_in(1, locs->in(0).IsConstant()
|
| + ? Location::RequiresRegister()
|
| + : Location::RegisterOrConstant(right()));
|
| locs->set_out(Location::RequiresRegister());
|
| return locs;
|
| }
|
| @@ -152,17 +156,6 @@
|
|
|
| Location left = locs()->in(0);
|
| Location right = locs()->in(1);
|
| - if (left.IsConstant() && right.IsConstant()) {
|
| - // TODO(srdjan): Determine why this instruction was not eliminated.
|
| - bool res = (left.constant().raw() == right.constant().raw());
|
| - if ((kind_ == Token::kNE_STRICT) || (kind_ == Token::kNE)) {
|
| - res = !res;
|
| - }
|
| - __ LoadImmediate(result,
|
| - reinterpret_cast<int32_t>(Smi::New(res ? if_true_ : if_false_)));
|
| - return;
|
| - }
|
| -
|
| ASSERT(!left.IsConstant() || !right.IsConstant());
|
|
|
| // Clear out register.
|
|
|