commit 8a295dadf8cfdb236fb5eb73c8cbc2fd45396852
author Dominic Chen <ddchen@apple.com> Thu Jul 07 12:59:44 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jul 07 13:16:15 2022 -0700
tree e97032f2684e8de0f0bb636b185d300edcd463e4
parent 0337305448e3fb1c3025474f0056bcef14fc66d7

[scudo] Add [[no_unique_address]] attribute to new MapPlatformData variables

Differential Revision: https://reviews.llvm.org/D129237

GitOrigin-RevId: 5f3818c7df7d2e2c9bc8b98d534b138f514238a4

release.h

diff --git a/release.h b/release.h
index 9dad3c3..49cc6ae 100644
--- a/release.h
+++ b/release.h
@@ -138,7 +138,7 @@
   uptr SizePerRegion;
   uptr BufferSize;
   uptr *Buffer;
-  MapPlatformData MapData = {};
+  [[no_unique_address]] MapPlatformData MapData = {};
 
   static HybridMutex Mutex;
   static uptr StaticBuffer[StaticBufferCount];

vector.h

diff --git a/vector.h b/vector.h
index 84e9c53..d43205a 100644
--- a/vector.h
+++ b/vector.h
@@ -95,7 +95,7 @@
   T LocalData[256 / sizeof(T)] = {};
   uptr CapacityBytes = 0;
   uptr Size = 0;
-  MapPlatformData MapData = {};
+  [[no_unique_address]] MapPlatformData MapData = {};
 };
 
 template <typename T> class Vector : public VectorNoCtor<T> {