fix #38888, pessimistic sparam inference with concrete upper bound

JuliaLang · Dec 15, 2020 · db9bf3e · db9bf3e
1 parent da38c6b
commit db9bf3e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/base/compiler/utilities.jl b/base/compiler/utilities.jl
@@ -139,7 +139,7 @@ end
 const nonfunction_mt = typename(SimpleVector).mt
 
 function get_compileable_sig(method::Method, @nospecialize(atypes), sparams::SimpleVector)
-    isa(atypes, DataType) || return Nothing
+    isa(atypes, DataType) || return nothing
     mt = ccall(:jl_method_table_for, Any, (Any,), atypes)
     mt === nothing && return nothing
     return ccall(:jl_normalize_to_compilable_sig, Any, (Any, Any, Any, Any),

diff --git a/src/subtype.c b/src/subtype.c
@@ -3483,18 +3483,32 @@ jl_value_t *jl_type_intersection_env_s(jl_value_t *a, jl_value_t *b, jl_svec_t *
             }
         }
     }
-    if (sz == 0 && szb > 0) {
-        while (jl_is_unionall(b)) {
-            env[i++] = (jl_value_t*)((jl_unionall_t*)b)->var;
-            b = ((jl_unionall_t*)b)->body;
-        }
-        sz = szb;
-    }
     if (penv) {
+        jl_value_t *btemp;
+        if (sz == 0 && szb > 0) {
+            btemp = b;
+            while (jl_is_unionall(btemp)) {
+                env[i++] = (jl_value_t*)((jl_unionall_t*)btemp)->var;
+                btemp = ((jl_unionall_t*)btemp)->body;
+            }
+            sz = szb;
+        }
+        btemp = b;
         jl_svec_t *e = jl_alloc_svec(sz);
         *penv = e;
-        for(i=0; i < sz; i++)
-            jl_svecset(e, i, env[i]);
+        for(i=0; i < sz; i++) {
+            assert(jl_is_unionall(btemp));
+            jl_value_t *ei = env[i];
+            if (jl_is_typevar(ei)) {
+                jl_tvar_t *vi = (jl_tvar_t*)ei;
+                if (jl_is_concrete_type(vi->ub) && vi->ub != (jl_value_t*)jl_datatype_type &&
+                    vi->ub != (jl_value_t*)jl_uniontype_type && vi->ub != (jl_value_t*)jl_unionall_type &&
+                    !var_occurs_invariant(((jl_unionall_t*)btemp)->body, ((jl_unionall_t*)btemp)->var, 0))
+                    ei = vi->ub;
+            }
+            jl_svecset(e, i, ei);
+            btemp = ((jl_unionall_t*)btemp)->body;
+        }
     }
  bot:
     JL_GC_POP();

diff --git a/test/compiler/inference.jl b/test/compiler/inference.jl
@@ -2979,3 +2979,10 @@ gVarargInt(x::Int) = 1
 gVarargInt(x) = 2
 fVarargInt(::Tuple{Vararg{Int, N}}) where {N} = Val{gVarargInt(N)}()
 @test only(Base.return_types(fVarargInt, Tuple{Tuple{Vararg{Int}}})) == Val{1}
+
+# issue #38888
+struct S38888{T}
+    S38888(x::S) where {S<:Int} = new{S}()
+end
+f38888() = S38888(Base.inferencebarrier(3))
+@test f38888() isa S38888