diff --git a/compiler/dex/mir_analysis.cc b/compiler/dex/mir_analysis.cc index 3de448344af..3559869ec82 100644 --- a/compiler/dex/mir_analysis.cc +++ b/compiler/dex/mir_analysis.cc @@ -376,8 +376,8 @@ const uint32_t MIRGraph::analysis_attributes_[kMirOpLast] = { // 72 INVOKE_INTERFACE {vD, vE, vF, vG, vA} AN_INVOKE | AN_HEAVYWEIGHT, - // 73 UNUSED_73 - AN_NONE, + // 73 RETURN_VOID_BARRIER: + AN_BRANCH, // 74 INVOKE_VIRTUAL_RANGE {vCCCC .. vNNNN} AN_INVOKE | AN_HEAVYWEIGHT, diff --git a/compiler/dex/mir_dataflow.cc b/compiler/dex/mir_dataflow.cc index b82c5c7f00e..022caa74d91 100644 --- a/compiler/dex/mir_dataflow.cc +++ b/compiler/dex/mir_dataflow.cc @@ -375,7 +375,7 @@ const uint64_t MIRGraph::oat_data_flow_attributes_[kMirOpLast] = { // 72 INVOKE_INTERFACE {vD, vE, vF, vG, vA} DF_FORMAT_35C | DF_NULL_CHK_OUT0 | DF_UMS, - // 73 UNUSED_73 + // 73 RETURN_VOID_BARRIER DF_NOP, // 74 INVOKE_VIRTUAL_RANGE {vCCCC .. vNNNN} diff --git a/compiler/dex/quick/mir_to_lir.cc b/compiler/dex/quick/mir_to_lir.cc index 6e0fe02af55..586411ed147 100644 --- a/compiler/dex/quick/mir_to_lir.cc +++ b/compiler/dex/quick/mir_to_lir.cc @@ -442,6 +442,7 @@ void Mir2Lir::CompileDalvikInstruction(MIR* mir, BasicBlock* bb, LIR* label_list GenMoveException(rl_dest); break; + case Instruction::RETURN_VOID_BARRIER: case Instruction::RETURN_VOID: if (((cu_->access_flags & kAccConstructor) != 0) && cu_->compiler_driver->RequiresConstructorBarrier(Thread::Current(), cu_->dex_file,