[crossgen2] Prevent inlining of PInvoke marshalling accross version bubbles #115277
+5
−5
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
…ubles Contributes to dotnet#113742
jkotas
changed the title
There was a problem hiding this comment.
Pull Request Overview
This PR aims to prevent inlining of PInvoke marshalling across the version bubble. The changes remove a version bubble check from the JIT interface implementation and add a corresponding check in the compilation module group to enforce the desired behavior.
- Removed version bubble check in pInvokeMarshalingRequired in CorInfoImpl.ReadyToRun.cs.
- Added a version bubble check in GeneratesPInvoke in ReadyToRunCompilationModuleGroupBase.cs.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs | Removed legacy check for version bubble compliance. |
| src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs | Added explicit version bubble check to prevent PInvoke inlining. |
Comments suppressed due to low confidence (1)
src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs:3079
- The removal of this version bubble check in pInvokeMarshalingRequired should be clearly coordinated with the new logic in GeneratesPInvoke to ensure consistent behavior. Please verify that the change does not unintentionally affect related code paths.
// Marshalling behavior isn't modeled as protected by R2R rules, so disable pinvoke inlining for code outside of the version bubble
src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs
Show resolved
Hide resolved
|
cc @AndyAyersMS This is fixing the crossgen2 logic bug. I am not deleting the JIT workaround in this change. I think we want to evaluate code quality and JIT throughput impact of deleting the workaround separately. |
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.
Inlining of PInvoke stubs should be blocked explicitly in crossgen2. It was blocked as side-effect of JIT never inlining methods with EH, but that is not a safe assumption to make now that the JIT is able to inline methods with EH.
Contributes to #113742