From e53798a7e3267305f696bf658e418c92e63e0834 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 1 Dec 2014 10:31:54 +0000 Subject: Inlining support in optimizing. Currently only inlines simple things that don't require an environment, such as: - Returning a constant. - Returning a parameter. - Returning an arithmetic operation. Change-Id: Ie844950cb44f69e104774a3cf7a8dea66bc85661 --- compiler/driver/compiler_driver.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index cd9280c4c4..051b310f89 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1373,8 +1373,7 @@ bool CompilerDriver::ComputeInvokeInfo(const DexCompilationUnit* mUnit, const ui if (resolved_method != nullptr) { *vtable_idx = GetResolvedMethodVTableIndex(resolved_method, orig_invoke_type); - if (enable_devirtualization) { - DCHECK(mUnit->GetVerifiedMethod() != nullptr); + if (enable_devirtualization && mUnit->GetVerifiedMethod() != nullptr) { const MethodReference* devirt_target = mUnit->GetVerifiedMethod()->GetDevirtTarget(dex_pc); stats_flags = IsFastInvoke( -- cgit v1.2.3-59-g8ed1b