Merge pull request #22249 from JuliaLang/jb/fix22239

fix #22239, stack overflow in type intersection
JuliaLang · Jun 6, 2017 · 285ec1f · 285ec1f · nanosoldier · Jun 7, 2017
2 parents 97195d6 + 7cc7520
commit 285ec1f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/subtype.c b/src/subtype.c
@@ -1287,7 +1287,7 @@ static jl_value_t *intersect_var(jl_tvar_t *b, jl_value_t *a, jl_stenv_t *e, int
         return ub;
     }
     else if (bb->constraintkind == 0) {
-        if (!jl_is_typevar(a)) {
+        if (!jl_is_typevar(bb->ub) && !jl_is_typevar(a)) {
             if (try_subtype_in_env(bb->ub, a, e))
                 return (jl_value_t*)b;
         }

diff --git a/test/subtype.jl b/test/subtype.jl
@@ -1108,3 +1108,8 @@ end
 @testintersect(Tuple{Type{B21613{Tuple{L},L}} where L, Any},
                Tuple{Type{SA}, Tuple} where SA<:(A21613{S} where S<:Tuple),
                Tuple{Type{B21613{Tuple{L},L}} where L, Tuple})
+
+# issue #22239
+@testintersect(Val{Pair{T,T}} where T,
+               Val{Pair{Int,T}} where T,
+               Val{Pair{Int,Int}})