fix #8851, type intersection bug in Grid.jl tests exposed by call o…

…verloading (cherry picked from commit da6087e) Conflicts: test/core.jl
JuliaLang · Nov 7, 2014 · f9dcf0d · f9dcf0d
1 parent 478ac06
commit f9dcf0d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/jltypes.c b/src/jltypes.c
@@ -2579,6 +2579,11 @@ static jl_value_t *type_match_(jl_value_t *child, jl_value_t *parent,
     if (jl_is_typector(parent))
         parent = (jl_value_t*)((jl_typector_t*)parent)->body;
     size_t i, j;
+    if (match_intersection_mode && jl_is_typevar(child) && !jl_is_typevar(parent)) {
+        tmp = child;
+        child = parent;
+        parent = tmp;
+    }
     if (jl_is_typevar(parent)) {
         // make sure type is within this typevar's bounds
         if (morespecific) {

diff --git a/test/core.jl b/test/core.jl
@@ -1854,3 +1854,10 @@ let ex = Expr(:(=), :(f8338(x;y=4)), :(x*y))
     eval(ex)
     @test f8338(2) == 8
 end
+
+# issue #8851
+abstract AbstractThing{T,N}
+type ConcreteThing{T<:FloatingPoint,N} <: AbstractThing{T,N}
+end
+
+@test typeintersect(AbstractThing{TypeVar(:T,true),2}, ConcreteThing) == ConcreteThing{TypeVar(:T,FloatingPoint),2}