Revert "Reland^2 "Don't use AOT code for native methods for java debuggable runtime""

This reverts commit 5da52cd20ea0d24b038ae20c6c96aa22ac3a24a0.

Reason for revert: https://ci.chromium.org/ui/p/art/builders/ci/host-x86_64-cdex-fast/5172/overview

Change-Id: I9cebbaa145810547531a90af9da7961c0b6255d1

1 files changed, 2 insertions, 6 deletions

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index d2eb3bdf63..9a6c8a5c3c 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -3147,19 +3147,15 @@ class UpdateEntryPointsClassVisitor : public ClassVisitor {
     auto pointer_size = Runtime::Current()->GetClassLinker()->GetImagePointerSize();
     for (auto& m : klass->GetMethods(pointer_size)) {
       const void* code = m.GetEntryPointFromQuickCompiledCode();
-      // For java debuggable runtimes we also deoptimize native methods. For other cases (boot
-      // image profiling) we don't need to deoptimize native methods. If this changes also
-      // update Instrumentation::CanUseAotCode.
-      bool deoptimize_native_methods = Runtime::Current()->IsJavaDebuggable();
       if (Runtime::Current()->GetHeap()->IsInBootImageOatFile(code) &&
-          (!m.IsNative() || deoptimize_native_methods) &&
+          !m.IsNative() &&
           !m.IsProxyMethod()) {
         instrumentation_->InitializeMethodsCode(&m, /*aot_code=*/ nullptr);
       }
 
       if (Runtime::Current()->GetJit() != nullptr &&
           Runtime::Current()->GetJit()->GetCodeCache()->IsInZygoteExecSpace(code) &&
-          (!m.IsNative() || deoptimize_native_methods)) {
+          !m.IsNative()) {
         DCHECK(!m.IsProxyMethod());
         instrumentation_->InitializeMethodsCode(&m, /*aot_code=*/ nullptr);
       }