| Index: runtime/vm/intermediate_language_arm.cc
|
| diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
|
| index ecbaf96dfa96c9eb73b3cbb23b83f9abc1351c82..a9c98b8085c03313e14d4c869dec99d52e368bf1 100644
|
| --- a/runtime/vm/intermediate_language_arm.cc
|
| +++ b/runtime/vm/intermediate_language_arm.cc
|
| @@ -2405,8 +2405,11 @@ void PolymorphicInstanceCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
|
|
| LocationSummary* BranchInstr::MakeLocationSummary() const {
|
| - UNREACHABLE();
|
| - return NULL;
|
| + LocationSummary* summary = comparison()->locs();
|
| + // Share the location summary with the comparison. Branches don't produce
|
| + // a result.
|
| + summary->set_out(Location::NoLocation());
|
| + return summary;
|
| }
|
|
|
|
|
| @@ -2630,14 +2633,6 @@ LocationSummary* GotoInstr::MakeLocationSummary() const {
|
|
|
|
|
| void GotoInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| - if (!compiler->is_optimizing()) {
|
| - // Add deoptimization descriptor for deoptimizing instructions that may
|
| - // be inserted before this instruction.
|
| - compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
|
| - GetDeoptId(),
|
| - 0); // No token position.
|
| - }
|
| -
|
| if (HasParallelMove()) {
|
| compiler->parallel_move_resolver()->EmitNativeCode(parallel_move());
|
| }
|
|
|