diff options
| author | Dmitry Petrochenko <dmitry.petrochenko@intel.com> | 2014-05-16 17:43:39 +0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-05-16 17:10:20 -0700 |
| commit | f0972a410a0665dbe32bd96df09a572d69f9f3a3 (patch) | |
| tree | 7e68b84a8395c72bdacb293c9e42cb3817f14668 /runtime/entrypoints/entrypoint_utils.h | |
| parent | de1129a26e0474ea8bb9112938ebb867163969fd (diff) | |
| download | art-f0972a410a0665dbe32bd96df09a572d69f9f3a3.tar.gz art-f0972a410a0665dbe32bd96df09a572d69f9f3a3.tar.bz2 art-f0972a410a0665dbe32bd96df09a572d69f9f3a3.zip | |
Fix generic jni issue in ArtMethod::GetQuickFrameInfo
The 64-bit host mode fails to start due to incorrect
detection of GetQuickGenericJniTrampoline.
The quick_code is 32-bit and taken from oat file, but
GetQuickGenericJniTrampoline returnf 0x7fffxx (64-bit)
address of trampoline and execution went to incorrect way.
Some clean-up.
Original Author: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Change-Id: I0952443b2a9f6833ad37ec373837ae208681fad7
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.h')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h index 6998e21572..bfcb58f274 100644 --- a/runtime/entrypoints/entrypoint_utils.h +++ b/runtime/entrypoints/entrypoint_utils.h @@ -737,11 +737,6 @@ static inline const void* GetQuickToInterpreterBridge() { return reinterpret_cast<void*>(art_quick_to_interpreter_bridge); } -extern "C" void art_quick_generic_jni_trampoline(mirror::ArtMethod*); -static inline const void* GetQuickGenericJniTrampoline() { - return reinterpret_cast<void*>(art_quick_generic_jni_trampoline); -} - static inline const void* GetQuickToPortableBridge() { // TODO: quick to portable bridge. Bug: 8196384 return GetQuickToInterpreterBridge(); @@ -763,10 +758,6 @@ static inline const void* GetQuickImtConflictTrampoline(ClassLinker* class_linke return class_linker->GetQuickImtConflictTrampoline(); } -static inline const void* GetQuickGenericJniTrampoline(ClassLinker* class_linker) { - return class_linker->GetQuickGenericJniTrampoline(); -} - static inline const void* GetQuickToInterpreterBridgeTrampoline(ClassLinker* class_linker) { return class_linker->GetQuickToInterpreterBridgeTrampoline(); } |