Skip to content

[WIP] Prevent side-effect binding elimination #6527

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.

Sign up for GitHub

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

Closed
ncave wants to merge 1 commit into from
Closed

[WIP] Prevent side-effect binding elimination #6527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/fsharp/Optimizer.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ let TryEliminateBinding cenv _env (TBind(vspec1, e1, spBind)) e2 _m =

// Immediate consumption of value by a pattern match 'let x = e in match x with ...'
| Expr.Match (spMatch, _exprm, TDSwitch(Expr.Val (VRefLocal vspec2, _, _), cases, dflt, _), targets, m, ty2)
when (valEq vspec1 vspec2 &&
when (valEq vspec1 vspec2 && not (ExprHasEffect cenv.g e1) &&
let fvs = accFreeInTargets CollectLocals targets (accFreeInSwitchCases CollectLocals cases dflt emptyFreeVars)
not (Zset.contains vspec1 fvs.FreeLocals)) ->

Expand Down
15 changes: 15 additions & 0 deletions tests/service/ExprTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,15 @@ let inline mutableConst () =

let testMutableVar = mutableVar 1
let testMutableConst = mutableConst ()

let mutable pos = 0
let side_effect () = pos <- pos + 1; pos

let testMutableMatch () =
match side_effect () with
| 0 -> pos
| 1 -> pos
| _ -> pos
"""

File.WriteAllText(fileName2, fileSource2)
Expand Down Expand Up @@ -768,6 +777,9 @@ let ``Test Unoptimized Declarations Project1`` () =
"let mutableConst(unitVar0) = let mutable acc: Microsoft.FSharp.Core.unit = () in acc <- () @ (25,16--25,19)";
"let testMutableVar = N.mutableVar (1) @ (28,21--28,33)";
"let testMutableConst = N.mutableConst (()) @ (29,23--29,38)";
"let pos = 0 @ (31,18--31,19)";
"let side_effect(unitVar0) = (pos <- Operators.op_Addition<Microsoft.FSharp.Core.int,Microsoft.FSharp.Core.int,Microsoft.FSharp.Core.int> (N.pos (),1); N.pos ()) @ (32,21--32,40)";
"let testMutableMatch(unitVar0) = let matchValue: Microsoft.FSharp.Core.int = N.side_effect (()) in match (if Operators.op_Equality<Microsoft.FSharp.Core.int> (matchValue,0) then $0 else (if Operators.op_Equality<Microsoft.FSharp.Core.int> (matchValue,1) then $1 else $2)) targets ... @ (35,10--35,24)";
]

printDeclarations None (List.ofSeq file1.Declarations)
Expand Down Expand Up @@ -912,6 +924,9 @@ let ``Test Optimized Declarations Project1`` () =
"let mutableConst(unitVar0) = let mutable acc: Microsoft.FSharp.Core.unit = () in acc <- () @ (25,16--25,19)";
"let testMutableVar = let x: Microsoft.FSharp.Core.int = 1 in (if Operators.op_GreaterThan<Microsoft.FSharp.Core.int> (x,0) then let mutable acc: Microsoft.FSharp.Core.int = x in acc <- x else ()) @ (28,21--28,33)";
"let testMutableConst = let mutable acc: Microsoft.FSharp.Core.unit = () in acc <- () @ (29,23--29,38)";
"let pos = 0 @ (31,18--31,19)";
"let side_effect(unitVar0) = (pos <- Operators.op_Addition<Microsoft.FSharp.Core.int,Microsoft.FSharp.Core.int,Microsoft.FSharp.Core.int> (N.pos (),1); N.pos ()) @ (32,21--32,40)";
"let testMutableMatch(unitVar0) = let matchValue: Microsoft.FSharp.Core.int = N.side_effect (()) in match (if Operators.op_Equality<Microsoft.FSharp.Core.int> (matchValue,0) then $0 else (if Operators.op_Equality<Microsoft.FSharp.Core.int> (matchValue,1) then $1 else $2)) targets ... @ (35,10--35,24)";
]

// printFSharpDecls "" file2.Declarations |> Seq.iter (printfn "%s")
Expand Down