commit 9dd0f4a3ce933619b0e779011770c0ab670bde11
author Mathieu Chartier <mathieuc@google.com> Fri Aug 02 09:09:36 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 02 09:09:36 2013 -0700
tree c8dcc152dd47b3a405d36585fe7c31262cbf247c
parent 3c217666d488355829ab694197946c50d7db7caa
parent 161a8e0fcbf26922c97654c00b68082be71eeb50

am 161a8e0f: Fix accidental performance regression.

* commit '161a8e0fcbf26922c97654c00b68082be71eeb50':
  Fix accidental performance regression.

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index ece9920..3cc60d9 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -186,7 +186,7 @@
   card_table_.reset(accounting::CardTable::Create(heap_begin, heap_capacity));
   CHECK(card_table_.get() != NULL) << "Failed to create card table";
 
-  image_mod_union_table_.reset(new accounting::ModUnionTableCardCache(this));
+  image_mod_union_table_.reset(new accounting::ModUnionTableToZygoteAllocspace(this));
   CHECK(image_mod_union_table_.get() != NULL) << "Failed to create image mod-union table";
 
   zygote_mod_union_table_.reset(new accounting::ModUnionTableCardCache(this));