diff options
author | 2018-01-14 00:22:04 +0000 | |
---|---|---|
committer | 2018-01-14 00:29:51 +0000 | |
commit | c971f6e06a43e70a2d86cb4b3ad0e13a9ae9a06c (patch) | |
tree | 9fa6be931e7bc8d0f47b0eb2d91a683ffcf1c3f1 /runtime/class_linker.h | |
parent | 94730ef9ca432b5ede81e928cffc4006911aa650 (diff) |
Revert "Ensure that methods requiring interpreter entrypoint always have it."
This reverts commit 94730ef9ca432b5ede81e928cffc4006911aa650.
Debug tests failing.
Ran: test/run-test --always-clean --prebuild --compact-dex-level none --optimizing --no-relocate --runtime-option -Xcheck:jni --64 --build-with-javac-dx 067-preemptive-unpark
Bug: 62821960
Change-Id: Ia4fb7b7b3a60879662dea50ce32b1cfb5e0a3eff
Diffstat (limited to 'runtime/class_linker.h')
-rw-r--r-- | runtime/class_linker.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 62804e79c5..3e3425f5ac 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -498,8 +498,9 @@ class ClassLinker { std::string GetDescriptorForProxy(ObjPtr<mirror::Class> proxy_class) REQUIRES_SHARED(Locks::mutator_lock_); - // Get the correct entrypoint for a method as far as the class-linker is concerned. - const void* GetQuickEntrypointFor(ArtMethod* method) REQUIRES_SHARED(Locks::mutator_lock_); + // Get the oat code for a method when its class isn't yet initialized. + const void* GetQuickOatCodeFor(ArtMethod* method) + REQUIRES_SHARED(Locks::mutator_lock_); pid_t GetClassesLockOwner(); // For SignalCatcher. pid_t GetDexLockOwner(); // For SignalCatcher. |