commit 0399dde18753aa9bd2bd0d7cf60beef154d164a4
author Ian Rogers <irogers@google.com> Wed Jun 06 17:09:28 2012 -0700
committer Ian Rogers <irogers@google.com> Thu Jun 21 22:11:24 2012 -0700
tree ea88327c01ca321074aaa59b97e4c54348802937
parent de5705dcf4ab5f92d48e144bcd7b59f7bcd18e16

Remove Frame, merge shadow and quick representations.

Change-Id: I5ae03a5e52111792d2df7e83cbd89ab25777844b

src/object.cc

diff --git a/src/object.cc b/src/object.cc
index 9724e42..b728e28 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -544,11 +544,10 @@
 void Method::Invoke(Thread* self, Object* receiver, JValue* args, JValue* result) const {
   // Push a transition back into managed code onto the linked list in thread.
   CHECK_EQ(kRunnable, self->GetState());
+  self->AssertThreadSuspensionIsAllowable();
 
-#if !defined(ART_USE_LLVM_COMPILER)
-  NativeToManagedRecord record;
-  self->PushNativeToManagedRecord(&record);
-#endif
+  ManagedStack fragment;
+  self->PushManagedStackFragment(&fragment);
 
   // Call the invoke stub associated with the method.
   // Pass everything as arguments.
@@ -584,10 +583,8 @@
     }
   }
 
-#if !defined(ART_USE_LLVM_COMPILER)
   // Pop transition.
-  self->PopNativeToManagedRecord(record);
-#endif
+  self->PopManagedStackFragment(fragment);
 }
 
 bool Method::IsRegistered() const {
@@ -1510,8 +1507,8 @@
     for (int32_t i = 0; i < depth; ++i) {
       Method* method = down_cast<Method*>(method_trace->Get(i));
       mh.ChangeMethod(method);
-      uint32_t native_pc = pc_trace->Get(i);
-      int32_t line_number = mh.GetLineNumFromNativePC(native_pc);
+      uint32_t dex_pc = pc_trace->Get(i);
+      int32_t line_number = mh.GetLineNumFromDexPC(dex_pc);
       const char* source_file = mh.GetDeclaringClassSourceFile();
       result += StringPrintf("  at %s (%s:%d)\n", PrettyMethod(method, true).c_str(),
                              source_file, line_number);