[scudo] Pass MapPlatformData in more calls

[ddcc]

Summary

Allow platforms to avoid looking up private data by providing private context

[ddcc]

Fix duplicate variable

[vitalybuka]

compiler-rt/lib/scudo/standalone/release.h

141

Data -> MapData

compiler-rt/lib/scudo/standalone/vector.h

94–95

PlatformData -> MapData

95

Can you make it the last member as well?

[ddcc]

Rename variable and reorder

[vitalybuka]

compiler-rt/lib/scudo/standalone/vector.h

99

Can you please mark them both with [[no_unique_address]] to avoid vector size increase on other platforms

[vitalybuka]

compiler-rt/lib/scudo/standalone/vector.h

99

Can you please mark them both with [[no_unique_address]] to avoid vector size increase on other platforms

Looks like you missed the last comment

[ddcc]

Oops I did, I'll add another commit for that.

compiler-rt/lib/scudo/standalone/release.h

PackedCounterArray(uptr NumberOfRegions, uptr CountersPerRegion,
     BufferSize = SizePerRegion * sizeof(*Buffer) * Regions;
     if (BufferSize <= (StaticBufferCount * sizeof(Buffer[0])) &&
         Mutex.tryLock()) {
       Buffer = &StaticBuffer[0];
       memset(Buffer, 0, BufferSize);
     } else {
       Buffer = reinterpret_cast<uptr *>(
           map(nullptr, roundUpTo(BufferSize, getPageSizeCached()),
-              "scudo:counters", MAP_ALLOWNOMEM));
+              "scudo:counters", MAP_ALLOWNOMEM, &Data));
     }
   }
   ~PackedCounterArray() {
     if (!isAllocated())
       return;
     if (Buffer == &StaticBuffer[0])
       Mutex.unlock();
     else
       unmap(reinterpret_cast<void *>(Buffer),
-            roundUpTo(BufferSize, getPageSizeCached()));
+            roundUpTo(BufferSize, getPageSizeCached()), 0, &Data);
   }
 
   bool isAllocated() const { return !!Buffer; }
 
   uptr getCount() const { return NumCounters; }
 
   uptr get(uptr Region, uptr I) const {
     DCHECK_LT(Region, Regions);
private:
   uptr CounterSizeBitsLog;
   uptr CounterMask;
   uptr PackingRatioLog;
   uptr BitOffsetMask;
 
   uptr SizePerRegion;
   uptr BufferSize;
   uptr *Buffer;
+  MapPlatformData Data = {};
 
   static HybridMutex Mutex;
   static uptr StaticBuffer[StaticBufferCount];
 };
 
 template <class ReleaseRecorderT> class FreePagesRangeTracker {
 public:
   explicit FreePagesRangeTracker(ReleaseRecorderT *Recorder)

compiler-rt/lib/scudo/standalone/vector.h

public:
   constexpr void init(uptr InitialCapacity = 0) {
     Data = &LocalData[0];
     CapacityBytes = sizeof(LocalData);
     if (InitialCapacity > capacity())
       reserve(InitialCapacity);
   }
   void destroy() {
     if (Data != &LocalData[0])
-      unmap(Data, CapacityBytes);
+      unmap(Data, CapacityBytes, 0, &Data);
   }
   T &operator[](uptr I) {
     DCHECK_LT(I, Size);
     return Data[I];
   }
   const T &operator[](uptr I) const {
     DCHECK_LT(I, Size);
     return Data[I];
public:
   const T *end() const { return data() + size(); }
   T *end() { return data() + size(); }
 
 private:
   void reallocate(uptr NewCapacity) {
     DCHECK_GT(NewCapacity, 0);
     DCHECK_LE(Size, NewCapacity);
     NewCapacity = roundUpTo(NewCapacity * sizeof(T), getPageSizeCached());
-    T *NewData =
-        reinterpret_cast<T *>(map(nullptr, NewCapacity, "scudo:vector"));
+    T *NewData = reinterpret_cast<T *>(
+        map(nullptr, NewCapacity, "scudo:vector", 0, &Data));
     memcpy(NewData, Data, Size * sizeof(T));
     destroy();
     Data = NewData;
     CapacityBytes = NewCapacity;
   }
 
   T *Data = nullptr;
+  MapPlatformData Data = {};
   T LocalData[256 / sizeof(T)] = {};
   uptr CapacityBytes = 0;
   uptr Size = 0;
 };
 
 template <typename T> class Vector : public VectorNoCtor<T> {
 public:
   constexpr Vector() { VectorNoCtor<T>::init(); }
   explicit Vector(uptr Count) {
     VectorNoCtor<T>::init(Count);
     this->resize(Count);
   }