From fb1b08cbb9c6ac149d75de16c14fdaa8b68baaa4 Mon Sep 17 00:00:00 2001 From: Mythri Alle Date: Thu, 12 May 2022 15:59:11 +0000 Subject: 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 --- runtime/art_method.cc | 9 --------- 1 file changed, 9 deletions(-) (limited to 'runtime/art_method.cc') diff --git a/runtime/art_method.cc b/runtime/art_method.cc index 40b7a7b48f..867f75c4b3 100644 --- a/runtime/art_method.cc +++ b/runtime/art_method.cc @@ -617,15 +617,6 @@ const OatQuickMethodHeader* ArtMethod::GetOatQuickMethodHeader(uintptr_t pc) { } OatQuickMethodHeader* method_header = OatQuickMethodHeader::FromEntryPoint(oat_entry_point); - // We could have existing Oat code for native methods but we may not use it if the runtime is java - // debuggable or when profiling boot class path. There is no easy way to check if the pc - // corresponds to QuickGenericJniStub. Since we have eliminated all the other cases, if the pc - // doesn't correspond to the AOT code then we must be running QuickGenericJniStub. - if (IsNative() && !method_header->Contains(pc)) { - DCHECK_NE(pc, 0u) << "PC 0 for " << PrettyMethod(); - return nullptr; - } - DCHECK(method_header->Contains(pc)) << PrettyMethod() << " " << std::hex << pc << " " << oat_entry_point -- cgit v1.2.3-59-g8ed1b