commit d857b632cb23846ef656c330b89c4d1cb727116e
author Ian Rogers <irogers@google.com> Mon Feb 06 20:42:33 2012 -0800
committer Ian Rogers <irogers@google.com> Mon Feb 06 20:42:33 2012 -0800
tree 36e55f4ebb5a53f947db963659de70240f9242f6
parent 4103ad2ab59488fe4eb36b88259e402e8878878b

Compute size of source_space after lazy field initialization.

Fixes image_test.

Change-Id: I3ba8072cf34d881b36c43dfbe8c6b1d895c1b21c

src/image_writer.cc

diff --git a/src/image_writer.cc b/src/image_writer.cc
index 151aeb3..f92989d 100644
--- a/src/image_writer.cc
+++ b/src/image_writer.cc
@@ -71,12 +71,13 @@
     return false;
   }
 
+  PruneNonImageClasses();  // Remove junk
+  ComputeLazyFieldsForImageClasses();  // Add useful information
+  Heap::CollectGarbage(false);  // Remove garbage
+  Heap::GetAllocSpace()->Trim();  // Trim size of source_space
   if (!AllocMemory()) {
     return false;
   }
-  PruneNonImageClasses();
-  ComputeLazyFieldsForImageClasses();
-  Heap::CollectGarbage(false);
 #ifndef NDEBUG
   CheckNonImageClassesRemoved();
 #endif