1 files changed, 6 insertions, 1 deletions
diff --git a/runtime/trace.cc b/runtime/trace.cc
index 292cac6d0a..1986eec353 100644
--- a/runtime/trace.cc
+++ b/runtime/trace.cc
@@ -433,7 +433,12 @@ void Trace::Start(std::unique_ptr<File>&& trace_file_in,
                                                    instrumentation::Instrumentation::kMethodExited |
                                                    instrumentation::Instrumentation::kMethodUnwind);
         // TODO: In full-PIC mode, we don't need to fully deopt.
-        runtime->GetInstrumentation()->EnableMethodTracing(kTracerInstrumentationKey);
+        // TODO: We can only use trampoline entrypoints if we are java-debuggable since in that case
+        // we know that inlining and other problematic optimizations are disabled. We might just
+        // want to use the trampolines anyway since it is faster. It makes the story with disabling
+        // jit-gc more complex though.
+        runtime->GetInstrumentation()->EnableMethodTracing(
+            kTracerInstrumentationKey, /*needs_interpreter*/!runtime->IsJavaDebuggable());
       }
     }
   }