commit 359597ee8c0667a7d2c0b74dcbb0f90bb6059bae
author Brian Carlstrom <bdc@google.com> Thu Mar 06 02:10:21 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 06 02:10:22 2014 +0000
tree 251da13911288d0a89ed1cba316bd94fc1f496e0
parent e26baffe7f9e2a54f276f5c65e48454e413683ba
parent 5e754d88c73f1f1fafbbf87d564df000d5a0a12c

Merge "Revert "Revert "Avoid compiling monster methods in boot image"""

compiler/image_writer.cc

diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc
index e3114eb..74be604 100644
--- a/compiler/image_writer.cc
+++ b/compiler/image_writer.cc
@@ -816,12 +816,14 @@
       uintptr_t value = quick_code - patch_location + patch->RelativeOffset();
       SetPatchLocation(patch, value);
     } else {
-      // generic JNI, not interpreter bridge from GetQuickOatCodeFor().
-      if (target->IsNative() &&
-          quick_code == reinterpret_cast<uintptr_t>(GetQuickToInterpreterBridge())) {
-        code_offset = quick_generic_jni_trampoline_offset_;
+      if (quick_code == reinterpret_cast<uintptr_t>(GetQuickToInterpreterBridge())) {
+        if (target->IsNative()) {
+          // generic JNI, not interpreter bridge from GetQuickOatCodeFor().
+          code_offset = quick_generic_jni_trampoline_offset_;
+        } else {
+          code_offset = quick_to_interpreter_bridge_offset_;
+        }
       }
-
       SetPatchLocation(patch, PointerToLowMemUInt32(GetOatAddress(code_offset)));
     }
   }

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index afa8495..ec2713a 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -993,7 +993,7 @@
 
   if (compiler_filter_string == NULL) {
     if (image) {
-      compiler_filter_string = "everything";
+      compiler_filter_string = "speed";
     } else {
 #if ART_SMALL_MODE
       compiler_filter_string = "interpret-only";