Commit5c801cb

forki

authored and

KevinRansom

committed

Check constant first (#3145)

1 parent7f094ba commit5c801cbCopy full SHA for 5c801cb

File tree

1 file changed

-10

lines changed

src/fsharp
- ConstraintSolver.fs

1 file changed

-10

lines changed

`‎src/fsharp/ConstraintSolver.fs‎`

Lines changed: 9 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -221,19 +221,19 @@ let rec occursCheck g un ty =`
`221`	`221`	`// Predicates on types`
`222`	`222`	`//-------------------------------------------------------------------------`
`223`	`223`
`224`		`-let recisNativeIntegerTyg ty=`
	`224`	`+let recisNativeIntegerTy g ty=`
`225`	`225`	`typeEquivAux EraseMeasures g g.nativeint_ty ty\|\|`
`226`	`226`	`typeEquivAux EraseMeasures g g.unativeint_ty ty\|\|`
`227`	`227`	`(isEnumTy g ty&& isNativeIntegerTy g(underlyingTypeOfEnumTy g ty))`
`228`	`228`
`229`		`-letisSignedIntegerTyg ty=`
	`229`	`+letisSignedIntegerTy g ty=`
`230`	`230`	`typeEquivAux EraseMeasures g g.sbyte_ty ty\|\|`
`231`	`231`	`typeEquivAux EraseMeasures g g.int16_ty ty\|\|`
`232`	`232`	`typeEquivAux EraseMeasures g g.int32_ty ty\|\|`
`233`	`233`	`typeEquivAux EraseMeasures g g.nativeint_ty ty\|\|`
`234`	`234`	`typeEquivAux EraseMeasures g g.int64_ty ty`
`235`	`235`
`236`		`-letisUnsignedIntegerTyg ty=`
	`236`	`+letisUnsignedIntegerTy g ty=`
`237`	`237`	`typeEquivAux EraseMeasures g g.byte_ty ty\|\|`
`238`	`238`	`typeEquivAux EraseMeasures g g.uint16_ty ty\|\|`
`239`	`239`	`typeEquivAux EraseMeasures g g.uint32_ty ty\|\|`
`@@ -767,10 +767,10 @@ and SolveTypEqualsTyp (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace`
`767`	`767`
`768`	`768`	`match sty1, sty2with`
`769`	`769`	`// type vars inside forall-types may be alpha-equivalent`
`770`		`-\| TType_var tp1, TType_var tp2whentyparEq tp1 tp2\|\|(aenv.EquivTypars.ContainsKey tp1&& typeEquiv g aenv.EquivTypars.[tp1] ty2)-> CompleteD`
	`770`	`+\| TType_var tp1, TType_var tp2when typarEq tp1 tp2\|\|(aenv.EquivTypars.ContainsKey tp1&& typeEquiv g aenv.EquivTypars.[tp1] ty2)-> CompleteD`
`771`	`771`
`772`	`772`	`\| TType_var tp1, TType_var tp2when PreferUnifyTypar tp1 tp2-> SolveTyparEqualsTyp csenv ndeep m2 trace sty1 ty2`
`773`		`-\| TType_var tp1, TType_var tp2whenPreferUnifyTypar tp2 tp1&&not csenv.MatchingOnly-> SolveTyparEqualsTyp csenv ndeep m2 trace sty2 ty1`
	`773`	`+\| TType_var tp1, TType_var tp2whennot csenv.MatchingOnly&&PreferUnifyTypar tp2 tp1-> SolveTyparEqualsTyp csenv ndeep m2 trace sty2 ty1`
`774`	`774`
`775`	`775`	`\| TType_var r,_when(r.Rigidity<> TyparRigidity.Rigid)-> SolveTyparEqualsTyp csenv ndeep m2 trace sty1 ty2`
`776`	`776`	`\|_, TType_var rwhen(r.Rigidity<> TyparRigidity.Rigid)&&not csenv.MatchingOnly-> SolveTyparEqualsTyp csenv ndeep m2 trace sty2 ty1`
`@@ -1831,7 +1831,7 @@ and SolveTypRequiresDefaultConstructor (csenv:ConstraintSolverEnv) ndeep m2 trac`
`1831`	`1831`	`CompleteD`
`1832`	`1832`	`else`
`1833`	`1833`	`if GetIntrinsicConstructorInfosOfType csenv.InfoReader m ty`
`1834`		`-\|> List.exists(fun x-> IsMethInfoAccessible amap m AccessibleFromEverywhere x&& x.IsNullary)`
	`1834`	`+\|> List.exists(fun x->x.IsNullary&&IsMethInfoAccessible amap m AccessibleFromEverywhere x)`
`1835`	`1835`	`then`
`1836`	`1836`	`match tryDestAppTy g tywith`
`1837`	`1837`	`\| Some tcrefwhen HasFSharpAttribute g g.attrib_AbstractClassAttribute tcref.Attribs->`
`@@ -1982,8 +1982,7 @@ and ArgsMustSubsumeOrConvert`
`1982`	`1982`	`letcalledArgTy= AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg`
`1983`	`1983`	`SolveTypSubsumesTypWithReport csenv ndeep m trace cxsln calledArgTy callerArg.Type++(fun()->`
`1984`	`1984`
`1985`		`-if calledArg.IsParamArray&& isArray1DTy g calledArgTy&&not(isArray1DTy g callerArg.Type)`
`1986`		`-then`
	`1985`	`+if calledArg.IsParamArray&& isArray1DTy g calledArgTy&&not(isArray1DTy g callerArg.Type)then`
`1987`	`1986`	`ErrorD(Error(FSComp.SR.csMethodExpectsParams(),m))`
`1988`	`1987`	`else`
`1989`	`1988`	`CompleteD)`
`@@ -2655,7 +2654,7 @@ let CodegenWitnessThatTypSupportsTraitConstraint tcVal g amap m (traitInfo:Trait`
`2655`	`2654`	`\|true,false,2->`
`2656`	`2655`	`// If we resolve to an instance field on a struct and we haven't yet taken`
`2657`	`2656`	`// the address of the object then go do that`
`2658`		`-if rfref.Tycon.IsStructOrEnumTycon&&not(isByrefTy g(tyOfExpr g argExprs.[0]))then`
	`2657`	`+if rfref.Tycon.IsStructOrEnumTycon&&not(isByrefTy g(tyOfExpr g argExprs.[0]))then`
`2659`	`2658`	`leth= List.head argExprs`
`2660`	`2659`	`letwrap,h'= mkExprAddrOfExpr gtruefalse DefinitelyMutates h None m`
`2661`	`2660`	`Some(wrap(mkRecdFieldSetViaExprAddr(h', rfref, tinst, argExprs.[1], m)))`
`@@ -2664,7 +2663,7 @@ let CodegenWitnessThatTypSupportsTraitConstraint tcVal g amap m (traitInfo:Trait`
`2664`	`2663`	`\|false,true,0->`
`2665`	`2664`	`Some(mkStaticRecdFieldGet(rfref, tinst, m))`
`2666`	`2665`	`\|false,false,1->`
`2667`		`-if rfref.Tycon.IsStructOrEnumTycon&& isByrefTy g(tyOfExpr g argExprs.[0])then`
	`2666`	`+if rfref.Tycon.IsStructOrEnumTycon&& isByrefTy g(tyOfExpr g argExprs.[0])then`
`2668`	`2667`	`Some(mkRecdFieldGetViaExprAddr(argExprs.[0], rfref, tinst, m))`
`2669`	`2668`	`else`
`2670`	`2669`	`Some(mkRecdFieldGet g(argExprs.[0], rfref, tinst, m))`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5c801cb

File tree

1 file changed

1 file changed

`‎src/fsharp/ConstraintSolver.fs‎`

0 commit comments