Fix UnsafeAccessor scenario for modopts/modreqs when comparing field sigs.#111648
Merged
AaronRobinsonMSFT merged 3 commits intodotnet:mainfrom Jan 21, 2025
Merged
Fix UnsafeAccessor scenario for modopts/modreqs when comparing field sigs.#111648AaronRobinsonMSFT merged 3 commits intodotnet:mainfrom
UnsafeAccessor scenario for modopts/modreqs when comparing field sigs.#111648AaronRobinsonMSFT merged 3 commits intodotnet:mainfrom
Conversation
prior to comparing field signature.
ghost
added
the
Contributor
There was a problem hiding this comment.
Copilot reviewed 1 out of 4 changed files in this pull request and generated no comments.
Files not reviewed (3)
- src/coreclr/vm/prestub.cpp: Language not supported
- src/coreclr/vm/siginfo.cpp: Language not supported
- src/coreclr/vm/siginfo.hpp: Language not supported
Contributor
There was a problem hiding this comment.
Copilot reviewed 1 out of 4 changed files in this pull request and generated no comments.
Files not reviewed (3)
- src/coreclr/vm/prestub.cpp: Language not supported
- src/coreclr/vm/siginfo.cpp: Language not supported
- src/coreclr/vm/siginfo.hpp: Language not supported
jkotas
approved these changes
Jan 21, 2025
Member
|
/azp run runtime-nativeaot-outerloop |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Member
Author
|
/backport to release/9.0-staging |
Contributor
|
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/12890369826 |
Contributor
|
@AaronRobinsonMSFT backporting to "release/9.0-staging" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Consume custom modifiers and ByRef in RetType signature prior to comparing field signature.
Using index info to reconstruct a base tree...
M src/coreclr/vm/prestub.cpp
M src/coreclr/vm/siginfo.cpp
M src/coreclr/vm/siginfo.hpp
M src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.cs
CONFLICT (content): Merge conflict in src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.cs
Auto-merging src/coreclr/vm/siginfo.hpp
Auto-merging src/coreclr/vm/siginfo.cpp
Auto-merging src/coreclr/vm/prestub.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Consume custom modifiers and ByRef in RetType signature prior to comparing field signature.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
AaronRobinsonMSFT
added a commit
to AaronRobinsonMSFT/runtime
that referenced
this pull request
Jan 21, 2025
…d sigs. (dotnet#111648) * Consume custom modifiers and ByRef in RetType signature prior to comparing field signature.
4 tasks
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Consume custom modifiers and ByRef in RetType signature prior to comparing field signature.
Fixes #111647