Treat the generated assembly as having runtime marshalling disabled - #133914
Closed
jkoritzinsky wants to merge 1 commit into
Closed
jkoritzinsky wants to merge 1 commit into
jkoritzinsky wants to merge 1 commit into
Conversation
We generate our interop thunks into this assembly, so nothing in this assembly should require interop thunks. As a result, everything in this assembly should be treated as "runtime marshalling disabled".
|
Azure Pipelines: Successfully started running 3 pipeline(s). 13 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: @agocke, @dotnet/ilc-contrib |
Contributor
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
CanonModule.Assembly can remain null, causing a NullReferenceException in new marshalling paths.
Get a fresh assessment by requesting another Copilot review.
Review tier: Lite
Findings: 1
Open findings (1)
What changed in this PR
Updates runtime-marshalling policy to assembly-level state so generated interop assemblies are treated as marshalling-disabled, with regression coverage.
Changes:
- Adds assembly-level marshalling policy metadata.
- Updates interop, stub, delegate, and ReadyToRun consumers.
- Adds reverse-P/Invoke coverage.
| File | Summary |
|---|---|
src/tests/Interop/DisabledRuntimeMarshalling/PInvokeAssemblyMarshallingDisabled/Delegates.cs |
Adds reverse-P/Invoke regression coverage. |
src/coreclr/tools/dotnet-pgo/TypeRefTypeSystem/TypeRefTypeSystemModule.cs |
Supplies marshalling policy for type-reference assemblies. |
src/coreclr/tools/Common/TypeSystem/Interop/InteropStateManager.cs |
Uses assembly policy for calli stub handling. |
src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs |
Uses assembly policy when creating marshallers. |
src/coreclr/tools/Common/TypeSystem/Interop/IL/MarshalHelpers.cs |
Removes the obsolete policy helper. |
src/coreclr/tools/Common/TypeSystem/IL/Stubs/PInvokeILEmitter.cs |
Applies assembly policy during stub emission. |
src/coreclr/tools/Common/TypeSystem/IL/Stubs/DelegateMarshallingMethodThunk.cs |
Applies assembly policy to delegate thunks. |
src/coreclr/tools/Common/TypeSystem/Ecma/EcmaAssembly.cs |
Reads the runtime-marshalling attribute. |
src/coreclr/tools/Common/TypeSystem/Common/IAssemblyDesc.cs |
Defines the assembly marshalling-policy contract. |
src/coreclr/tools/aot/ILCompiler.ReadyToRun/PortableCallHelpers/PortableCallHelpersGenerator.cs |
Uses assembly policy for ReadyToRun diagnostics. |
src/coreclr/tools/aot/ILCompiler.ReadyToRun/IBC/MIbcProfileParser.cs |
Updates synthetic assembly policy; CanonModule.Assembly may remain null and cause a critical null-reference failure. |
src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/CompilerTypeSystemContext.GeneratedAssembly.cs |
Marks generated assemblies as marshalling-disabled. |
Comment on lines
+627
to
+633
| public bool IsRuntimeMarshallingEnabled | ||
| { | ||
| get | ||
| { | ||
| return true; | ||
| } | ||
| } |
Comment on lines
-984
to
-988
| public static bool IsRuntimeMarshallingEnabled(ModuleDesc module) | ||
| { | ||
| return module.Assembly is not EcmaAssembly assembly || !assembly.HasAssemblyCustomAttribute("System.Runtime.CompilerServices", "DisableRuntimeMarshallingAttribute"); | ||
| } | ||
|
|
Member
There was a problem hiding this comment.
Did you consider just making this return false for non-ECMA assemblies?
Member
Author
There was a problem hiding this comment.
I'm fine with that as well. I was trying to keep the fix more targeted, but that does make more sense.
This was referenced Sep 15, 2026
Member
Author
|
Closing in favor of #133977 |
jkoritzinsky
deleted the
delegate-thunks-disable-runtime-marshalling
branch
September 15, 2026 18:18
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.
We generate our interop thunks into this assembly, so nothing in this assembly should require interop thunks. As a result, everything in this assembly should be treated as "runtime marshalling disabled".
Fixes https://developercommunity.visualstudio.com/t/NativeAOT-emits-false-IL1005-for-Disable/11151152