diff options
author | 2021-10-19 16:19:34 +0000 | |
---|---|---|
committer | 2021-10-19 16:23:58 +0000 | |
commit | 2ca0900e98d826644960eefeb8a21c84850c9e04 (patch) | |
tree | ba8a25622f6bee25817be41880ea01c345d9a2b1 /compiler/jni/quick/calling_convention.cc | |
parent | 44101a388089b4e23b284e1794eb475938a2f7ed (diff) |
Revert "JNI: Remove `JniMethodFast{Start,End}()`."
This reverts commit 64d6e187f19ed670429652020561887e6b220216.
Reason for revert: Breaks no-image JIT run tests (flaky).
Bug: 172332525
Change-Id: I7813d89283eff0f6266318d3fb02d1257471798d
Diffstat (limited to 'compiler/jni/quick/calling_convention.cc')
-rw-r--r-- | compiler/jni/quick/calling_convention.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/compiler/jni/quick/calling_convention.cc b/compiler/jni/quick/calling_convention.cc index e7a84fdaec..fd05941d0d 100644 --- a/compiler/jni/quick/calling_convention.cc +++ b/compiler/jni/quick/calling_convention.cc @@ -134,7 +134,6 @@ bool ManagedRuntimeCallingConvention::IsCurrentParamALong() { std::unique_ptr<JniCallingConvention> JniCallingConvention::Create(ArenaAllocator* allocator, bool is_static, bool is_synchronized, - bool is_fast_native, bool is_critical_native, const char* shorty, InstructionSet instruction_set) { @@ -144,25 +143,25 @@ std::unique_ptr<JniCallingConvention> JniCallingConvention::Create(ArenaAllocato case InstructionSet::kThumb2: return std::unique_ptr<JniCallingConvention>( new (allocator) arm::ArmJniCallingConvention( - is_static, is_synchronized, is_fast_native, is_critical_native, shorty)); + is_static, is_synchronized, is_critical_native, shorty)); #endif #ifdef ART_ENABLE_CODEGEN_arm64 case InstructionSet::kArm64: return std::unique_ptr<JniCallingConvention>( new (allocator) arm64::Arm64JniCallingConvention( - is_static, is_synchronized, is_fast_native, is_critical_native, shorty)); + is_static, is_synchronized, is_critical_native, shorty)); #endif #ifdef ART_ENABLE_CODEGEN_x86 case InstructionSet::kX86: return std::unique_ptr<JniCallingConvention>( new (allocator) x86::X86JniCallingConvention( - is_static, is_synchronized, is_fast_native, is_critical_native, shorty)); + is_static, is_synchronized, is_critical_native, shorty)); #endif #ifdef ART_ENABLE_CODEGEN_x86_64 case InstructionSet::kX86_64: return std::unique_ptr<JniCallingConvention>( new (allocator) x86_64::X86_64JniCallingConvention( - is_static, is_synchronized, is_fast_native, is_critical_native, shorty)); + is_static, is_synchronized, is_critical_native, shorty)); #endif default: LOG(FATAL) << "Unknown InstructionSet: " << instruction_set; |