-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ignore modopts/modreqs for UnsafeAccessor
field targets
#109694
Ignore modopts/modreqs for UnsafeAccessor
field targets
#109694
Conversation
The generated IL remains correct and doesn't require a .volatile prefix for the generated accessor. This is based off of what Roslyn currently emits if a getter was available.
This might require an update to mono as well. I will look into that tomorrow. |
/ba-g WASM timeouts |
/backport to release/9.0 |
Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/11786200251 |
/backport to release/8.0-staging |
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/11786212482 |
@AaronRobinsonMSFT backporting to release/8.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Ignore modopts/modreqs for `UnsafeAccessor` field targets
Using index info to reconstruct a base tree...
M src/coreclr/vm/prestub.cpp
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/prestub.cpp
CONFLICT (content): Merge conflict in 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 Ignore modopts/modreqs for `UnsafeAccessor` field targets
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@AaronRobinsonMSFT an error occurred while backporting to release/8.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
/backport to release/9.0-staging |
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/11786290011 |
Fixes #109665
The generated IL remains correct and doesn't require a
.volatile
prefix for the accessor. This is based off of what Roslyn currently emits if an accessor was manually written.See SharpLab for an example.