commit 5550c56da14fb324caba040b425f9a7e267fac4a
author Mathieu Chartier <mathieuc@google.com> Tue Sep 22 15:18:04 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Sep 22 15:57:33 2015 -0700
tree 33d743db6a791ac335e47e335698775db9261fca
parent b64d5832879f462ed146f0b012ea0bf62255b643

Clear allocator in image writer

Doesn't fix any active bugs, just precautionary.

Change-Id: I32a89e00b1d5964ad77fb53eded55263fea5df00

compiler/image_writer.cc

diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc
index 955c575..d9f8fcb 100644
--- a/compiler/image_writer.cc
+++ b/compiler/image_writer.cc
@@ -1362,6 +1362,10 @@
         // If src is a ClassLoader, set the class table to null so that it gets recreated by the
         // ClassLoader.
         down_cast<mirror::ClassLoader*>(copy)->SetClassTable(nullptr);
+        // Also set allocator to null to be safe. The allocator is created when we create the class
+        // table. We also never expect to unload things in the image since they are held live as
+        // roots.
+        down_cast<mirror::ClassLoader*>(copy)->SetAllocator(nullptr);
       }
     }
     FixupVisitor visitor(this, copy);