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

Strip type arguments when checking types #6135

Closed
wants to merge 1 commit into from
Closed

Strip type arguments when checking types #6135

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
14 changes: 9 additions & 5 deletions src/fsharp/PostInferenceChecks.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ let RecordAnonRecdInfo cenv (anonInfo: AnonRecdTypeInfo) =
// approx walk of type
//--------------------------------------------------------------------------

let rec CheckTypeDeep (cenv: cenv) ((visitTy, visitTyconRefOpt, visitAppTyOpt, visitTraitSolutionOpt, visitTyparOpt) as f) g env isInner ty =
let rec CheckTypeDeep (cenv: cenv) ((visitTy,visitTyconRefOpt,visitAppTyOpt,visitTraitSolutionOpt, visitTyparOpt) as f) (g: TcGlobals) env isInner ty =
// We iterate the _solved_ constraints as well, to pick up any record of trait constraint solutions
// This means we walk _all_ the constraints _everywhere_ in a type, including
// those attached to _solved_ type variables. This is used by PostTypeCheckSemanticChecks to detect uses of
Expand All @@ -331,11 +331,12 @@ let rec CheckTypeDeep (cenv: cenv) ((visitTy, visitTyconRefOpt, visitAppTyOpt, v
| _ -> ())
| _ -> ()

let ty = stripTyparEqns ty
let ty = stripTyparEqns ty
let ty = if not g.compilingFslib then stripTyEqns g ty else ty
visitTy ty

match ty with
| TType_forall (tps, body) ->
| TType_forall (tps,body) ->
let env = BindTypars g env tps
CheckTypeDeep cenv f g env isInner body
tps |> List.iter (fun tp -> tp.Constraints |> List.iter (CheckTypeConstraintDeep cenv f g env))
Expand Down Expand Up @@ -2233,8 +2234,11 @@ let CheckEntityDefn cenv env (tycon: Entity) =
| None -> ()
| Some ty ->
// Library-defined outref<'T> and inref<'T> contain byrefs on the r.h.s.
if not g.compilingFslib then
CheckForByrefType cenv env ty (fun () -> errorR(Error(FSComp.SR.chkNoByrefInTypeAbbrev(), tycon.Range)))
if not g.compilingFslib then
if isByrefTy cenv.g ty then
errorR(Error(FSComp.SR.chkNoByrefInTypeAbbrev(), tycon.Range))
else
CheckTypeNoInnerByrefs cenv env m ty

let CheckEntityDefns cenv env tycons =
tycons |> List.iter (CheckEntityDefn cenv env)
Expand Down