Fix issue #961 (#962)

* Fix issue #961

* only test on newer Julia versions

* bump version

Author: mateuszbaran

Project.toml

@@ -1,6 +1,6 @@
 name = "StaticArrays"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.2.12"
+version = "1.2.13"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/linalg.jl

@@ -139,7 +139,8 @@ end
     end
 end
 
-@generated function diagm(kvs::Pair{<:Val,<:StaticVector}...)
+@generated function diagm(kv1::Pair{<:Val,<:StaticVector}, other_kvs::Pair{<:Val,<:StaticVector}...)
+    kvs = (kv1, other_kvs...)
     diag_ind_and_length = [(kv.parameters[1].parameters[1], length(kv.parameters[2])) for kv in kvs]
     N = maximum(abs(di) + dl for (di,dl) in diag_ind_and_length)
     vs = [Symbol("v$i") for i=1:length(kvs)]
@@ -153,6 +154,7 @@ end
     end
     return quote
         $(Expr(:meta, :inline))
+        kvs = (kv1, other_kvs...)
         $(vs_exprs...)
         @inbounds elements = tuple($(element_exprs...))
         T = promote_tuple_eltype(elements)

test/linalg.jl

@@ -117,6 +117,10 @@ StaticArrays.similar_type(::Union{RotMat2,Type{RotMat2}}) = SMatrix{2,2,Float64,
     end
 
     @testset "diagm()" begin
+        if VERSION >= v"1.3"
+            @test diagm() isa BitArray # issue #961: type piracy of zero-arg diagm
+            # `diagm()` fails on older version of Julia even without StaticArrays.jl
+        end
         @test @inferred(diagm(SA[1,2])) === SA[1 0; 0 2]
         @test @inferred(diagm(Val(0) => SVector(1,2))) === @SMatrix [1 0; 0 2]
         @test @inferred(diagm(Val(2) => SVector(1,2,3)))::SMatrix == diagm(2 => [1,2,3])