Merge pull request #11158 from JuliaLang/teh/fixrangetests

Add non-splatting variants that speed range tests with inline=no
JuliaLang · May 8, 2015 · 88352fa · 88352fa
2 parents b8ecc0e + 660b3ed
commit 88352fa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/base/abstractarray.jl b/base/abstractarray.jl
@@ -734,10 +734,20 @@ cat{T}(catdims, A::AbstractArray{T}...) = cat_t(catdims, T, A...)
 
 cat(catdims, A::AbstractArray...) = cat_t(catdims, promote_eltype(A...), A...)
 
+# The specializations for 1 and 2 inputs are important
+# especially when running with --inline=no, see #11158
+vcat(A::AbstractArray) = cat(1, A)
+vcat(A::AbstractArray, B::AbstractArray) = cat(1, A, B)
 vcat(A::AbstractArray...) = cat(1, A...)
+hcat(A::AbstractArray) = cat(2, A)
+hcat(A::AbstractArray, B::AbstractArray) = cat(2, A, B)
 hcat(A::AbstractArray...) = cat(2, A...)
 
+typed_vcat(T::Type, A::AbstractArray) = cat_t(1, T, A)
+typed_vcat(T::Type, A::AbstractArray, B::AbstractArray) = cat_t(1, T, A, B)
 typed_vcat(T::Type, A::AbstractArray...) = cat_t(1, T, A...)
+typed_hcat(T::Type, A::AbstractArray) = cat_t(2, T, A)
+typed_hcat(T::Type, A::AbstractArray, B::AbstractArray) = cat_t(2, T, A, B)
 typed_hcat(T::Type, A::AbstractArray...) = cat_t(2, T, A...)
 
 # 2d horizontal and vertical concatenation

diff --git a/base/base.jl b/base/base.jl
@@ -35,6 +35,9 @@ call(T::Type{GenSym}, n::Int) = Core.call(T, n)
 call(T::Type{WeakRef}) = Core.call(T)
 call(T::Type{WeakRef}, v::ANY) = Core.call(T, v)
 
+# The specialization for 1 arg is important
+# when running with --inline=no, see #11158
+call{T}(::Type{T}, arg) = convert(T, arg)::T
 call{T}(::Type{T}, args...) = convert(T, args...)::T
 
 convert{T}(::Type{T}, x::T) = x