Revert generating isreadonly for structs #14702
Merged
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
T-Gro
approved these changes
Feb 6, 2023
Member
Author
|
/run fantomas |
0101
approved these changes
Feb 6, 2023
vzarytovskii
commented
Feb 6, 2023
tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Structs02.fs.il.debug.bsl
Outdated
Show resolved
Hide resolved
abonie
approved these changes
Feb 6, 2023
Contributor
|
Failed to run fantomas: https://github.com/dotnet/fsharp/actions/runs/4103481865 |
Member
Author
|
/backport to release/dev17.5 |
Member
Author
|
/backport to release/dev17.6 |
Contributor
|
Started backporting to release/dev17.5: https://github.com/dotnet/fsharp/actions/runs/4103527670 |
Contributor
|
Started backporting to release/dev17.6: https://github.com/dotnet/fsharp/actions/runs/4103528545 |
Contributor
|
@vzarytovskii backporting to release/dev17.5 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Revert generating isreadonly
.git/rebase-apply/patch:20: trailing whitespace.
let add =
.git/rebase-apply/patch:84: trailing whitespace.
// .custom instance void [System.Runtime]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [System.Runtime]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 01 01 00 00 00 00 )
.git/rebase-apply/patch:121: trailing whitespace.
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
.git/rebase-apply/patch:122: trailing whitespace.
.custom instance void [System.Runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
.git/rebase-apply/patch:181: trailing whitespace.
// .custom instance void [System.Runtime]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [System.Runtime]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 01 01 00 00 00 00 )
warning: squelched 76 whitespace errors
warning: 81 lines add whitespace errors.
Using index info to reconstruct a base tree...
M src/Compiler/CodeGen/IlxGen.fs
M tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Structs02.fs.il.release.bsl
M tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/FloatsAndDoubles.fs.il.release.bsl
M tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
Falling back to patching base and 3-way merge...
Auto-merging tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
Auto-merging tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/FloatsAndDoubles.fs.il.release.bsl
CONFLICT (content): Merge conflict in tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/FloatsAndDoubles.fs.il.release.bsl
Auto-merging tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Structs02.fs.il.release.bsl
CONFLICT (content): Merge conflict in tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Structs02.fs.il.release.bsl
Auto-merging src/Compiler/CodeGen/IlxGen.fs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Revert generating isreadonly
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@vzarytovskii backporting to release/dev17.6 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Revert generating isreadonly
.git/rebase-apply/patch:20: trailing whitespace.
let add =
.git/rebase-apply/patch:84: trailing whitespace.
// .custom instance void [System.Runtime]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [System.Runtime]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 01 01 00 00 00 00 )
.git/rebase-apply/patch:121: trailing whitespace.
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
.git/rebase-apply/patch:122: trailing whitespace.
.custom instance void [System.Runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
.git/rebase-apply/patch:181: trailing whitespace.
// .custom instance void [System.Runtime]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [System.Runtime]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 01 01 00 00 00 00 )
warning: squelched 76 whitespace errors
warning: 81 lines add whitespace errors.
Using index info to reconstruct a base tree...
M src/Compiler/CodeGen/IlxGen.fs
M tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Structs02.fs.il.release.bsl
M tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/FloatsAndDoubles.fs.il.release.bsl
Falling back to patching base and 3-way merge...
Auto-merging tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/FloatsAndDoubles.fs.il.release.bsl
CONFLICT (content): Merge conflict in tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/FloatsAndDoubles.fs.il.release.bsl
Auto-merging tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Structs02.fs.il.release.bsl
CONFLICT (content): Merge conflict in tests/FSharp.Compiler.ComponentTests/EmittedIL/Misc/Structs02.fs.il.release.bsl
Auto-merging src/Compiler/CodeGen/IlxGen.fs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Revert generating isreadonly
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
T-Gro
deleted the
14700-isreadonlyattribute-is-emitted-even-if-coming-from-non-runtime-reference
branch
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.
Fixes #14700