diff options
author | 2022-05-04 10:09:18 +0000 | |
---|---|---|
committer | 2022-05-04 14:26:59 +0000 | |
commit | 570ade8a6600d368a9e24b64cfa0a1907929166a (patch) | |
tree | 2b366b7e40289230562b2ea0933d0ef1dba2dad6 /runtime/art_method.cc | |
parent | 614638b9c178552953feda9ed366bd877002f1c9 (diff) |
Revert "Reland "Don't use AOT code for native methods for java debuggable runtime"""
This reverts commit 9d1413803e5be6746264e47b951e02f409c100a3.
Reason for revert: Failures mostly on 096-array-copy-concurrent-gc but also a couple of others. Example failure: https://logs.chromium.org/logs/art/buildbucket/cr-buildbucket/8815176149292612577/+/u/test_debuggable/stdout
Change-Id: Ia197d6094b4a4a744c7da5f120b59597db11747c
Diffstat (limited to 'runtime/art_method.cc')
-rw-r--r-- | runtime/art_method.cc | 9 |
1 files changed, 0 insertions, 9 deletions
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 |