fix #17354, expand Tuple{Vararg{Any,2}} on construction

Author: JeffBezanson

src/jltypes.c

@@ -2155,28 +2155,22 @@ static jl_value_t *inst_datatype(jl_datatype_t *dt, jl_svec_t *p, jl_value_t **i
             if (nt < 0)
                 jl_errorf("apply_type: Vararg length N is negative: %zd", nt);
             va = jl_tparam0(va);
-            if (nt == 0 || jl_is_leaf_type(va)) {
+            if (nt == 0 || !jl_has_typevars(va)) {
                 if (ntp == 1)
                     return jl_tupletype_fill(nt, va);
                 size_t i, l;
+                p = jl_alloc_svec(ntp - 1 + nt);
                 for (i = 0, l = ntp - 1; i < l; i++) {
-                    if (!jl_is_leaf_type(iparams[i]))
-                        break;
+                    jl_svecset(p, i, iparams[i]);
                 }
-                if (i == l) {
-                    p = jl_alloc_svec(ntp - 1 + nt);
-                    for (i = 0, l = ntp - 1; i < l; i++) {
-                        jl_svecset(p, i, iparams[i]);
-                    }
-                    l = ntp - 1 + nt;
-                    for (; i < l; i++) {
-                        jl_svecset(p, i, va);
-                    }
-                    JL_GC_PUSH1(&p);
-                    jl_value_t *ndt = (jl_value_t*)jl_apply_tuple_type(p);
-                    JL_GC_POP();
-                    return ndt;
+                l = ntp - 1 + nt;
+                for (; i < l; i++) {
+                    jl_svecset(p, i, va);
                 }
+                JL_GC_PUSH1(&p);
+                jl_value_t *ndt = (jl_value_t*)jl_apply_tuple_type(p);
+                JL_GC_POP();
+                return ndt;
             }
         }
     }

test/core.jl

@@ -139,6 +139,8 @@ let N = TypeVar(:N,true)
     @test is(Bottom,typeintersect(Tuple{Array{Int,N},Vararg{Int,N}}, Tuple{Vector{Int},Real,Real,Real}))
     @test is(Bottom,typeintersect(Tuple{Vector{Int},Real,Real,Real}, Tuple{Array{Int,N},Vararg{Int,N}}))
     @test Tuple{Int,Vararg{Int,2}} == Tuple{Int,Int,Int}
+    @test Tuple{Int,Vararg{Int,2}} === Tuple{Int,Int,Int}
+    @test Tuple{Any, Any} === Tuple{Vararg{Any,2}}
     @test Tuple{Int,Vararg{Int,2}} == Tuple{Int,Int,Vararg{Int,1}}
     @test Tuple{Int,Vararg{Int,2}} == Tuple{Int,Int,Int,Vararg{Int,0}}
     @test !(Tuple{Int,Vararg{Int,2}} <: Tuple{Int,Int,Int,Vararg{Int,1}})