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.h | |
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.h')
-rw-r--r-- | compiler/jni/quick/calling_convention.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/compiler/jni/quick/calling_convention.h b/compiler/jni/quick/calling_convention.h index faa83daf7c..e62fc33a85 100644 --- a/compiler/jni/quick/calling_convention.h +++ b/compiler/jni/quick/calling_convention.h @@ -291,7 +291,6 @@ class JniCallingConvention : public CallingConvention { static std::unique_ptr<JniCallingConvention> Create(ArenaAllocator* allocator, bool is_static, bool is_synchronized, - bool is_fast_native, bool is_critical_native, const char* shorty, InstructionSet instruction_set); @@ -349,10 +348,6 @@ class JniCallingConvention : public CallingConvention { return 4u; } - bool IsFastNative() const { - return is_fast_native_; - } - bool IsCriticalNative() const { return is_critical_native_; } @@ -381,10 +376,9 @@ class JniCallingConvention : public CallingConvention { // Does the transition back spill the return value in the stack frame? bool SpillsReturnValue() const { - // Exclude return value for @FastNative and @CriticalNative methods for optimization speed. + // Exclude return value for @CriticalNative methods for optimization speed. // References are passed directly to the "end method" and there is nothing to save for `void`. - return (!IsFastNative() && !IsCriticalNative()) && - (!IsReturnAReference() && SizeOfReturnValue() != 0u); + return !IsCriticalNative() && !IsReturnAReference() && SizeOfReturnValue() != 0u; } protected: @@ -396,12 +390,10 @@ class JniCallingConvention : public CallingConvention { JniCallingConvention(bool is_static, bool is_synchronized, - bool is_fast_native, bool is_critical_native, const char* shorty, PointerSize frame_pointer_size) : CallingConvention(is_static, is_synchronized, shorty, frame_pointer_size), - is_fast_native_(is_fast_native), is_critical_native_(is_critical_native) {} protected: @@ -434,7 +426,6 @@ class JniCallingConvention : public CallingConvention { // Is the current argument (at the iterator) an extra argument for JNI? bool IsCurrentArgExtraForJni() const; - const bool is_fast_native_; const bool is_critical_native_; private: |