Merge pull request #20722 from JuliaLang/jb/nontypebounds

JeffBezanson · web-flow · commit 61a291bf6c4b · 2017-02-21T23:15:47.000-05:00
tolerate non-types as Tuple parameters better
diff --git a/src/subtype.c b/src/subtype.c
@@ -414,7 +414,7 @@ static int is_leaf_bound(jl_value_t *v)
         }
         return 1;
     }
-    return 0;
+    return !jl_is_type(v) && !jl_is_typevar(v);
 }
 
 static jl_value_t *widen_Type(jl_value_t *t)
diff --git a/test/subtype.jl b/test/subtype.jl
@@ -938,3 +938,6 @@ ftwoparams(::TwoParams{<:Real,<:Real}) = 3
 # supertype operator
 @test !(Int >: Integer)
 @test Integer >: Int
+
+# tolerate non-types in Tuples
+@test typeintersect(Tuple{0}, Tuple{T} where T) === Tuple{0}

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ static int is_leaf_bound(jl_value_t *v)`
`414`	`414`	`}`
`415`	`415`	`return 1;`
`416`	`416`	`}`
`417`		`- return 0;`
	`417`	`+ return !jl_is_type(v) && !jl_is_typevar(v);`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`static jl_value_t widen_Type(jl_value_t t)`