Fix WebGPU static destruction crash by heap-allocating contexts map#27470
Merged
Fix WebGPU static destruction crash by heap-allocating contexts map#27470
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses a shutdown-time crash in the WebGPU EP by avoiding static destruction of the global contexts registry (which can run after dependent DLLs like dxcompiler.dll are already unloaded).
Changes:
- Replaces
WebGpuContextFactory::contexts_with a heap-allocatedstd::unordered_mappointer to prevent destructor execution during process static teardown. - Adds lazy allocation of the contexts map on first use, and explicitly deletes it in
WebGpuContextFactory::Cleanup(). - Updates context lookup/release code paths to handle
contexts_ == nullptrwith explicitORT_ENFORCEmessages.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| onnxruntime/core/providers/webgpu/webgpu_context.h | Changes the static contexts registry to a pointer and documents the shutdown rationale. |
| onnxruntime/core/providers/webgpu/webgpu_context.cc | Implements lazy allocation, null-guarded access, and explicit deletion/reset in Cleanup(). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
guschmue
approved these changes
Feb 27, 2026
xadupre
approved these changes
Feb 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Heap-allocate
WebGpuContextFactory::contexts_to avoid crashes during static destruction when dependent DLLs (e.g. dxcompiler.dll) have already been unloaded.Cleanup()explicitly deletes the map; on abnormal termination it safely leaks.