cDac fixes: StressLog address and exceptions flowing out of NativeAOT#128845
Merged
Conversation
Contributor
|
Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates cDAC’s exported data descriptors and unmanaged entrypoints to (1) expose the correct StressLog address and (2) prevent managed exceptions from escaping NativeAOT-compiled unmanaged boundaries.
Changes:
- Fix StressLog global pointer export to use
&StressLog::theLog(CoreCLR + NativeAOT descriptors). - Wrap cDAC unmanaged entrypoints in
try/catchand translate exceptions to failing HRESULTs to avoid hard crashes when exceptions cross the unmanaged boundary. - Refactor
CLRDataCreateInstanceImplto route work through a guarded core helper.
Show a summary per file
| File | Description |
|---|---|
| src/native/managed/cdac/mscordaccore_universal/Entrypoints.cs | Adds exception guards around unmanaged exports and refactors CLRDataCreateInstanceImpl to avoid exceptions crossing the boundary. |
| src/coreclr/vm/datadescriptor/datadescriptor.inc | Updates StressLog global pointer export to point at the StressLog instance. |
| src/coreclr/nativeaot/Runtime/datadescriptor/datadescriptor.inc | Same StressLog pointer correction for NativeAOT descriptor parity. |
Copilot's findings
- Files reviewed: 3/3 changed files
- Comments generated: 2
Init now rejects a null handle pointer with E_INVALIDARG and zeroes *handle before doing work, so a TryCreate failure leaves the output deterministically zeroed instead of uninitialized. CreateSosInterface now validates obj before dereferencing and zeroes *obj up front, so the bad/zero-handle failure path no longer leaves *obj uninitialized for callers that don't check the return value. The failure code is also changed from -1 to E_INVALIDARG for consistency with the other entrypoints. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
3 tasks
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.
Fix two simple cDac bugs: