diff options
Diffstat (limited to 'compiler/dex/quick')
| -rw-r--r-- | compiler/dex/quick/dex_file_method_inliner.cc | 8 | ||||
| -rw-r--r-- | compiler/dex/quick/mir_to_lir.cc | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/compiler/dex/quick/dex_file_method_inliner.cc b/compiler/dex/quick/dex_file_method_inliner.cc index 53e26c703a..fa6de963a0 100644 --- a/compiler/dex/quick/dex_file_method_inliner.cc +++ b/compiler/dex/quick/dex_file_method_inliner.cc @@ -564,7 +564,7 @@ bool DexFileMethodInliner::GenInlineConst(MIRGraph* mir_graph, BasicBlock* bb, M insn->dalvikInsn.opcode = Instruction::CONST; insn->dalvikInsn.vA = move_result->dalvikInsn.vA; insn->dalvikInsn.vB = method.d.data; - mir_graph->InsertMIRAfter(bb, move_result, insn); + bb->InsertMIRAfter(move_result, insn); return true; } @@ -603,7 +603,7 @@ bool DexFileMethodInliner::GenInlineReturnArg(MIRGraph* mir_graph, BasicBlock* b insn->dalvikInsn.opcode = opcode; insn->dalvikInsn.vA = move_result->dalvikInsn.vA; insn->dalvikInsn.vB = arg; - mir_graph->InsertMIRAfter(bb, move_result, insn); + bb->InsertMIRAfter(move_result, insn); return true; } @@ -650,7 +650,7 @@ bool DexFileMethodInliner::GenInlineIGet(MIRGraph* mir_graph, BasicBlock* bb, MI DCHECK_EQ(data.field_offset, mir_graph->GetIFieldLoweringInfo(insn).FieldOffset().Uint32Value()); DCHECK_EQ(data.is_volatile, mir_graph->GetIFieldLoweringInfo(insn).IsVolatile() ? 1u : 0u); - mir_graph->InsertMIRAfter(bb, move_result, insn); + bb->InsertMIRAfter(move_result, insn); return true; } @@ -688,7 +688,7 @@ bool DexFileMethodInliner::GenInlineIPut(MIRGraph* mir_graph, BasicBlock* bb, MI DCHECK_EQ(data.field_offset, mir_graph->GetIFieldLoweringInfo(insn).FieldOffset().Uint32Value()); DCHECK_EQ(data.is_volatile, mir_graph->GetIFieldLoweringInfo(insn).IsVolatile() ? 1u : 0u); - mir_graph->InsertMIRAfter(bb, invoke, insn); + bb->InsertMIRAfter(invoke, insn); return true; } diff --git a/compiler/dex/quick/mir_to_lir.cc b/compiler/dex/quick/mir_to_lir.cc index 39994e92e2..82664e2a90 100644 --- a/compiler/dex/quick/mir_to_lir.cc +++ b/compiler/dex/quick/mir_to_lir.cc @@ -212,7 +212,7 @@ bool Mir2Lir::GenSpecialCase(BasicBlock* bb, MIR* mir, const InlineMethod& speci RegLocation rl_dest = GetReturn(cu_->shorty[0] == 'F'); GenPrintLabel(mir); LoadConstant(rl_dest.reg.GetReg(), static_cast<int>(special.d.data)); - return_mir = mir_graph_->GetNextUnconditionalMir(bb, mir); + return_mir = bb->GetNextUnconditionalMir(mir_graph_, mir); break; } case kInlineOpReturnArg: @@ -221,11 +221,11 @@ bool Mir2Lir::GenSpecialCase(BasicBlock* bb, MIR* mir, const InlineMethod& speci break; case kInlineOpIGet: successful = GenSpecialIGet(mir, special); - return_mir = mir_graph_->GetNextUnconditionalMir(bb, mir); + return_mir = bb->GetNextUnconditionalMir(mir_graph_, mir); break; case kInlineOpIPut: successful = GenSpecialIPut(mir, special); - return_mir = mir_graph_->GetNextUnconditionalMir(bb, mir); + return_mir = bb->GetNextUnconditionalMir(mir_graph_, mir); break; default: break; |