fix isa fast path for typevars with lower bounds (#32040)

JuliaLang · May 16, 2019 · 7a75753 · 7a75753 · vtjnash · May 16, 2019
1 parent 8f9ace0
commit 7a75753
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/subtype.c b/src/subtype.c
@@ -1506,10 +1506,18 @@ JL_DLLEXPORT int jl_isa(jl_value_t *x, jl_value_t *t)
                 if (((jl_datatype_t*)t2)->name == jl_type_typename) {
                     jl_value_t *tp = jl_tparam0(t2);
                     if (jl_is_typevar(tp)) {
-                        while (jl_is_typevar(tp))
-                            tp = ((jl_tvar_t*)tp)->ub;
-                        if (!jl_has_free_typevars(tp))
-                            return jl_subtype(x, tp);
+                        if (((jl_tvar_t*)tp)->lb == jl_bottom_type) {
+                            while (jl_is_typevar(tp))
+                                tp = ((jl_tvar_t*)tp)->ub;
+                            if (!jl_has_free_typevars(tp))
+                                return jl_subtype(x, tp);
+                        }
+                        else if (((jl_tvar_t*)tp)->ub == (jl_value_t*)jl_any_type) {
+                            while (jl_is_typevar(tp))
+                                tp = ((jl_tvar_t*)tp)->lb;
+                            if (!jl_has_free_typevars(tp))
+                                return jl_subtype(tp, x);
+                        }
                     }
                 }
                 else {

diff --git a/test/subtype.jl b/test/subtype.jl
@@ -488,6 +488,10 @@ function test_Type()
     @test !(Tuple{Int,} <: (@UnionAll T<:Tuple Type{T}))
     @test isa(Tuple{Int}, (@UnionAll T<:Tuple Type{T}))
 
+    @test !isa(Int, Type{>:String})
+    @test  isa(Union{Int,String}, Type{>:String})
+    @test  isa(Any, Type{>:String})
+
     # this matches with T==DataType, since DataType is concrete
     @test  issub(Tuple{Type{Int},Type{Int8}}, Tuple{T,T} where T)
     @test !issub(Tuple{Type{Int},Type{Union{}}}, Tuple{T,T} where T)