commit e53798a7e3267305f696bf658e418c92e63e0834
author Nicolas Geoffray <ngeoffray@google.com> Mon Dec 01 10:31:54 2014 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Dec 15 22:52:27 2014 +0000
tree 8979bbed96b107a5a6bbae9285ff4e0c362dad95
parent e6c0cdd11097dd72275ac24f1e98217c299d973e

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

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index cd9280c..051b310 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -1373,8 +1373,7 @@
   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(