Skip to content

Fix for #2373 #2404

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

Merged
merged 4 commits into from
Feb 15, 2017
Merged

Fix for #2373 #2404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a177a4
attempt to fix units of measure issue with structs and no optimizations
liboz Feb 10, 2017
1e1f520
reducing code duplication
liboz Feb 13, 2017
191b896
keep the original comment
liboz Feb 13, 2017
6e9f67c
add test
liboz Feb 13, 2017
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
10 changes: 7 additions & 3 deletions src/fsharp/IlxGen.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5362,11 +5362,15 @@ and GenBindRhs cenv cgbuf eenv sp (vspec:Val) e =
| Expr.TyLambda _ | Expr.Lambda _ ->
let isLocalTypeFunc = IsNamedLocalTypeFuncVal cenv.g vspec e

match e, isLocalTypeFunc with
| Expr.TyLambda(_, tyargs, body, _, _), true when
match e with
| Expr.TyLambda(_, tyargs, body, _, ttype) when
(
tyargs |> List.forall (fun tp -> tp.IsErased) &&
(match StorageForVal vspec.Range vspec eenv with Local _ -> true | _ -> false)
(match StorageForVal vspec.Range vspec eenv with Local _ -> true | _ -> false) &&
(isLocalTypeFunc ||
(match ttype with
TType_var(typar) -> match typar.Solution with Some(TType_app(t,_))-> t.IsStructOrEnumTycon | _ -> false
| _ -> false))
) ->
// type lambda with erased type arguments that is stored as local variable (not method or property)- inline body
GenExpr cenv cgbuf eenv sp body Continue
Expand Down
8 changes: 8 additions & 0 deletions tests/fsharp/regression/struct-measure-bug-1/test.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
type AStruct<[<Measure>]'u> =
struct
end

[<EntryPoint>]
let main argv =
let x = AStruct() // This doesn't work
0
8 changes: 8 additions & 0 deletions tests/fsharp/tests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,14 @@ module RegressionTests =
[<Test >]
let ``struct-tuple-bug-1-FSI_BASIC`` () = singleTestBuildAndRun "regression/struct-tuple-bug-1" FSI_BASIC

[<Test>]
let ``struct-measure-bug-1`` () =
let cfg = testConfig "regression/struct-measure-bug-1"

fsc cfg "%s --optimize- -o:test.exe -g" cfg.fsc_flags ["test.fs"]

peverify cfg "test.exe"

#if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
module OptimizationTests =

Expand Down