Detect special methods at the end of verification.
This moves special method handling to method inliner
and prepares for eventual inlining of these methods.
Change-Id: I51c51b940fb7bc714e33135cd61be69467861352
diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc
index ee6f9c8..82a1932 100644
--- a/compiler/dex/quick/gen_invoke.cc
+++ b/compiler/dex/quick/gen_invoke.cc
@@ -1239,12 +1239,9 @@
void Mir2Lir::GenInvoke(CallInfo* info) {
if (!(info->opt_flags & MIR_INLINED)) {
- if (inliner_ == nullptr) {
- QuickCompilerContext* context = reinterpret_cast<QuickCompilerContext*>(
- cu_->compiler_driver->GetCompilerContext());
- inliner_ = context->GetInlinerMap()->GetMethodInliner(cu_->dex_file);
- }
- if (inliner_->GenIntrinsic(this, info)) {
+ DCHECK(cu_->compiler_driver->GetMethodInlinerMap() != nullptr);
+ if (cu_->compiler_driver->GetMethodInlinerMap()->GetMethodInliner(cu_->dex_file)
+ ->GenIntrinsic(this, info)) {
return;
}
}