commit 1f5393447b9f45be7918042d9ee7b521376de866
author Ian Rogers <irogers@google.com> Wed Oct 03 21:09:42 2012 -0700
committer Ian Rogers <irogers@google.com> Thu Oct 04 09:27:04 2012 -0700
tree 1793cb0ae00b38a63f8cfd3a25b6cb0ee4edca16
parent 870ea4772199f8d4cbd9a269f9093620ee50a59c

Make PopSirt inlinable, pass self to SirtRef.

Change-Id: Ieb91526b1cb1f8644ceb3c5b99649f658f43bbc1

src/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc
index 61d93f8..d10c351 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -40,6 +40,7 @@
 #include "scoped_thread_state_change.h"
 #include "signal_catcher.h"
 #include "signal_set.h"
+#include "sirt_ref.h"
 #include "space.h"
 #include "thread.h"
 #include "thread_list.h"
@@ -983,7 +984,8 @@
 
 AbstractMethod* Runtime::CreateResolutionMethod() {
   Class* method_class = AbstractMethod::GetMethodClass();
-  SirtRef<AbstractMethod> method(down_cast<AbstractMethod*>(method_class->AllocObject()));
+  SirtRef<AbstractMethod> method(Thread::Current(),
+                                 down_cast<AbstractMethod*>(method_class->AllocObject()));
   method->SetDeclaringClass(method_class);
   // TODO: use a special method for resolution method saves
   method->SetDexMethodIndex(DexFile::kDexNoIndex16);
@@ -993,9 +995,11 @@
   return method.get();
 }
 
-AbstractMethod* Runtime::CreateCalleeSaveMethod(InstructionSet instruction_set, CalleeSaveType type) {
+AbstractMethod* Runtime::CreateCalleeSaveMethod(InstructionSet instruction_set,
+                                                CalleeSaveType type) {
   Class* method_class = AbstractMethod::GetMethodClass();
-  SirtRef<AbstractMethod> method(down_cast<AbstractMethod*>(method_class->AllocObject()));
+  SirtRef<AbstractMethod>
+      method(Thread::Current(), down_cast<AbstractMethod*>(method_class->AllocObject()));
   method->SetDeclaringClass(method_class);
   // TODO: use a special method for callee saves
   method->SetDexMethodIndex(DexFile::kDexNoIndex16);