Merge pull request #252 from JuliaArrays/inplace-broadcast-array-fix

Fix broadcast! with non-static arrays
JuliaArrays · Jul 25, 2017 · 0a73072 · 0a73072
2 parents 8047757 + a61d193
commit 0a73072
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/broadcast.jl b/src/broadcast.jl
@@ -114,7 +114,9 @@ end
 ## broadcast! ##
 ################
 
-@inline function broadcast_c!(f, ::Type{StaticArray}, ::Type, dest, as...)
+# TODO: This signature could be relaxed to (::Any, ::Type{StaticArray}, ::Type, ...), though
+# we'd need to rework how _broadcast!() and broadcast_sizes() interact with normal AbstractArray.
+@inline function broadcast_c!(f, ::Type{StaticArray}, ::Type{StaticArray}, dest, as...)
     _broadcast!(f, Size(dest), dest, broadcast_sizes(as...), as...)
 end
 

diff --git a/test/broadcast.jl b/test/broadcast.jl
@@ -128,6 +128,11 @@ end
         A = @MMatrix([1 0]); @test @inferred(broadcast!(+, A, A, 2)) == @MMatrix [3 2]
     end
 
+    @testset "broadcast! with mixtures of SArray and Array" begin
+        a = zeros(MVector{2}); @test @inferred(broadcast!(+, a, [1,2])) == [1,2]
+        a = zeros(MMatrix{2,3}); @test @inferred(broadcast!(+, a, [1,2])) == [1 1 1; 2 2 2]
+    end
+
     @testset "eltype after broadcast" begin
         # test cases issue #198
         let a = SVector{4, Number}(2, 2.0, 4//2, 2+0im)