Commit71a3609

authored and

committed

* attempt to fix units of measure issue with structs and no optimizations* reducing code duplication* keep the original comment* add test

1 parent6726231 commit71a3609Copy full SHA for 71a3609

File tree

+23

-3

lines changed

+23

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5362,11 +5362,15 @@ and GenBindRhs cenv cgbuf eenv sp (vspec:Val) e =`
`5362`	`5362`	`\| Expr.TyLambda_\| Expr.Lambda_->`
`5363`	`5363`	`letisLocalTypeFunc= IsNamedLocalTypeFuncVal cenv.g vspec e`
`5364`	`5364`
`5365`		`-match e, isLocalTypeFuncwith`
`5366`		`-\| Expr.TyLambda(_, tyargs, body,_,_),truewhen`
	`5365`	`+match ewith`
	`5366`	`+\| Expr.TyLambda(_, tyargs, body,_,ttype)when`
`5367`	`5367`	`(`
`5368`	`5368`	`tyargs\|> List.forall(fun tp-> tp.IsErased)&&`
`5369`		`-(match StorageForVal vspec.Range vspec eenvwith Local_->true\|_->false)`
	`5369`	`+(match StorageForVal vspec.Range vspec eenvwith Local_->true\|_->false)&&`
	`5370`	`+(isLocalTypeFunc\|\|`
	`5371`	`+(match ttypewith`
	`5372`	`+ TType_var(typar)->match typar.Solutionwith Some(TType_app(t,_))-> t.IsStructOrEnumTycon\|_->false`
	`5373`	`+\|_->false))`
`5370`	`5374`	`)->`
`5371`	`5375`	`// type lambda with erased type arguments that is stored as local variable (not method or property)- inline body`
`5372`	`5376`	`GenExpr cenv cgbuf eenv sp body Continue`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,8 @@`
	`1`	`+typeAStruct<[<Measure>]'u>=`
	`2`	`+struct`
	`3`	`+end`
	`4`	`+`
	`5`	`+[<EntryPoint>]`
	`6`	`+letmain argv=`
	`7`	`+letx= AStruct()// This doesn't work`
	`8`	`+0`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1439,6 +1439,14 @@ module RegressionTests =`
`1439`	`1439`	`[<Test >]`
`1440`	`1440`	let``struct-tuple-bug-1-FSI_BASIC``()= singleTestBuildAndRun"regression/struct-tuple-bug-1" FSI_BASIC
`1441`	`1441`
	`1442`	`+[<Test>]`
	`1443`	+let``struct-measure-bug-1``()=
	`1444`	`+letcfg= testConfig"regression/struct-measure-bug-1"`
	`1445`	`+`
	`1446`	`+ fsc cfg"%s --optimize- -o:test.exe -g" cfg.fsc_flags["test.fs"]`
	`1447`	`+`
	`1448`	`+ peverify cfg"test.exe"`
	`1449`	`+`
`1442`	`1450`	`#if!FSHARP_SUITE_DRIVES_CORECLR_TESTS`
`1443`	`1451`	`moduleOptimizationTests=`
`1444`	`1452`

Comments

(0)