From 6287c238a56ef32f6614484eb8ec9bcc9b726a8e Mon Sep 17 00:00:00 2001 From: Artem Serov Date: Tue, 29 Nov 2016 13:31:33 +0000 Subject: ARM: Fix JNI MacroAssembler after VIXL update. This patch fixes an issue found here: https://android-review.googlesource.com/#/c/307532/ Also re-enables vixl MacroAssembler for arm. Test: export ART_USE_READ_BARRIER=true; export ART_HEAP_POISONING=true; \ m test-art-host Test: export ART_USE_READ_BARRIER=true; export ART_HEAP_POISONING=true; \ m test-art-target Test: dump-oat-boot with ART_USE_READ_BARRIER=true Change-Id: I03e3014fb250791db2d24a0ab1a76ca96384c332 --- compiler/utils/jni_macro_assembler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/utils/jni_macro_assembler.cc') diff --git a/compiler/utils/jni_macro_assembler.cc b/compiler/utils/jni_macro_assembler.cc index 1b743134ed..2f154fb862 100644 --- a/compiler/utils/jni_macro_assembler.cc +++ b/compiler/utils/jni_macro_assembler.cc @@ -20,7 +20,7 @@ #include #ifdef ART_ENABLE_CODEGEN_arm -#include "arm/jni_macro_assembler_arm.h" +#include "arm/jni_macro_assembler_arm_vixl.h" #endif #ifdef ART_ENABLE_CODEGEN_arm64 #include "arm64/jni_macro_assembler_arm64.h" @@ -58,7 +58,7 @@ MacroAsm32UniquePtr JNIMacroAssembler::Create( #ifdef ART_ENABLE_CODEGEN_arm case kArm: case kThumb2: - return MacroAsm32UniquePtr(new (arena) arm::ArmJNIMacroAssembler(arena, instruction_set)); + return MacroAsm32UniquePtr(new (arena) arm::ArmVIXLJNIMacroAssembler(arena)); #endif #ifdef ART_ENABLE_CODEGEN_mips case kMips: -- cgit v1.2.3-59-g8ed1b