commit 6fd03fb67e4628689f0abf34edeacc0e35b6295e
author Brian Carlstrom <bdc@google.com> Mon Oct 17 16:11:00 2011 -0700
committer Brian Carlstrom <bdc@google.com> Mon Oct 17 16:21:03 2011 -0700
tree 89e287870dfb98b31f2ea7336166801dad5cd55a
parent 29405cfc691196c21325e80d9a9f3795026eff4e

Fix ObjectInitFromCode to do callee frame setup

Change-Id: I70512c85a3a810fd672495b86655c215a07bb977

src/runtime_support.cc

diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index 5550c2f..ad01f4d 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -40,7 +40,8 @@
   LOG(INFO) << "Info: " << info;
 }
 
-void ObjectInitFromCode(Object* o) {
+extern "C" uint32_t artObjectInitFromCode(Object* o, Thread* self, Method** sp) {
+  FinishCalleeSaveFrameSetup(self, sp, Runtime::kRefsOnly);
   Class* c = o->GetClass();
   if (UNLIKELY(c->IsFinalizable())) {
     Heap::AddFinalizerReference(o);
@@ -50,6 +51,7 @@
    * here and branch to actual compiled object.<init> to handle any
    * breakpoint/logging activites if either is active.
    */
+  return self->IsExceptionPending() ? -1 : 0;
 }
 
 // Return value helper for jobject return types