commit a67a49a9758c2055cb544bfecdbb50dba2c502d1
author Mathieu Chartier <mathieuc@google.com> Wed Jun 15 13:11:40 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Jun 15 13:23:13 2016 -0700
tree e183af7d3312f365a04997a43692c9f8bfcfe647
parent abdda2fb52eb7e9a6916899a913f78251d8ed277

Reduce ImageSpace::Init frame size

Fixes x86_64 build.

Change-Id: Ib636a1274e255a60bda47607570fedbe92a5e2cd

runtime/gc/space/image_space.cc

diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index 1ebe5cc..6a61d78 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -1178,8 +1178,9 @@
       return nullptr;
     }
   }
-  ImageHeader temp_image_header;
-  ImageHeader* image_header = &temp_image_header;
+  // unique_ptr to reduce frame size.
+  std::unique_ptr<ImageHeader> temp_image_header(new ImageHeader);
+  ImageHeader* image_header = temp_image_header.get();
   {
     TimingLogger::ScopedTiming timing("ReadImageHeader", &logger);
     bool success = file->ReadFully(image_header, sizeof(*image_header));