diff options
| author | 2022-04-20 01:39:28 +0000 | |
|---|---|---|
| committer | 2022-08-10 18:06:05 +0000 | |
| commit | ca5ed9f281a5758814d2495da80178de56945720 (patch) | |
| tree | 3633a7ace321b10dd2ae6ffadd69d525c7a530e5 /compiler/utils/arm64/assembler_arm64.cc | |
| parent | 1325bb173c3160b8ff2ecfc2d1aefd185c773ee4 (diff) | |
Convert kUseReadBarrier to static const from constexpr
This CL would compile both CC and userfaultfd GC in the art library,
enabling us to choose either of the two during boot time depending on
whether the device has userfaultfd kernel feature or not.
The CC GC is still chosen unless we use ART_USE_READ_BARRIER=false
during build time. This behavior will later be changed to choosing CC
*only* if ART_USE_READ_BARRIER=true is used. In other cases, if the
device has userfaultfd support then that GC will be chosen.
Bug: 160737021
Bug: 230021033
Test: art/test/testrunner/testrunner.py
Change-Id: I370f1a9f6b8cdff8c2ce3cf7aa936bccd7ed675f
Diffstat (limited to 'compiler/utils/arm64/assembler_arm64.cc')
| -rw-r--r-- | compiler/utils/arm64/assembler_arm64.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/utils/arm64/assembler_arm64.cc b/compiler/utils/arm64/assembler_arm64.cc index 6100ed9855..df05838e2c 100644 --- a/compiler/utils/arm64/assembler_arm64.cc +++ b/compiler/utils/arm64/assembler_arm64.cc @@ -188,7 +188,7 @@ void Arm64Assembler::MaybeUnpoisonHeapReference(Register reg) { void Arm64Assembler::GenerateMarkingRegisterCheck(Register temp, int code) { // The Marking Register is only used in the Baker read barrier configuration. - DCHECK(kEmitCompilerReadBarrier); + DCHECK(gUseReadBarrier); DCHECK(kUseBakerReadBarrier); vixl::aarch64::Register mr = reg_x(MR); // Marking Register. |