[Cherry Pick] Fix NoDestructor::PlacementStorage::get() const

Mohannad Farrag · Mohannad Farrag · commit 0946a33f30aa · 2024-06-26T10:47:03.000Z
It was trying to call a storage() method, which doesn't exist in PlacementStorage. This was uncovered by a recent Clang change: llvm/llvm-project#90152 Test: TH Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5515154 Change-Id: I5600487e559b36026a8114027b224380fc2e5183
diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/no_destructor.h b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/no_destructor.h
@@ -122,9 +122,7 @@ class NoDestructor {
       new (storage_) T(std::forward<Args>(args)...);
     }
 
-    const T* get() const {
-      return const_cast<PlacementStorage*>(this)->storage();
-    }
+    const T* get() const { return const_cast<PlacementStorage*>(this)->get(); }
     T* get() { return reinterpret_cast<T*>(storage_); }
 
    private:

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,7 @@ class NoDestructor {`
`122`	`122`	`new (storage_) T(std::forward<Args>(args)...);`
`123`	`123`	`}`
`124`	`124`
`125`		`- const T* get() const {`
`126`		`- return const_cast<PlacementStorage*>(this)->storage();`
`127`		`- }`
	`125`	`+ const T* get() const { return const_cast<PlacementStorage*>(this)->get(); }`
`128`	`126`	`T* get() { return reinterpret_cast<T*>(storage_); }`
`129`	`127`
`130`	`128`	`private:`