chromium/src
0
Fork 0
Code Activity

Revert "[PA] Fix compile failure in PartitionRoot::CheckMetadataIntegrity"

Browse Source 
This reverts commit 56390fdc30.

Reason for revert: This is a fix for the culprit of uprev failure "Add base::CheckHeapIntegrity to investigate corruption". Reverting this as well.

Original change's description:
> [PA] Fix compile failure in PartitionRoot::CheckMetadataIntegrity
>
> This should fix the compile error which triggered tree closure.
> https://ci.chromium.org/ui/p/chromium/builders/ci/ios-device/415904/overview
>
> Bug: 371135823, 346464587
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Change-Id: I0d6d03dd021df6289bf22a9136866175384eac0e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6390216
> Commit-Queue: Mikihito Matsuura <mikt@google.com>
> Reviewed-by: Takashi Sakamoto <tasak@google.com>
> Cr-Commit-Position: refs/heads/main@{#1437318}

Bug: 371135823, 346464587
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I1c92e922811475277c18cf6928ff89b73fc267be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6394200
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Wen-Chien Wang <wcwang@chromium.org>
Auto-Submit: Wen-Chien Wang <wcwang@chromium.org>
Owners-Override: Wen-Chien Wang <wcwang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1437763}
This commit is contained in:
Wen-Chien Wang
2025-03-25 14:59:59 -07:00
committed by Chromium LUCI CQ
parent 59909928a7
commit 1cd920f6cf
1 changed files with 0 additions and 4 deletions

4
base/allocator/partition_allocator/src/partition_alloc/partition_root.cc

@ -2039,8 +2039,6 @@ void PartitionRoot::CheckMetadataIntegrity(const void* ptr) {
ReadOnlySlotSpanMetadata::FromAddr(address);
PA_CHECK(PartitionRoot::FromSlotSpanMetadata(slot_span) == root);
#if PA_BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT) || \
PA_BUILDFLAG(USE_PARTITION_COOKIE)
uintptr_t slot_span_start =
ReadOnlySlotSpanMetadata::ToSlotSpanStart(slot_span);
size_t offset_in_slot_span = address - slot_span_start;
@ -2049,8 +2047,6 @@ void PartitionRoot::CheckMetadataIntegrity(const void* ptr) {
uintptr_t untagged_slot_start =
slot_span_start +
bucket->slot_size * bucket->GetSlotNumber(offset_in_slot_span);
#endif // PA_BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT) ||
// PA_BUILDFLAG(USE_PARTITION_COOKIE)
#if PA_BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT)
if (root->brp_enabled()) {