[WIP] Implement IXCLRDataExceptionState state comparison#131011
Draft
rcj1 wants to merge 4 commits into
Draft
Conversation
Co-authored-by: rcj1 <77995559+rcj1@users.noreply.github.com>
|
Azure Pipelines: Successfully started running 4 pipeline(s). 12 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
|
Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag |
Contributor
There was a problem hiding this comment.
Pull request overview
Implements IXCLRDataExceptionState.IsSameState / IsSameState2 in the cDAC legacy shim and adds unit tests to validate the HRESULT behavior when comparing exception state based on exception address and “first-chance” semantics.
Changes:
- Implement
IXCLRDataExceptionState.IsSameStateandIsSameState2inClrDataExceptionState(including DEBUG-only validation against the legacy DAC implementation). - Add unit tests for state comparison (
IsSameState/IsSameState2) and flag validation behavior.
Show a summary per file
| File | Description |
|---|---|
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/ClrDataExceptionState.cs | Adds cDAC implementation of exception state comparison logic for IsSameState/IsSameState2. |
| src/native/managed/cdac/tests/UnitTests/ClrDataExceptionStateTests.cs | Adds unit tests covering matching/different exception addresses and IsSameState2 flag handling. |
Copilot's findings
- Files reviewed: 2/2 changed files
- Comments generated: 2
Comment on lines
+261
to
+263
| ThreadData threadData = _target.Contracts.Thread.GetThreadData(_threadAddress); | ||
| TargetPointer exceptionAddress = _target.ReadPointer( | ||
| threadData.OSExceptionRecord + (ulong)(sizeof(uint) * 2 + _target.PointerSize)); |
Comment on lines
+360
to
+371
| [Theory] | ||
| [ClassData(typeof(MockTarget.StdArch))] | ||
| public void IsSameState2_DifferentAddress(MockTarget.Architecture arch) | ||
| { | ||
| const ulong exceptionAddress = 0x1234_5678; | ||
| IXCLRDataExceptionState exceptionState = CreateExceptionStateWithRecord(arch, exceptionAddress); | ||
| EXCEPTION_RECORD64 inputRecord = new() { ExceptionAddress = exceptionAddress + 1 }; | ||
|
|
||
| int hr = exceptionState.IsSameState2(0, &inputRecord, 0, null); | ||
|
|
||
| Assert.Equal(HResults.S_FALSE, hr); | ||
| } |
rcj1
changed the title
Contributor
Author
|
@copilot 1. please put both flags under CLRDATA_EXCEPTION_PARTIAL in an enum in IXCLRData.cs. |
Co-authored-by: rcj1 <77995559+rcj1@users.noreply.github.com>
Co-authored-by: rcj1 <77995559+rcj1@users.noreply.github.com>
Contributor
Implemented in |
Contributor
There was a problem hiding this comment.
Copilot's findings
Comments suppressed due to low confidence (1)
src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/IXCLRData.cs:969
- This adds a new public enum type to the Legacy assembly. Unless this is intended to be part of the supported public surface, consider making it internal (tests can still access it via InternalsVisibleTo) to avoid expanding public API and triggering API-approval requirements.
[Flags]
public enum CLRDataExceptionSameFlag : uint
{
CLRDATA_EXSAME_SECOND_CHANCE = 0,
CLRDATA_EXSAME_FIRST_CHANCE = 0x1,
}
- Files reviewed: 5/5 changed files
- Comments generated: 1
Co-authored-by: rcj1 <77995559+rcj1@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Copilot's findings
Comments suppressed due to low confidence (1)
src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/IXCLRData.cs:969
- This change introduces new public API surface (CLRDataExceptionSameFlag). The provided PR metadata doesn’t include any linked
api-approvedissue/proposal, which is required for new public APIs in dotnet/runtime. Either (1) link the approved API proposal/issue, or (2) make this enuminternalif it’s only intended for internal/test use (the Legacy csproj already has InternalsVisibleTo for the tests).
[Flags]
public enum CLRDataExceptionSameFlag : uint
{
CLRDATA_EXSAME_SECOND_CHANCE = 0,
CLRDATA_EXSAME_FIRST_CHANCE = 0x1,
}
- Files reviewed: 5/5 changed files
- Comments generated: 1
Comment on lines
+399
to
+406
| const ulong exceptionAddress = 0x1234_5678; | ||
| IXCLRDataExceptionState exceptionState = CreateExceptionStateWithRecord(arch, exceptionAddress); | ||
| EXCEPTION_RECORD64 inputRecord = new() { ExceptionAddress = exceptionAddress + 1 }; | ||
|
|
||
| int hr = exceptionState.IsSameState2((uint)CLRDataExceptionSameFlag.CLRDATA_EXSAME_SECOND_CHANCE, &inputRecord, 0, null); | ||
|
|
||
| Assert.Equal(HResults.S_FALSE, hr); | ||
| } |
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.
No description provided.