Commit663adf2

committed

Fix 238

1 parent1251430 commit663adf2Copy full SHA for 663adf2

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1157,7 +1157,7 @@ and SolveMemberConstraint (csenv:ConstraintSolverEnv) permitWeakResolution ndeep`
`1157`	`1157`	`IsRecdFieldAccessible amap m AccessibleFromEverywhere rfinfo.RecdFieldRef&&`
`1158`	`1158`	`not rfinfo.LiteralValue.IsSome&&`
`1159`	`1159`	`not rfinfo.RecdField.IsCompilerGenerated->`
`1160`		`- Some(TTraitSolvedRecdProp(rfinfo, isSetProp))`
	`1160`	`+ Some(TTraitSolvedRecdProp(rfinfo, isSetProp), rfinfo.FieldType)`
`1161`	`1161`	`\|_-> None)`
`1162`	`1162`	`match propswith`
`1163`	`1163`	`\|[ prop]-> Some prop`
`@@ -1210,9 +1210,9 @@ and SolveMemberConstraint (csenv:ConstraintSolverEnv) permitWeakResolution ndeep`
`1210`	`1210`	`CollectThenUndo(fun trace-> ResolveOverloading csenv(WithTrace(trace)) nm ndeeptrue(0,0) AccessibleFromEverywhere calledMethGroupfalse(Some rty))`
`1211`	`1211`
`1212`	`1212`	`match recdPropSearch, methOverloadResultwith`
`1213`		`-\| Somea, None->`
`1214`		`-// OK, the constraint is solved by a record property`
`1215`		`- ResultDa`
	`1213`	`+\| Some(sln, rty2), None->`
	`1214`	`+// OK, the constraint is solved by a record property. Assert that the return types match.`
	`1215`	`+SolveTypEqualsTypKeepAbbrevs csenv ndeep m2 trace rty rty2++(fun()->ResultDsln)`
`1216`	`1216`	`\| None, Some(calledMeth:CalledMeth<_>)->`
`1217`	`1217`	`// OK, the constraint is solved.`
`1218`	`1218`	`// Re-run without undo to commit the inference equations. Throw errors away`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1696,6 +1696,16 @@ module RecordPropertyConstraintTests =`
`1696`	`1696`	`check"ckjwnewk"(f8())(System.TimeSpan.FromSeconds2.0)// after mutation`
`1697`	`1697`	`check"ckjwnewk"(f10())"Gary"`
`1698`	`1698`
	`1699`	`+`
	`1700`	`+// See https://github.com/Microsoft/visualfsharp/issues/238`
	`1701`	`+moduleGenericPropertyConstraintSolvedByRecord=`
	`1702`	`+`
	`1703`	`+typehober<'a>={ foo:'a}`
	`1704`	`+`
	`1705`	`+let inlineprint_foo_memb x= box(^a:(memberfoo: 'b) x)`
	`1706`	`+`
	`1707`	`+letv= print_foo_memb{ foo=1}`
	`1708`	`+`
`1699`	`1709`	`letaa=`
`1700`	`1710`	`ifnot failures.IsEmptythen(printfn"Test Failed, failures =%A" failures; exit1)`
`1701`	`1711`

Comments

(0)