commit ea0831f60d26e3297e6463634a9fbb6384f00661
author Mathieu Chartier <mathieuc@google.com> Tue Dec 29 13:17:37 2015 -0800
committer Mathieu Chartier <mathieuc@google.com> Wed Jan 06 10:17:01 2016 -0800
tree 6b970dced071048d59d1857e4703521d76566f99
parent 664d7cfba0e734ba8917c260e424ea559b7e8f9f

Re-enable adding intern table to image

Changed intern table to have a stack of tables similarily to
ClassTable. Adding an image intern table adds to the front of the
intern table stack. Also some cleanup.

Bug: 26317072

Change-Id: I7bbf9485b5dbbbf3707fed21e29de3beccfb8705

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 7f67ae4..7b32c5b 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -2333,7 +2333,7 @@
   if (HasZygoteSpace()) {
     return;
   }
-  Runtime::Current()->GetInternTable()->SwapPostZygoteWithPreZygote();
+  Runtime::Current()->GetInternTable()->AddNewTable();
   Runtime::Current()->GetClassLinker()->MoveClassTableToPreZygote();
   VLOG(heap) << "Starting PreZygoteFork";
   // Trim the pages at the end of the non moving space.