Ensure that we don't call MethodEntered on runtime methods
It was possible we could incorrectly send an instrumentation method
entry event on a runtime method in some circumstances.
NB Several additional patches are required for the instrumentation
trampolines to actually work correctly in all instances.
Test: ./test.py --host
Test: ./test/testrunner/testrunner.py --host --runtime-option=-Xplugin:libtracefast-trampolined.so
Change-Id: Id21c36e4cc0ab70083162fa1d40510f7d823b9a9
diff --git a/runtime/instrumentation.cc b/runtime/instrumentation.cc
index cf1d797..34e2711 100644
--- a/runtime/instrumentation.cc
+++ b/runtime/instrumentation.cc
@@ -362,7 +362,7 @@
}
uint32_t dex_pc = visitor.dex_pcs_.back();
visitor.dex_pcs_.pop_back();
- if (!isi->interpreter_entry_) {
+ if (!isi->interpreter_entry_ && !isi->method_->IsRuntimeMethod()) {
instrumentation->MethodEnterEvent(thread, (*isi).this_object_, (*isi).method_, dex_pc);
}
}