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

Allow BackupRefPtr on 32-bit

The |defined(ARCH_CPU_64_BITS)| check is a remnant of the
CheckedPtr2/MTECheckedPtr era, which worked only with 64-bit pointers.
BackupRefPtr doesn't have this limitation.

Bug: 1073933
Change-Id: I8e3dc79291b6bd2b118cb34b0b564f58e4ccc785
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2571143
Auto-Submit: Bartek Nowierski <bartekn@chromium.org>
Reviewed-by: default avatarBenoit L <lizeb@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Bartek Nowierski <bartekn@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837917}
parent b45c3f1e
...@@ -100,8 +100,6 @@ struct CheckedPtrNoOpImpl { ...@@ -100,8 +100,6 @@ struct CheckedPtrNoOpImpl {
static ALWAYS_INLINE void IncrementSwapCountForTest() {} static ALWAYS_INLINE void IncrementSwapCountForTest() {}
}; };
#if defined(ARCH_CPU_64_BITS) && !defined(OS_NACL)
#if ENABLE_BACKUP_REF_PTR_IMPL #if ENABLE_BACKUP_REF_PTR_IMPL
struct BackupRefPtrImpl { struct BackupRefPtrImpl {
...@@ -204,8 +202,6 @@ struct BackupRefPtrImpl { ...@@ -204,8 +202,6 @@ struct BackupRefPtrImpl {
#endif // ENABLE_BACKUP_REF_PTR_IMPL #endif // ENABLE_BACKUP_REF_PTR_IMPL
#endif // defined(ARCH_CPU_64_BITS) && !defined(OS_NACL)
} // namespace internal } // namespace internal
// DO NOT USE! EXPERIMENTAL ONLY! This is helpful for local testing! // DO NOT USE! EXPERIMENTAL ONLY! This is helpful for local testing!
...@@ -223,15 +219,13 @@ struct BackupRefPtrImpl { ...@@ -223,15 +219,13 @@ struct BackupRefPtrImpl {
// we aren't striving to maximize compatibility with raw pointers, merely // we aren't striving to maximize compatibility with raw pointers, merely
// adding support for cases encountered so far). // adding support for cases encountered so far).
template <typename T, template <typename T,
#if defined(ARCH_CPU_64_BITS) && !defined(OS_NACL) && \ #if BUILDFLAG(USE_PARTITION_ALLOC)
BUILDFLAG(USE_PARTITION_ALLOC)
#if ENABLE_BACKUP_REF_PTR_IMPL #if ENABLE_BACKUP_REF_PTR_IMPL
typename Impl = internal::BackupRefPtrImpl> typename Impl = internal::BackupRefPtrImpl>
#else #else
typename Impl = internal::CheckedPtrNoOpImpl> typename Impl = internal::CheckedPtrNoOpImpl>
#endif #endif
#else // defined(ARCH_CPU_64_BITS) && !defined(OS_NACL) && #else // BUILDFLAG(USE_PARTITION_ALLOC)
// BUILDFLAG(USE_PARTITION_ALLOC)
typename Impl = internal::CheckedPtrNoOpImpl> typename Impl = internal::CheckedPtrNoOpImpl>
#endif #endif
class CheckedPtr { class CheckedPtr {
......
...@@ -705,8 +705,6 @@ TEST_F(CheckedPtrTest, AssignmentFromNullptr) { ...@@ -705,8 +705,6 @@ TEST_F(CheckedPtrTest, AssignmentFromNullptr) {
} // namespace } // namespace
#if defined(ARCH_CPU_64_BITS) && !defined(OS_NACL)
namespace base { namespace base {
namespace internal { namespace internal {
...@@ -760,5 +758,3 @@ TEST(BackupRefPtrImpl, Basic) { ...@@ -760,5 +758,3 @@ TEST(BackupRefPtrImpl, Basic) {
// !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
} // namespace internal } // namespace internal
} // namespace base } // namespace base
#endif // defined(ARCH_CPU_64_BITS) && !defined(OS_NACL)
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