Revert "Add a fast path for method tracing in artMethodExitHooks"

This reverts commit f5575f8e6a8d159bf8304ab4711fb9887c020476.

Reason for revert: Build breakage
Bug: 300656397

Change-Id: I7b69f2232f3142af874ec899f993789e112c9d07

2 files changed, 1 insertions, 13 deletions

diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index 9c5fe5f096..f43ab0d268 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -2548,16 +2548,8 @@ extern "C" void artMethodExitHook(Thread* self,
   instrumentation::Instrumentation* instr = Runtime::Current()->GetInstrumentation();
   DCHECK(instr->RunExitHooks());
 
-  ArtMethod* method = *sp;
-  if (instr->HasFastMethodExitListeners()) {
-    // Fast method listeners are only used for tracing which don't need any deoptimization checks
-    // or a return value.
-    JValue return_value;
-    instr->MethodExitEvent(self, method, /* frame= */ {}, return_value);
-    return;
-  }
-
   bool is_ref = false;
+  ArtMethod* method = *sp;
   if (instr->HasMethodExitListeners()) {
     StackHandleScope<1> hs(self);
 
diff --git a/runtime/instrumentation.h b/runtime/instrumentation.h
index f1692cfa68..fde3f1a4c5 100644
--- a/runtime/instrumentation.h
+++ b/runtime/instrumentation.h
@@ -378,10 +378,6 @@ class Instrumentation {
     return have_method_exit_listeners_ != 0;
   }
 
-  bool HasFastMethodExitListeners() const REQUIRES_SHARED(Locks::mutator_lock_) {
-    return have_method_exit_listeners_ == kFastTraceListeners;
-  }
-
   bool HasMethodUnwindListeners() const REQUIRES_SHARED(Locks::mutator_lock_) {
     return have_method_unwind_listeners_;
   }