Merge pull request #22210 from JuliaLang/teh/inlining_cost_model

Decide inline-worthiness based on a more nuanced cost model

base/abstractarray.jl

@@ -927,7 +927,7 @@ _getindex(::IndexStyle, A::AbstractArray, I...) =
 ## IndexLinear Scalar indexing: canonical method is one Int
 _getindex(::IndexLinear, A::AbstractArray, i::Int) = (@_propagate_inbounds_meta; getindex(A, i))
 _getindex(::IndexLinear, A::AbstractArray) = (@_propagate_inbounds_meta; getindex(A, _to_linear_index(A)))
-function _getindex(::IndexLinear, A::AbstractArray, I::Int...)
+function _getindex(::IndexLinear, A::AbstractArray, I::Vararg{Int,M}) where M
  @_inline_meta
  @boundscheck checkbounds(A, I...) # generally _to_linear_index requires bounds checking
  @inbounds r = getindex(A, _to_linear_index(A, I...))
@@ -944,7 +944,7 @@ function _getindex(::IndexCartesian, A::AbstractArray)
  @_propagate_inbounds_meta
  getindex(A, _to_subscript_indices(A)...)
 end
-function _getindex(::IndexCartesian, A::AbstractArray, I::Int...)
+function _getindex(::IndexCartesian, A::AbstractArray, I::Vararg{Int,M}) where M
  @_inline_meta
  @boundscheck checkbounds(A, I...) # generally _to_subscript_indices requires bounds checking
  @inbounds r = getindex(A, _to_subscript_indices(A, I...)...)
@@ -1011,7 +1011,7 @@ _setindex!(::IndexStyle, A::AbstractArray, v, I...) =
 ## IndexLinear Scalar indexing
 _setindex!(::IndexLinear, A::AbstractArray, v, i::Int) = (@_propagate_inbounds_meta; setindex!(A, v, i))
 _setindex!(::IndexLinear, A::AbstractArray, v) = (@_propagate_inbounds_meta; setindex!(A, v, _to_linear_index(A)))
-function _setindex!(::IndexLinear, A::AbstractArray, v, I::Int...)
+function _setindex!(::IndexLinear, A::AbstractArray, v, I::Vararg{Int,M}) where M
  @_inline_meta
  @boundscheck checkbounds(A, I...)
  @inbounds r = setindex!(A, v, _to_linear_index(A, I...))
@@ -1027,7 +1027,7 @@ function _setindex!(::IndexCartesian, A::AbstractArray, v)
  @_propagate_inbounds_meta
  setindex!(A, v, _to_subscript_indices(A)...)
 end
-function _setindex!(::IndexCartesian, A::AbstractArray, v, I::Int...)
+function _setindex!(::IndexCartesian, A::AbstractArray, v, I::Vararg{Int,M}) where M
  @_inline_meta
  @boundscheck checkbounds(A, I...)
  @inbounds r = setindex!(A, v, _to_subscript_indices(A, I...)...)

base/abstractarraymath.jl

@@ -397,7 +397,7 @@ _rshps(shp, shp_i, sz, i, ::Tuple{}) =
 _reperr(s, n, N) = throw(ArgumentError("number of " * s * " repetitions " *
  "($n) cannot be less than number of dimensions of input ($N)"))
 
-@propagate_inbounds function _repeat(A::AbstractArray, inner, outer)
+@noinline function _repeat(A::AbstractArray, inner, outer)
  shape, inner_shape = rep_shapes(A, inner, outer)
 
  R = similar(A, shape)

base/array.jl

@@ -170,23 +170,23 @@ function reinterpret(::Type{T}, a::Array{S}) where T where S
 end
 
 function reinterpret(::Type{T}, a::Array{S}, dims::NTuple{N,Int}) where T where S where N
- if !isbits(T)
- throw(ArgumentError("cannot reinterpret Array{$(S)} to ::Type{Array{$(T)}}, type $(T) is not a bits type"))
- end
- if !isbits(S)
- throw(ArgumentError("cannot reinterpret Array{$(S)} to ::Type{Array{$(T)}}, type $(S) is not a bits type"))
+ function throwbits(::Type{S}, ::Type{T}, ::Type{U}) where {S,T,U}
+ @_noinline_meta
+ throw(ArgumentError("cannot reinterpret Array{$(S)} to ::Type{Array{$(T)}}, type $(U) is not a bits type"))
  end
+ isbits(T) || throwbits(S, T, T)
+ isbits(S) || throwbits(S, T, S)
  nel = div(length(a)*sizeof(S),sizeof(T))
  if prod(dims) != nel
- throw(DimensionMismatch("new dimensions $(dims) must be consistent with array size $(nel)"))
+ _throw_dmrsa(dims, nel)
  end
  ccall(:jl_reshape_array, Array{T,N}, (Any, Any, Any), Array{T,N}, a, dims)
 end
 
 # reshaping to same # of dimensions
 function reshape(a::Array{T,N}, dims::NTuple{N,Int}) where T where N
  if prod(dims) != length(a)
- throw(DimensionMismatch("new dimensions $(dims) must be consistent with array size $(length(a))"))
+ _throw_dmrsa(dims, length(a))
  end
  if dims == size(a)
  return a
@@ -197,11 +197,16 @@ end
 # reshaping to different # of dimensions
 function reshape(a::Array{T}, dims::NTuple{N,Int}) where T where N
  if prod(dims) != length(a)
- throw(DimensionMismatch("new dimensions $(dims) must be consistent with array size $(length(a))"))
+ _throw_dmrsa(dims, length(a))
  end
  ccall(:jl_reshape_array, Array{T,N}, (Any, Any, Any), Array{T,N}, a, dims)
 end
 
+function _throw_dmrsa(dims, len)
+ @_noinline_meta
+ throw(DimensionMismatch("new dimensions $(dims) must be consistent with array size $len"))
+end
+
 ## Constructors ##
 
 similar(a::Array{T,1}) where {T} = Array{T,1}(size(a,1))

base/error.jl

@@ -27,7 +27,10 @@ Raise an `ErrorException` with the given message.
 
 See also [`logging`](@ref).
 """
-error(s...) = throw(ErrorException(Main.Base.string(s...)))
+function error(s::Vararg{Any,N}) where {N}
+ @_noinline_meta
+ throw(ErrorException(Main.Base.string(s...)))
+end
 
 """
  rethrow([e])
@@ -53,7 +56,10 @@ Get the backtrace of the current exception, for use within `catch` blocks.
 catch_backtrace() = ccall(:jl_get_backtrace, Array{Ptr{Void},1}, ())
 
 ## keyword arg lowering generates calls to this ##
-kwerr(kw, args...) = throw(MethodError(typeof(args[1]).name.mt.kwsorter, (kw,args...)))
+function kwerr(kw, args::Vararg{Any,N}) where {N}
+ @_noinline_meta
+ throw(MethodError(typeof(args[1]).name.mt.kwsorter, (kw,args...)))
+end
 
 ## system error handling ##
 """