From d76551c7229060a3fe11258b490a11f4ee91e9f8 Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Thu, 25 Jan 2024 09:56:06 +0000 Subject: Revert^7 "Disable write-barrier elimination pass" This reverts commit 1ba3516e8c3e2b86c73084893dd297f468469181. Reason for revert: PS1 is reland as-is PS2 has two related fixes (for RISC-V and arm64) taking into account that when we store zero, we use a special register. Bug: 301833859 Bug: 310755375 Bug: 260843353 Test: lunch cf_riscv64_wear-trunk_staging-userdebug && m Test: lunch starnix_wear_yukawa-trunk_staging-userdebug && m Change-Id: I5e69890fd56404ddde56ebc457179241363d9243 --- compiler/optimizing/code_generator.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'compiler/optimizing/code_generator.h') diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 88e5a20240..fbb4f9e21e 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -380,6 +380,11 @@ class CodeGenerator : public DeletableArenaObject { bool EmitNonBakerReadBarrier() const; ReadBarrierOption GetCompilerReadBarrierOption() const; + // Returns true if we should check the GC card for consistency purposes. + bool ShouldCheckGCCard(DataType::Type type, + HInstruction* value, + WriteBarrierKind write_barrier_kind) const; + // Get the ScopedArenaAllocator used for codegen memory allocation. ScopedArenaAllocator* GetScopedAllocator(); @@ -503,6 +508,11 @@ class CodeGenerator : public DeletableArenaObject { return type == DataType::Type::kReference && !value->IsNullConstant(); } + // If we are compiling a graph with the WBE pass enabled, we want to honor the WriteBarrierKind + // set during the WBE pass. + bool StoreNeedsWriteBarrier(DataType::Type type, + HInstruction* value, + WriteBarrierKind write_barrier_kind) const; // Performs checks pertaining to an InvokeRuntime call. void ValidateInvokeRuntime(QuickEntrypointEnum entrypoint, -- cgit v1.2.3-59-g8ed1b