Fix exception message for InvalidCastException thrown by unboxing #116672
Conversation
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
The argument order got swapped recently Fixes dotnet#116650
|
Tagging subscribers to this area: @mangod9 |
There was a problem hiding this comment.
Pull Request Overview
This PR corrects the parameter order for the ThrowInvalidCastException QCall, refines the matching managed-side throw helper, and updates VM contracts and GC mode transitions.
- Swap
pSourceType/pTargetTypein the QCall signature and remove an obsolete GC transition. - Replace multi-parameter QCall import with a private internal call plus a public wrapper in
CastHelpers.cs. - Standardize contracts in
excep.cppand add aGCX_PREEMP()transition before throwing.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/coreclr/vm/jithelpers.cpp | Swapped QCall signature parameters and removed GCX_COOP(). |
| src/coreclr/vm/excep.cpp | Replaced manual CONTRACTL with STANDARD_VM_CONTRACT and added GCX_PREEMP(). |
| src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs | Added private QCall import, public wrappers, and rooted overload. |
Comments suppressed due to low confidence (1)
src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs:30
- [nitpick] Directly calling the internal QCall bypasses the public wrapper, which provides a non-return hint and rooting. Consider calling
ThrowInvalidCastExceptioninstead to maintain consistency and proper GC handling.
ThrowInvalidCastExceptionInternal(RuntimeHelpers.GetMethodTable(fromType), toTypeHnd);
src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs
Show resolved
Hide resolved
jkotas
commented
Jun 14, 2025
| @@ -538,7 +538,7 @@ HCIMPL2(BOOL, JIT_IsInstanceOfException, CORINFO_CLASS_HANDLE type, Object* obj) | |||
| } | |||
| HCIMPLEND | |||
|
|
|||
| extern "C" void QCALLTYPE ThrowInvalidCastException(CORINFO_CLASS_HANDLE pTargetType, CORINFO_CLASS_HANDLE pSourceType) | |||
| extern "C" void QCALLTYPE ThrowInvalidCastException(CORINFO_CLASS_HANDLE pSourceType, CORINFO_CLASS_HANDLE pTargetType) | |||
jkotas
commented
Jun 14, 2025
| @@ -11207,11 +11207,7 @@ VOID GetAssemblyDetailInfo(SString &sType, | |||
| VOID CheckAndThrowSameTypeAndAssemblyInvalidCastException(TypeHandle thCastFrom, | |||
| TypeHandle thCastTo) | |||
| { | |||
| CONTRACTL { | |||
There was a problem hiding this comment.
Pre-emptive mode is goodness
jkotas
commented
Jun 14, 2025
|
|
||
| [DoesNotReturn] | ||
| internal static void ThrowInvalidCastException(object fromType, void* toTypeHnd) | ||
| { | ||
| ThrowInvalidCastException(RuntimeHelpers.GetMethodTable(fromType), toTypeHnd); | ||
| ThrowInvalidCastExceptionInternal(RuntimeHelpers.GetMethodTable(fromType), toTypeHnd); | ||
| GC.KeepAlive(fromType); |
There was a problem hiding this comment.
Fixing theoretical unloadability bug
jkotas
commented
Jun 14, 2025
| internal static void ThrowInvalidCastException(void* fromTypeHnd, void* toTypeHnd) | ||
| { | ||
| ThrowInvalidCastExceptionInternal(fromTypeHnd, toTypeHnd); | ||
| throw null!; // Provide hint to the inliner that this method does not return |
There was a problem hiding this comment.
Add the same hint here as what's on the other path
mangod9
approved these changes
Jun 15, 2025
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.
The argument order got swapped recently
Fixes #116650