commit 0637e27af8e54f39634024dc77e8b094f21782f9
author Brian Carlstrom <bdc@google.com> Tue Mar 20 01:07:52 2012 -0700
committer Brian Carlstrom <bdc@google.com> Tue Mar 20 01:07:52 2012 -0700
tree 59f09f85479b52445cd890203d62f72eabe2d60e
parent 53c5fc6394dd31da673dab032435b96aaf64fecd

Enable kSupportBootImageFixup

Change-Id: I57b338b3d985e2de96a6fb99327fc274406e3844

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index f066b0a..ce34f0f 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -716,13 +716,15 @@
   stats_->DirectMethodsToBoot(type);
   bool compiling_boot = Runtime::Current()->GetHeap()->GetSpaces().size() == 1;
   if (compiling_boot) {
-    const bool kSupportBootImageFixup = false;
+    const bool kSupportBootImageFixup = true;
     if (kSupportBootImageFixup) {
       MethodHelper mh(method);
       if (IsImageClass(mh.GetDeclaringClassDescriptor())) {
+        // We can only branch directly to Methods that are resolved in the DexCache.
+        // Otherwise we won't invoke the resolution trampoline.
         direct_method = -1;
+        direct_code = -1;
       }
-      direct_code = -1;
     }
   } else {
     if (Runtime::Current()->GetHeap()->GetImageSpace()->Contains(method)) {