commit 3ffb5b1576f8af0c361284ebd8d2d54c70ede3ff
author Mathieu Chartier <mathieuc@google.com> Thu Jun 06 14:23:03 2019 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Jun 10 17:37:57 2019 +0000
tree b1a58a51787768ff0af12a2ee1662ceeae78fdf1
parent 63ab3e1fb635f346241ee5519bf52be8deb6ca60

Handle allocation failure in AddPreResolvedStringsArray

Might fail on 32 bits if the address space is fragmented.

Regression test is infeasible to add.

Bug: 134652205
Test: test-art-host
Change-Id: I8a254a27275be4e0ff39fdb72715771f4f77cf36

dex2oat/driver/compiler_driver.cc

diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc
index 78f5dc5..8893d67 100644
--- a/dex2oat/driver/compiler_driver.cc
+++ b/dex2oat/driver/compiler_driver.cc
@@ -680,9 +680,10 @@
 
   for (const DexFile* dex_file : dex_files) {
     dex_cache.Assign(class_linker->FindDexCache(soa.Self(), *dex_file));
+    bool added_preresolved_string_array = false;
     if (only_startup_strings) {
       // When resolving startup strings, create the preresolved strings array.
-      dex_cache->AddPreResolvedStringsArray();
+      added_preresolved_string_array = dex_cache->AddPreResolvedStringsArray();
     }
     TimingLogger::ScopedTiming t("Resolve const-string Strings", timings);
 
@@ -709,7 +710,7 @@
         if (profile_compilation_info != nullptr && !is_startup_clinit) {
           ProfileCompilationInfo::MethodHotness hotness =
               profile_compilation_info->GetMethodHotness(method.GetReference());
-          if (only_startup_strings ? !hotness.IsStartup() : !hotness.IsInProfile()) {
+          if (added_preresolved_string_array ? !hotness.IsStartup() : !hotness.IsInProfile()) {
             continue;
           }
         }
@@ -727,7 +728,7 @@
                   : inst->VRegB_31c());
               ObjPtr<mirror::String> string = class_linker->ResolveString(string_index, dex_cache);
               CHECK(string != nullptr) << "Could not allocate a string when forcing determinism";
-              if (only_startup_strings) {
+              if (added_preresolved_string_array) {
                 dex_cache->GetPreResolvedStrings()[string_index.index_] =
                     GcRoot<mirror::String>(string);
               }