diff options
author | 2024-01-19 16:28:06 +0000 | |
---|---|---|
committer | 2024-01-19 16:28:06 +0000 | |
commit | 9f8df195b7ff2ce47eec4e9b193ff3214ebed19c (patch) | |
tree | 8dc68a588a6ee5c6e00c9e5bed519a9c6774d4c5 /compiler/optimizing/intrinsics_riscv64.cc | |
parent | 7c1dd6e2d1893f288214413c4b97273980f3aa4a (diff) |
Revert^2 "Disable write-barrier elimination pass"
This reverts commit 7c1dd6e2d1893f288214413c4b97273980f3aa4a.
Reason for revert: build breakages, using a different number of temps vs the expected (crashing in https://cs.android.com/android/platform/superproject/main/+/main:art/compiler/optimizing/code_generator_x86_64.cc;l=5488;drc=7c1dd6e2d1893f288214413c4b97273980f3aa4a)
Change-Id: I843c039394dd666776ea5bcb5b10b1f47df12d53
Diffstat (limited to 'compiler/optimizing/intrinsics_riscv64.cc')
-rw-r--r-- | compiler/optimizing/intrinsics_riscv64.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/compiler/optimizing/intrinsics_riscv64.cc b/compiler/optimizing/intrinsics_riscv64.cc index 698c7e5157..a43ab2f206 100644 --- a/compiler/optimizing/intrinsics_riscv64.cc +++ b/compiler/optimizing/intrinsics_riscv64.cc @@ -1771,7 +1771,7 @@ void IntrinsicCodeGeneratorRISCV64::VisitSystemArrayCopy(HInvoke* invoke) { } // We only need one card marking on the destination array. - codegen_->MarkGCCard(dest); + codegen_->MarkGCCard(dest, XRegister(kNoXRegister), /* emit_null_check= */ false); __ Bind(&skip_copy_and_write_barrier); } @@ -2127,7 +2127,7 @@ static void GenUnsafePut(HInvoke* invoke, if (type == DataType::Type::kReference) { bool value_can_be_null = true; // TODO: Worth finding out this information? - codegen->MaybeMarkGCCard(base, value.AsRegister<XRegister>(), value_can_be_null); + codegen->MarkGCCard(base, value.AsRegister<XRegister>(), value_can_be_null); } } @@ -2348,7 +2348,7 @@ static void GenUnsafeCas(HInvoke* invoke, CodeGeneratorRISCV64* codegen, DataTyp if (type == DataType::Type::kReference) { // Mark card for object assuming new value is stored. bool new_value_can_be_null = true; // TODO: Worth finding out this information? - codegen->MaybeMarkGCCard(object, new_value, new_value_can_be_null); + codegen->MarkGCCard(object, new_value, new_value_can_be_null); } ScratchRegisterScope srs(assembler); @@ -2547,7 +2547,7 @@ static void GenUnsafeGetAndUpdate(HInvoke* invoke, DCHECK(get_and_update_op == GetAndUpdateOp::kSet); // Mark card for object as a new value shall be stored. bool new_value_can_be_null = true; // TODO: Worth finding out this information? - codegen->MaybeMarkGCCard(base, /*value=*/arg, new_value_can_be_null); + codegen->MarkGCCard(base, /*value=*/ arg, new_value_can_be_null); } ScratchRegisterScope srs(assembler); @@ -3332,8 +3332,7 @@ static void GenerateVarHandleSet(HInvoke* invoke, } if (CodeGenerator::StoreNeedsWriteBarrier(value_type, invoke->InputAt(value_index))) { - codegen->MaybeMarkGCCard( - target.object, value.AsRegister<XRegister>(), /* emit_null_check= */ true); + codegen->MarkGCCard(target.object, value.AsRegister<XRegister>(), /* emit_null_check= */ true); } if (slow_path != nullptr) { @@ -3555,8 +3554,7 @@ static void GenerateVarHandleCompareAndSetOrExchange(HInvoke* invoke, if (CodeGenerator::StoreNeedsWriteBarrier(value_type, invoke->InputAt(new_value_index))) { // Mark card for object assuming new value is stored. bool new_value_can_be_null = true; // TODO: Worth finding out this information? - codegen->MaybeMarkGCCard( - target.object, new_value.AsRegister<XRegister>(), new_value_can_be_null); + codegen->MarkGCCard(target.object, new_value.AsRegister<XRegister>(), new_value_can_be_null); } // Scratch registers may be needed for `new_value` and `expected`. @@ -3921,7 +3919,7 @@ static void GenerateVarHandleGetAndUpdate(HInvoke* invoke, DCHECK(get_and_update_op == GetAndUpdateOp::kSet); // Mark card for object, the new value shall be stored. bool new_value_can_be_null = true; // TODO: Worth finding out this information? - codegen->MaybeMarkGCCard(target.object, arg.AsRegister<XRegister>(), new_value_can_be_null); + codegen->MarkGCCard(target.object, arg.AsRegister<XRegister>(), new_value_can_be_null); } size_t data_size = DataType::Size(value_type); |