Skip to content
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

Prevent removal of inlined mutable vars from optimized AST #6333

Merged
merged 2 commits into from
Apr 11, 2019
Merged

Prevent removal of inlined mutable vars from optimized AST #6333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44897e3
Don't remove inlined mutable vars
ncave Mar 14, 2019
0ff70ff
Added tests for inlined mutable vars
ncave Apr 5, 2019
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
6 changes: 3 additions & 3 deletions src/fsharp/symbols/Exprs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,15 +852,15 @@ module FSharpExprConvert =
None, env.BindIsInstVal bind.Var (ty, e)

// Remove let <compilerGeneratedVar> = <var> from quotation tree
| Expr.Val _ when bind.Var.IsCompilerGenerated ->
| Expr.Val _ when bind.Var.IsCompilerGenerated && (not bind.Var.IsMutable) ->
None, env.BindSubstVal bind.Var bind.Expr

// Remove let <compilerGeneratedVar> = () from quotation tree
| Expr.Const(Const.Unit, _, _) when bind.Var.IsCompilerGenerated ->
| Expr.Const(Const.Unit, _, _) when bind.Var.IsCompilerGenerated && (not bind.Var.IsMutable) ->
None, env.BindSubstVal bind.Var bind.Expr

// Remove let unionCase = ... from quotation tree
| Expr.Op(TOp.UnionCaseProof _, _, [e], _) ->
| Expr.Op(TOp.UnionCaseProof _, _, [e], _) when (not bind.Var.IsMutable) ->
None, env.BindSubstVal bind.Var e

| _ ->
Expand Down
19 changes: 19 additions & 0 deletions tests/service/ExprTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,17 @@ let testHashUIntPtr (x:unativeint) = hash x
let testHashString (x:string) = hash x
let testTypeOf (x:'T) = typeof<'T>

let inline mutableVar x =
if x > 0 then
let mutable acc = x
acc <- x

let inline mutableConst () =
let mutable acc = ()
acc <- ()

let testMutableVar = mutableVar 1
let testMutableConst = mutableConst ()
"""

File.WriteAllText(fileName2, fileSource2)
Expand Down Expand Up @@ -753,6 +764,10 @@ let ``Test Unoptimized Declarations Project1`` () =
"let testHashUIntPtr(x) = Operators.Hash<Microsoft.FSharp.Core.unativeint> (x) @ (14,37--14,43)";
"let testHashString(x) = Operators.Hash<Microsoft.FSharp.Core.string> (x) @ (16,32--16,38)";
"let testTypeOf(x) = Operators.TypeOf<'T> () @ (17,24--17,30)";
"let mutableVar(x) = (if Operators.op_GreaterThan<Microsoft.FSharp.Core.int> (x,0) then let mutable acc: Microsoft.FSharp.Core.int = x in acc <- x else ()) @ (20,4--22,16)";
"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)";
]

printDeclarations None (List.ofSeq file1.Declarations)
Expand Down Expand Up @@ -893,6 +908,10 @@ let ``Test Optimized Declarations Project1`` () =
"let testHashUIntPtr(x) = Operators.op_BitwiseAnd<Microsoft.FSharp.Core.int> (Operators.ToInt32<Microsoft.FSharp.Core.uint64> (Operators.ToUInt64<Microsoft.FSharp.Core.unativeint> (x)),2147483647) @ (14,37--14,43)";
"let testHashString(x) = (if Operators.op_Equality<Microsoft.FSharp.Core.string> (x,dflt) then 0 else Operators.Hash<Microsoft.FSharp.Core.string> (x)) @ (16,32--16,38)";
"let testTypeOf(x) = Operators.TypeOf<'T> () @ (17,24--17,30)";
"let mutableVar(x) = (if Operators.op_GreaterThan<Microsoft.FSharp.Core.int> (x,0) then let mutable acc: Microsoft.FSharp.Core.int = x in acc <- x else ()) @ (20,4--22,16)";
"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)";
]

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