commit 3bfc694a4bcc9ef3de19b94a34701c76c6008071
author Mathieu Chartier <mathieuc@google.com> Tue Apr 02 08:40:41 2019 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Apr 02 18:47:17 2019 +0000
tree d56c745462a0837e0154869be68011170f6b7846
parent c74ccb8a5ff4cacda6d1ed95f7676f00cc2dd269

Avoid resolving startup const strings without a profile

Without a profile, the behavior should be to resolve no strings instead
of resolving them all.

Bug: 127609587
Test: test-art-host
Change-Id: I374ce60f2a731fd0a561226999e9ce5a6ac2c2e4

dex2oat/driver/compiler_driver.cc

diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc
index bcd573b..c5aad58 100644
--- a/dex2oat/driver/compiler_driver.cc
+++ b/dex2oat/driver/compiler_driver.cc
@@ -667,6 +667,11 @@
 void CompilerDriver::ResolveConstStrings(const std::vector<const DexFile*>& dex_files,
                                          bool only_startup_strings,
                                          TimingLogger* timings) {
+  if (only_startup_strings && GetCompilerOptions().GetProfileCompilationInfo() == nullptr) {
+    // If there is no profile, don't resolve any strings. Resolving all of the strings in the image
+    // will cause a bloated app image and slow down startup.
+    return;
+  }
   ScopedObjectAccess soa(Thread::Current());
   StackHandleScope<1> hs(soa.Self());
   ClassLinker* const class_linker = Runtime::Current()->GetClassLinker();