Closed KevinRansom closed 4 months ago
[!WARNING] Author opted out of release notes, check is disabled for this pull request. cc @dotnet/fsharp-team-msft
Thanks for the quick fix! Does this also fix the warning for class members?
/backport to release/dev17.10
Started backporting to release/dev17.10: https://github.com/dotnet/fsharp/actions/runs/9130940180
@vzarytovskii backporting to release/dev17.10 failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: temp
Using index info to reconstruct a base tree...
M src/Compiler/Optimize/Optimizer.fs
M tests/AheadOfTime/Trimming/check.ps1
Falling back to patching base and 3-way merge...
Auto-merging tests/AheadOfTime/Trimming/check.ps1
CONFLICT (content): Merge conflict in tests/AheadOfTime/Trimming/check.ps1
Auto-merging src/Compiler/Optimize/Optimizer.fs
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 temp
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@loop-evgeny, Sorry not to get back to you, it was 1:00 am last night when I propped this PR. I believe this will take care of the class issues too, I will add test cases for it and also verify #17161.
Fixes: https://github.com/dotnet/fsharp/issues/17161
This is a regression it should go into 8.0.300 /cc @vzarytovskii , @baronfel