commit 6613519990bdb5616f2858c146f162ef760f03d2
author Jeff Hao <jeffhao@google.com> Tue May 14 11:02:41 2013 -0700
committer Jeff Hao <jeffhao@google.com> Tue May 14 11:37:40 2013 -0700
tree 9ea428594c2062b9e97a7735f0cdadc1e8e85d5a
parent 807a25640d4f4de8143b160b3bb8f552ffbf6f4a

Allocate shadow frames in interpreter on stack instead of on heap.

Instead of using new, the shadow frames are allocated using alloca.

Change-Id: Idc92fbccf1fe7589ace7b97811b21a5c67c97fd2

src/interpreter/interpreter.cc

diff --git a/src/interpreter/interpreter.cc b/src/interpreter/interpreter.cc
index a3768c7..e0bb708 100644
--- a/src/interpreter/interpreter.cc
+++ b/src/interpreter/interpreter.cc
@@ -425,9 +425,9 @@
     }
   }
 
-  Runtime* runtime = Runtime::Current();
-  UniquePtr<ShadowFrame> new_shadow_frame(ShadowFrame::Create(num_regs, &shadow_frame,
-                                                              target_method, 0));
+  void* memory = alloca(ShadowFrame::ComputeSize(num_regs));
+  ShadowFrame* new_shadow_frame(ShadowFrame::Create(num_regs, &shadow_frame,
+                                                    target_method, 0, memory));
   size_t cur_reg = num_regs - num_ins;
   if (receiver != NULL) {
     new_shadow_frame->SetVRegReference(cur_reg, receiver);
@@ -463,10 +463,10 @@
     }
   }
 
-  if (LIKELY(runtime->IsStarted())) {
-    result->SetJ((target_method->GetEntryPointFromInterpreter())(self, new_shadow_frame.get()).GetJ());
+  if (LIKELY(Runtime::Current()->IsStarted())) {
+    result->SetJ((target_method->GetEntryPointFromInterpreter())(self, new_shadow_frame).GetJ());
   } else {
-    UnstartedRuntimeInvoke(self, target_method, new_shadow_frame.get(), result, num_regs - num_ins);
+    UnstartedRuntimeInvoke(self, target_method, new_shadow_frame, result, num_regs - num_ins);
   }
   mh.ChangeMethod(shadow_frame.GetMethod());
 }
@@ -2135,10 +2135,9 @@
   }
   // Set up shadow frame with matching number of reference slots to vregs.
   ShadowFrame* last_shadow_frame = self->GetManagedStack()->GetTopShadowFrame();
-  UniquePtr<ShadowFrame> shadow_frame(ShadowFrame::Create(num_regs,
-                                                          last_shadow_frame,
-                                                          method, 0));
-  self->PushShadowFrame(shadow_frame.get());
+  void* memory = alloca(ShadowFrame::ComputeSize(num_regs));
+  ShadowFrame* shadow_frame(ShadowFrame::Create(num_regs, last_shadow_frame, method, 0, memory));
+  self->PushShadowFrame(shadow_frame);
   size_t cur_reg = num_regs - num_ins;
   if (!method->IsStatic()) {
     CHECK(receiver != NULL);
@@ -2176,7 +2175,7 @@
     }
   }
   if (LIKELY(!method->IsNative())) {
-    JValue r = Execute(self, mh, code_item, *shadow_frame.get(), JValue());
+    JValue r = Execute(self, mh, code_item, *shadow_frame, JValue());
     if (result != NULL) {
       *result = r;
     }