Avoid introducing local variable (and GC frame store) when the inline…

…r is confused about the return point.
JuliaLang · Oct 6, 2015 · ec3d2f1 · ec3d2f1
1 parent b5bebf2
commit ec3d2f1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/base/array.jl b/base/array.jl
@@ -303,7 +303,11 @@ end
 setindex!{T}(A::Array{T}, x, i1::Real) = arrayset(A, convert(T,x)::T, to_index(i1))
 setindex!{T}(A::Array{T}, x, i1::Real, i2::Real, I::Real...) = arrayset(A, convert(T,x)::T, to_index(i1), to_index(i2), to_indexes(I...)...)
 
-unsafe_setindex!{T}(A::Array{T}, x, i1::Real, I::Real...) = @inbounds return arrayset(A, convert(T,x)::T, to_index(i1), to_indexes(I...)...)
+# Type inference is confused by `@inbounds return ...` and introduces a
+# local variable for the Array which disables SIMD since we don't have a
+# TBAA for the GC frame yet.
+unsafe_setindex!{T}(A::Array{T}, x, i1::Real, I::Real...) =
+    (@inbounds arrayset(A, convert(T,x)::T, to_index(i1), to_indexes(I...)...); A)
 
 # These are redundant with the abstract fallbacks but needed for bootstrap
 function setindex!(A::Array, x, I::AbstractVector{Int})