From 65429ce9bcaf8779f5d6cd14aeee4acd60006095 Mon Sep 17 00:00:00 2001 From: Lokesh Gidra Date: Sun, 29 May 2022 14:17:29 +0000 Subject: Fix gtest failures due to userfaultfd GC Mostly involved replacing compile-test check for read-barrier with runtime one. Bug: 160737021 Test: art/test/testrunner/run_build_test_target.py -j art-test Change-Id: I685e4b717d314a19f7714ece5c8b84f23154cc66 --- compiler/optimizing/optimizing_cfi_test.cc | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'compiler/optimizing/optimizing_cfi_test.cc') diff --git a/compiler/optimizing/optimizing_cfi_test.cc b/compiler/optimizing/optimizing_cfi_test.cc index bad540e03c..73e1fbea55 100644 --- a/compiler/optimizing/optimizing_cfi_test.cc +++ b/compiler/optimizing/optimizing_cfi_test.cc @@ -167,9 +167,20 @@ TEST_ISA(kThumb2) // barrier configuration, and as such is removed from the set of // callee-save registers in the ARM64 code generator of the Optimizing // compiler. -#if defined(USE_READ_BARRIER) && defined(USE_BAKER_READ_BARRIER) -TEST_ISA(kArm64) -#endif +// +// We can't use compile-time macros for read-barrier as the introduction +// of userfaultfd-GC has made it a runtime choice. +TEST_F(OptimizingCFITest, kArm64) { + if (kUseBakerReadBarrier && gUseReadBarrier) { + std::vector expected_asm( + expected_asm_kArm64, + expected_asm_kArm64 + arraysize(expected_asm_kArm64)); + std::vector expected_cfi( + expected_cfi_kArm64, + expected_cfi_kArm64 + arraysize(expected_cfi_kArm64)); + TestImpl(InstructionSet::kArm64, "kArm64", expected_asm, expected_cfi); + } +} #endif #ifdef ART_ENABLE_CODEGEN_x86 -- cgit v1.2.3-59-g8ed1b