commit da33625f315343cddce1108f3fffc40b6b7b4733
author Clark DuVall <cduvall@chromium.org> Wed Feb 07 21:20:51 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Feb 07 21:20:51 2024 +0000
tree 166c803a6e4f9566cddaa1e6d29fb03dbb5f05bb
parent 78f512eee44baec08a60f6b38ea241466283d8c0

Add DisableDanglingPtrDetection to HostMapped userdata pointers

The user data is owned by the caller, so it's ok for these to be
dangling.

Change-Id: I18b425a18aeb215398ccd39e7bf7144a3cccef28
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/173845
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Auto-Submit: Clark DuVall <cduvall@chromium.org>

src/dawn/native/d3d12/BufferD3D12.cpp

diff --git a/src/dawn/native/d3d12/BufferD3D12.cpp b/src/dawn/native/d3d12/BufferD3D12.cpp
index 237e715..453f8c8 100644
--- a/src/dawn/native/d3d12/BufferD3D12.cpp
+++ b/src/dawn/native/d3d12/BufferD3D12.cpp
@@ -516,7 +516,7 @@
 
             std::unique_ptr<Heap> heap;
             wgpu::Callback callback;
-            raw_ptr<void> userdata;
+            raw_ptr<void, DisableDanglingPtrDetection> userdata;
         };
         std::unique_ptr<DisposeTask> request = std::make_unique<DisposeTask>(
             std::move(mHostMappedHeap), mHostMappedDisposeCallback, mHostMappedDisposeUserdata);

src/dawn/native/d3d12/BufferD3D12.h

diff --git a/src/dawn/native/d3d12/BufferD3D12.h b/src/dawn/native/d3d12/BufferD3D12.h
index dcc25b0..bd0c13e 100644
--- a/src/dawn/native/d3d12/BufferD3D12.h
+++ b/src/dawn/native/d3d12/BufferD3D12.h
@@ -100,7 +100,7 @@
 
     std::unique_ptr<Heap> mHostMappedHeap;
     wgpu::Callback mHostMappedDisposeCallback = nullptr;
-    raw_ptr<void> mHostMappedDisposeUserdata = nullptr;
+    raw_ptr<void, DisableDanglingPtrDetection> mHostMappedDisposeUserdata = nullptr;
 };
 
 }  // namespace dawn::native::d3d12

src/dawn/native/vulkan/BufferVk.cpp

diff --git a/src/dawn/native/vulkan/BufferVk.cpp b/src/dawn/native/vulkan/BufferVk.cpp
index 9a457aa..d0ac815 100644
--- a/src/dawn/native/vulkan/BufferVk.cpp
+++ b/src/dawn/native/vulkan/BufferVk.cpp
@@ -572,7 +572,7 @@
             void HandleShutDownImpl() override { callback(userdata); }
 
             wgpu::Callback callback;
-            raw_ptr<void> userdata;
+            raw_ptr<void, DisableDanglingPtrDetection> userdata;
         };
         std::unique_ptr<DisposeTask> request =
             std::make_unique<DisposeTask>(mHostMappedDisposeCallback, mHostMappedDisposeUserdata);

src/dawn/native/vulkan/BufferVk.h

diff --git a/src/dawn/native/vulkan/BufferVk.h b/src/dawn/native/vulkan/BufferVk.h
index 471d84c..8dfa8f5 100644
--- a/src/dawn/native/vulkan/BufferVk.h
+++ b/src/dawn/native/vulkan/BufferVk.h
@@ -104,7 +104,7 @@
     VkDeviceMemory mDedicatedDeviceMemory = VK_NULL_HANDLE;
 
     wgpu::Callback mHostMappedDisposeCallback = nullptr;
-    raw_ptr<void> mHostMappedDisposeUserdata = nullptr;
+    raw_ptr<void, DisableDanglingPtrDetection> mHostMappedDisposeUserdata = nullptr;
 
     // Track which usage was the last to write to the buffer.
     wgpu::BufferUsage mLastWriteUsage = wgpu::BufferUsage::None;