diff options
Diffstat (limited to 'dex2oat/driver/compiler_driver.cc')
| -rw-r--r-- | dex2oat/driver/compiler_driver.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc index 40b999b3c1..1b29e3b77a 100644 --- a/dex2oat/driver/compiler_driver.cc +++ b/dex2oat/driver/compiler_driver.cc @@ -301,7 +301,9 @@ std::unique_ptr<const std::vector<uint8_t>> CompilerDriver::CreateJniDlsymLookup std::unique_ptr<const std::vector<uint8_t>> CompilerDriver::CreateJniDlsymLookupCriticalTrampoline() const { - CREATE_TRAMPOLINE(JNI, kJniAbi, pDlsymLookupCritical) + // @CriticalNative calls do not have the `JNIEnv*` parameter, so this trampoline uses the + // architecture-dependent access to `Thread*` using the managed code ABI, i.e. `kQuickAbi`. + CREATE_TRAMPOLINE(JNI, kQuickAbi, pDlsymLookupCritical) } std::unique_ptr<const std::vector<uint8_t>> CompilerDriver::CreateQuickGenericJniTrampoline() |