Commit dcfbf061 authored by Bartek Nowierski's avatar Bartek Nowierski Committed by Chromium LUCI CQ

PCScan: Don't enable for Blink on 32-bit

My crrev.com/c/2601894 broke the code, because it stopped reserving
memory for PCScan on 32-bit, without realizing that PCScan still runs
in Blink on 32-bit. The problem occurs only if PCScanBlinkPartitions
experiment is on.

Bug: 11297512, 1163824
Change-Id: I3a116d3b33ea3f83db1e413d3ae12005a07980a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617402
Commit-Queue: Bartek Nowierski <bartekn@chromium.org>
Auto-Submit: Bartek Nowierski <bartekn@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841370}
parent fc6fa060
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "base/allocator/partition_allocator/memory_reclaimer.h" #include "base/allocator/partition_allocator/memory_reclaimer.h"
#include "base/allocator/partition_allocator/oom.h" #include "base/allocator/partition_allocator/oom.h"
#include "base/allocator/partition_allocator/page_allocator.h" #include "base/allocator/partition_allocator/page_allocator.h"
#include "base/allocator/partition_allocator/partition_alloc_constants.h"
#include "base/allocator/partition_allocator/partition_alloc_features.h" #include "base/allocator/partition_allocator/partition_alloc_features.h"
#include "base/debug/alias.h" #include "base/debug/alias.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
...@@ -48,9 +49,11 @@ namespace WTF { ...@@ -48,9 +49,11 @@ namespace WTF {
const char* const Partitions::kAllocatedObjectPoolName = const char* const Partitions::kAllocatedObjectPoolName =
"partition_alloc/allocated_objects"; "partition_alloc/allocated_objects";
#if defined(PA_HAS_64_BITS_POINTERS) && !ENABLE_REF_COUNT_FOR_BACKUP_REF_PTR
// Runs PCScan on WTF partitions. // Runs PCScan on WTF partitions.
const base::Feature kPCScanBlinkPartitions{"PCScanBlinkPartitions", const base::Feature kPCScanBlinkPartitions{"PCScanBlinkPartitions",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
#endif
bool Partitions::initialized_ = false; bool Partitions::initialized_ = false;
...@@ -103,7 +106,7 @@ bool Partitions::InitializeOnce() { ...@@ -103,7 +106,7 @@ bool Partitions::InitializeOnce() {
buffer_root_ = buffer_allocator->root(); buffer_root_ = buffer_allocator->root();
layout_root_ = layout_allocator->root(); layout_root_ = layout_allocator->root();
#if !ENABLE_REF_COUNT_FOR_BACKUP_REF_PTR #if defined(PA_HAS_64_BITS_POINTERS) && !ENABLE_REF_COUNT_FOR_BACKUP_REF_PTR
if (base::features::IsPartitionAllocPCScanEnabled() || if (base::features::IsPartitionAllocPCScanEnabled() ||
base::FeatureList::IsEnabled(kPCScanBlinkPartitions)) { base::FeatureList::IsEnabled(kPCScanBlinkPartitions)) {
#if !BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) #if !BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment