fix specificity of sigs that are strict subtypes of vararg sigs

JuliaLang · Oct 14, 2016 · 30bb198 · 30bb198
1 parent 4ba21aa
commit 30bb198
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/jltypes.c b/src/jltypes.c
@@ -3132,7 +3132,9 @@ int jl_args_morespecific_fix1(jl_value_t *a, jl_value_t *b, int swap)
     if (changed) {
         JL_GC_PUSH1(&newtta);
         int ret;
-        if (swap)
+        if (type_eqv_(b, newtta))
+            ret = swap;
+        else if (swap)
             ret = jl_args_morespecific_(b, (jl_value_t*)newtta);
         else
             ret = jl_args_morespecific_((jl_value_t*)newtta, b);

diff --git a/test/core.jl b/test/core.jl
@@ -219,6 +219,11 @@ end
 
 # with bound varargs
 
+_bound_vararg_specificity_1{T,N}(::Type{Array{T,N}}, d::Vararg{Int, N}) = 0
+_bound_vararg_specificity_1{T}(::Type{Array{T,1}}, d::Int) = 1
+@test _bound_vararg_specificity_1(Array{Int,1}, 1) == 1
+@test _bound_vararg_specificity_1(Array{Int,2}, 1, 1) == 0
+
 # issue #11840
 typealias TT11840{T} Tuple{T,T}
 f11840(::Type) = "Type"