diff options
author | 2022-06-27 11:09:49 +0000 | |
---|---|---|
committer | 2022-07-04 07:36:40 +0000 | |
commit | 6fb0acc14459a856c35b642e3368aff853259260 (patch) | |
tree | 0483c30969b98e5bfc75c7eed8ab4cef4f44a993 /compiler/utils/jni_macro_assembler.h | |
parent | 74e0b53a425ca3643db7dd43a39b57075853b21d (diff) |
Reland "Don't use instrumentation stubs for native methods in debuggable"
This reverts commit 5c9b55aa95295a287abd86f1e7fbe98c3f35ffd6.
Reason for revert: Relanding with fixes for failure
Fixes:
1. Arm64 needs to use 64-bit registers
2. We cannot deoptimize directly from GenericJniEndTrampoline since we
only have a refs and args frame. So call the method exit hooks from
art_quick_generic_jni_trampoline.
Change-Id: If1f08eca69626f60f42f10205b482a3764610846
Diffstat (limited to 'compiler/utils/jni_macro_assembler.h')
-rw-r--r-- | compiler/utils/jni_macro_assembler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/utils/jni_macro_assembler.h b/compiler/utils/jni_macro_assembler.h index c8c713ae67..36de012495 100644 --- a/compiler/utils/jni_macro_assembler.h +++ b/compiler/utils/jni_macro_assembler.h @@ -286,6 +286,8 @@ class JNIMacroAssembler : public DeletableArenaObject<kArenaAllocAssembler> { virtual void TestMarkBit(ManagedRegister ref, JNIMacroLabel* label, JNIMacroUnaryCondition cond) = 0; + // Emit a conditional jump to label if the loaded value from specified locations is not zero. + virtual void TestByteAndJumpIfNotZero(uintptr_t address, JNIMacroLabel* label) = 0; // Code at this offset will serve as the target for the Jump call. virtual void Bind(JNIMacroLabel* label) = 0; |