fixing the BitVector dispatch bug

tomjbarker · Apr 11, 2012 · 2e75d14 · 2e75d14
1 parent ec7c3e2
commit 2e75d14
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/jltypes.c b/src/jltypes.c
@@ -693,6 +693,9 @@ static jl_value_t *jl_type_intersect(jl_value_t *a, jl_value_t *b,
         JL_GC_POP();
         return (jl_value_t*)jl_bottom_type;
     }
+    // super needs to be instantiated so the matching below finds actual types
+    // and doesn't fail due to the presence of extra typevars.
+    super = (jl_tag_type_t*)jl_instantiate_type_with((jl_type_t*)super, eqc->data, eqc->n/2);
 
     size_t n = sub->parameters->length;
 

diff --git a/test/core.jl b/test/core.jl
@@ -238,3 +238,13 @@ begin
     some_data = {("a", Int32), ("b", Int32)}
     @assert isa(mytype(some_data),Vector{(ASCIIString, BitsKind)})
 end
+
+type MyArray{N} <: AbstractArray{Int, N}
+end
+begin
+    local x
+    x = MyArray{1}()
+    foob(x::AbstractArray)=0
+    foob{T}(x::AbstractVector{T})=1
+    @assert foob(x) == 1
+end