diff options
| author | 2024-01-23 13:55:50 +0000 | |
|---|---|---|
| committer | 2024-01-24 13:33:33 +0000 | |
| commit | 1be176f5a78750e2f0e32470f8c83e3d1643954d (patch) | |
| tree | 5b6ba41dc94cebac7f65a2bb97355398094964b3 /compiler/optimizing/scheduler_arm.cc | |
| parent | 6799d71854007cb1efe2bb4dcceda9f0f4f0e0a3 (diff) | |
Revert^5 "Disable write-barrier elimination pass"
This reverts commit 31b949bc4a76e5c6d00a8e18c346f123b5321a1c.
Reason for revert:
PS1 is reland as-is
PS2 has two fixes:
* Missed poisoning heap references in a code path
* Removed incorrect DCHECK
Change-Id: I81b317ddc704dbd8a173f5d5c624dbc69e2d9e60
Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b
Test: art/test/testrunner/testrunner.py --target --64 --optimizing -b
Both commnands with `export ART_HEAP_POISONING=true`
Bug: 301833859
Bug: 310755375
Bug: 260843353
Diffstat (limited to 'compiler/optimizing/scheduler_arm.cc')
| -rw-r--r-- | compiler/optimizing/scheduler_arm.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/optimizing/scheduler_arm.cc b/compiler/optimizing/scheduler_arm.cc index cafb0f5da6..510a0f5496 100644 --- a/compiler/optimizing/scheduler_arm.cc +++ b/compiler/optimizing/scheduler_arm.cc @@ -977,8 +977,6 @@ void SchedulingLatencyVisitorARM::HandleFieldSetLatencies(HInstruction* instruct DCHECK(codegen_ != nullptr); bool is_volatile = field_info.IsVolatile(); DataType::Type field_type = field_info.GetFieldType(); - bool needs_write_barrier = - CodeGenerator::StoreNeedsWriteBarrier(field_type, instruction->InputAt(1)); bool atomic_ldrd_strd = codegen_->GetInstructionSetFeatures().HasAtomicLdrdAndStrd(); switch (field_type) { @@ -997,7 +995,7 @@ void SchedulingLatencyVisitorARM::HandleFieldSetLatencies(HInstruction* instruct case DataType::Type::kInt32: case DataType::Type::kReference: - if (kPoisonHeapReferences && needs_write_barrier) { + if (kPoisonHeapReferences && field_type == DataType::Type::kReference) { last_visited_internal_latency_ += kArmIntegerOpLatency * 2; } last_visited_latency_ = kArmMemoryStoreLatency; |