Convert some COM interop to UCO#125326
Merged
AaronRobinsonMSFT merged 3 commits intodotnet:mainfrom Mar 12, 2026
Merged
Conversation
jkotas
reviewed
Mar 9, 2026
src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComActivator.cs
Outdated
Show resolved
Hide resolved
src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComActivator.cs
Outdated
Show resolved
Hide resolved
src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComActivator.cs
Outdated
Show resolved
Hide resolved
src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComActivator.cs
Outdated
Show resolved
Hide resolved
src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComActivator.cs
Outdated
Show resolved
Hide resolved
src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComActivator.cs
Outdated
Show resolved
Hide resolved
66 tasks
src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComActivator.cs
Outdated
Show resolved
Hide resolved
jkoritzinsky
reviewed
Mar 9, 2026
jkoritzinsky
approved these changes
Mar 9, 2026
67a2fa9 to
0b7f8d4
Compare
AaronRobinsonMSFT
approved these changes
Mar 10, 2026
Member
Author
|
Failure is related to infra (#117164). |
AaronRobinsonMSFT
approved these changes
Mar 12, 2026
Copilot AI
pushed a commit
that referenced
this pull request
Mar 13, 2026
Contributes to #123864 (subset of group 5)
Copilot AI
added a commit
that referenced
this pull request
Mar 18, 2026
…changes The [UnmanagedCallersOnly] approach for LicenseInteropProxy was causing heap corruption (STATUS_HEAP_CORRUPTION) under GC stress scenarios. Revert to the original MethodDescCallSite-based approach. Changes: - ComActivator.cs: Restore public static object Create() and remove the unsafe [UnmanagedCallersOnly] static methods for GetCurrentContextInfo and SaveKeyInCurrentContext - corelib.h: Restore original LICENSE_INTEROP_PROXY method signatures (SM_RetObj, IM_RuntimeTypeHandle_RefBool_RefIntPtr_RetVoid, IM_IntPtr_RetVoid) - runtimecallablewrapper.cpp: Restore MethodDescCallSite calls for license interop - metasig.h: Remove added PtrLicenseInteropProxy_* metasig definitions Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
jkotas
added a commit
that referenced
this pull request
Mar 19, 2026
…changes (#125706) PR #125326 converted `LicenseInteropProxy` call sites to use `[UnmanagedCallersOnly]` with raw managed object pointers (`object*`, `Type*`, `LicenseInteropProxy*`). Under GC stress, it is causing heap corruption (exit code `-1073740940` / `STATUS_HEAP_CORRUPTION`). Fixes #125598 --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com> Co-authored-by: Jan Kotas <jkotas@microsoft.com>
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.
Contributes to #123864 (subset of group 5)