Changed tracer to use an instance to hold state instead of statics.
Change-Id: I2fdcf5de7fbc745273b1a33cb409d13e72d24ab4
diff --git a/src/thread.cc b/src/thread.cc
index f6ce34d..4adf1e0 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -1114,7 +1114,7 @@
// DCHECK(frame.GetMethod()->IsWithinCode(pc)); // TODO: restore IsWithinCode
visitor->VisitFrame(frame, pc);
pc = ManglePc(frame.GetReturnPC());
- if (Trace::IsMethodTracingActive()) {
+ if (Runtime::Current()->IsMethodTracingActive()) {
#if defined(__arm__)
uintptr_t trace_exit = reinterpret_cast<uintptr_t>(art_trace_exit_from_code);
if (ManglePc(trace_exit) == pc) {
@@ -1359,7 +1359,7 @@
native_method_count_++;
} else {
// Unwind stack during method tracing
- if (Trace::IsMethodTracingActive()) {
+ if (Runtime::Current()->IsMethodTracingActive()) {
#if defined(__arm__)
uintptr_t trace_exit = reinterpret_cast<uintptr_t>(art_trace_exit_from_code);
if (ManglePc(trace_exit) == pc) {