commit 14c3bf91b2ec434295ec84d6446f495fb7de6d5c
author Mathieu Chartier <mathieuc@google.com> Mon Jul 13 14:35:43 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Jul 17 15:34:40 2015 -0700
tree 6eaa51c263b84b7a11f40f21be993987cdca80f3
parent 6d3d1e3d866a880b4df95ba96ed126c1723e3dd6

Change intern table to not use WaitHoldingLocks

Bug: 22423014
Change-Id: I9e16b8cb4def72fff73f1783a182877105feb7aa

compiler/image_writer.cc

diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc
index fdfeb48..2b65aa9 100644
--- a/compiler/image_writer.cc
+++ b/compiler/image_writer.cc
@@ -715,8 +715,10 @@
       DCHECK_EQ(obj, obj->AsString()->Intern());
       return;
     }
-    mirror::String* const interned = Runtime::Current()->GetInternTable()->InternStrong(
-        obj->AsString()->Intern());
+    // InternImageString allows us to intern while holding the heap bitmap lock. This is safe since
+    // we are guaranteed to not have GC during image writing.
+    mirror::String* const interned = Runtime::Current()->GetInternTable()->InternImageString(
+        obj->AsString());
     if (obj != interned) {
       if (!IsImageBinSlotAssigned(interned)) {
         // interned obj is after us, allocate its location early