Commita08b623

authored

Fix noncommutative joins with bounded TypeVars (#20345)

1 parent8de78b8 commita08b623Copy full SHA for a08b623

File tree

+38

-4

lines changed

+38

-4

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -297,10 +297,15 @@ def visit_erased_type(self, t: ErasedType) -> ProperType:`
`297`	`297`	`returnself.s`
`298`	`298`
`299`	`299`	`defvisit_type_var(self,t:TypeVarType)->ProperType:`
`300`		`-ifisinstance(self.s,TypeVarType)andself.s.id==t.id:`
`301`		`-ifself.s.upper_bound==t.upper_bound:`
`302`		`-returnself.s`
`303`		`-returnself.s.copy_modified(upper_bound=join_types(self.s.upper_bound,t.upper_bound))`
	`300`	`+ifisinstance(self.s,TypeVarType):`
	`301`	`+ifself.s.id==t.id:`
	`302`	`+ifself.s.upper_bound==t.upper_bound:`
	`303`	`+returnself.s`
	`304`	`+returnself.s.copy_modified(`
	`305`	`+upper_bound=join_types(self.s.upper_bound,t.upper_bound)`
	`306`	`+ )`
	`307`	`+# Fix non-commutative joins`
	`308`	`+returnget_proper_type(join_types(self.s.upper_bound,t.upper_bound))`
`304`	`309`	`else:`
`305`	`310`	`returnself.default(self.s)`
`306`	`311`

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1051,6 +1051,35 @@ def test_join_type_type_type_var(self) -> None:`
`1051`	`1051`	`self.assert_join(self.fx.type_a,self.fx.t,self.fx.o)`
`1052`	`1052`	`self.assert_join(self.fx.t,self.fx.type_a,self.fx.o)`
`1053`	`1053`
	`1054`	`+deftest_join_type_var_bounds(self)->None:`
	`1055`	`+tvar1=TypeVarType(`
	`1056`	`+"tvar1",`
	`1057`	`+"tvar1",`
	`1058`	`+TypeVarId(-100),`
	`1059`	`+ [],`
	`1060`	`+self.fx.o,`
	`1061`	`+AnyType(TypeOfAny.from_omitted_generics),`
	`1062`	`+INVARIANT,`
	`1063`	`+ )`
	`1064`	`+any_type=AnyType(TypeOfAny.special_form)`
	`1065`	`+tvar2=TypeVarType(`
	`1066`	`+"tvar2",`
	`1067`	`+"tvar2",`
	`1068`	`+TypeVarId(-101),`
	`1069`	`+ [],`
	`1070`	`+upper_bound=UnionType(`
	`1071`	`+ [`
	`1072`	`+TupleType([any_type],self.fx.std_tuple),`
	`1073`	`+TupleType([any_type,any_type],self.fx.std_tuple),`
	`1074`	`+ ]`
	`1075`	`+ ),`
	`1076`	`+default=AnyType(TypeOfAny.from_omitted_generics),`
	`1077`	`+variance=INVARIANT,`
	`1078`	`+ )`
	`1079`	`+`
	`1080`	`+self.assert_join(tvar1,tvar2,self.fx.o)`
	`1081`	`+self.assert_join(tvar2,tvar1,self.fx.o)`
	`1082`	`+`
`1054`	`1083`	`# There are additional test cases in check-inference.test.`
`1055`	`1084`
`1056`	`1085`	`# TODO: Function types + varargs and default args.`

Comments

(0)