commit 63fe93d9f9d2956b1ee2b98cdd6ddd2153f5f9cf
author Serban Constantinescu <serban.constantinescu@arm.com> Mon Jun 30 17:10:28 2014 +0100
committer Andreas Gampe <agampe@google.com> Fri Jul 04 16:09:35 2014 -0700
tree a9d1ee95f84f43e6fecd490f63ec0ae44d3b14d7
parent 827477ad5ff20d0b2ca70828f3f56dea6fa8dddd

AArch64: Enable Inlining.

This patch fixes the remaining issues with inlining for ARM64.

Change-Id: I2d85b7c4f3fb2b667bf6029fbc271ab954378889
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Signed-off-by: Matteo Franchin <matteo.franchin@arm.com>

compiler/dex/frontend.cc

diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index 07bbf15..8021fa4 100644
--- a/compiler/dex/frontend.cc
+++ b/compiler/dex/frontend.cc
@@ -868,7 +868,8 @@
     cu.disable_opt |= (1 << kLoadStoreElimination);
   } else if (cu.instruction_set == kArm64) {
     // TODO(Arm64): enable optimizations once backend is mature enough.
-    cu.disable_opt = ~(uint32_t)0;
+    cu.disable_opt = ~((1 << kSuppressMethodInlining) |
+                       (1 << kNullCheckElimination));
   }
 
   cu.StartTimingSplit("BuildMIRGraph");