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

runtime/mirror/dex_cache.h

diff --git a/runtime/mirror/dex_cache.h b/runtime/mirror/dex_cache.h
index e399a8c..b41443e 100644
--- a/runtime/mirror/dex_cache.h
+++ b/runtime/mirror/dex_cache.h
@@ -473,7 +473,8 @@
   uint32_t MethodSlotIndex(uint32_t method_idx) REQUIRES_SHARED(Locks::mutator_lock_);
   uint32_t MethodTypeSlotIndex(dex::ProtoIndex proto_idx) REQUIRES_SHARED(Locks::mutator_lock_);
 
-  void AddPreResolvedStringsArray() REQUIRES_SHARED(Locks::mutator_lock_);
+  // Returns true if we succeeded in adding the pre-resolved string array.
+  bool AddPreResolvedStringsArray() REQUIRES_SHARED(Locks::mutator_lock_);
 
  private:
   void Init(const DexFile* dex_file,