Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace Array{...}(shape...)-like calls in test/[bc]* #24742

Merged
merged 1 commit into from
Nov 24, 2017
Merged

replace Array{...}(shape...)-like calls in test/[bc]* #24742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/bigint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ end
# from Bill Hart, https://groups.google.com/group/julia-dev/browse_frm/thread/798e2d1322daf633
function mul(a::Vector{BigInt}, b::Vector{BigInt})
x = a[2]*b[2]
c = Array{BigInt,1}(3)
c = Vector{BigInt}(uninitialized, 3)
c[1] = a[1]*b[1] + x
c[2] = a[1]*b[2] + a[2]*b[3]
c[3] = x + a[3]*b[3]
Expand Down
2 changes: 1 addition & 1 deletion test/broadcast.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ getfield19745(x) = x
function Base.Broadcast.broadcast_c(f, ::Type{Array19745}, A, Bs...)
T = Base.Broadcast._broadcast_eltype(f, A, Bs...)
shape = Base.Broadcast.broadcast_indices(A, Bs...)
dest = Array19745(Array{T}(Base.index_lengths(shape...)))
dest = Array19745(Array{T}(uninitialized, Base.index_lengths(shape...)))
return broadcast!(f, dest, A, Bs...)
end

Expand Down
72 changes: 36 additions & 36 deletions test/core.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Bottom = Union{}
include("testenv.jl")

f47(x::Vector{Vector{T}}) where {T} = 0
@test_throws MethodError f47(Array{Vector}(0))
@test_throws MethodError f47(Vector{Vector}(uninitialized, 0))
@test f47(Array{Vector{Int}}(0)) == 0

# checking unionall and typevar components
Expand Down Expand Up @@ -469,7 +469,7 @@ function const_implies_local()
end
@test const_implies_local() === (1, 0)

a_global_closure_vector = Vector{Any}(3)
a_global_closure_vector = Vector{Any}(uninitialized, 3)
for i = 1:3
let ii = i
a_global_closure_vector[i] = x -> x + ii
Expand Down Expand Up @@ -587,11 +587,11 @@ end

let
local a
a = Vector{Any}(2)
a = Vector{Any}(uninitialized, 2)
@test !isassigned(a,1) && !isassigned(a,2)
a[1] = 1
@test isassigned(a,1) && !isassigned(a,2)
a = Array{Float64}(1)
a = Array{Float64}(uninitialized,1)
@test isassigned(a,1)
@test isassigned(a)
@test !isassigned(a,2)
Expand Down Expand Up @@ -1256,7 +1256,7 @@ let

# issue #1886
X = [1:4;]
r = Array{UnitRange{Int}}(1)
r = Array{UnitRange{Int}}(uninitialized, 1)
r[1] = 2:3
X[r...] *= 2
@test X == [1,4,6,4]
Expand Down Expand Up @@ -1321,7 +1321,7 @@ struct Foo2509; foo::Int; end
# issue #2517
struct Foo2517; end
@test repr(Foo2517()) == "$(curmod_prefix)Foo2517()"
@test repr(Array{Foo2517}(1)) == "$(curmod_prefix)Foo2517[$(curmod_prefix)Foo2517()]"
@test repr(Array{Foo2517}(uninitialized, 1)) == "$(curmod_prefix)Foo2517[$(curmod_prefix)Foo2517()]"
@test Foo2517() === Foo2517()

# issue #1474
Expand Down Expand Up @@ -1450,7 +1450,7 @@ end
# issue #3167
let
function foo(x)
ret=Array{typeof(x[1])}(length(x))
ret=Array{typeof(x[1])}(uninitialized, length(x))
for j = 1:length(x)
ret[j] = x[j]
end
Expand Down Expand Up @@ -1704,7 +1704,7 @@ end
@test invalid_tupleref()==true

# issue #5150
f5150(T) = Array{Rational{T}}(1)
f5150(T) = Array{Rational{T}}(uninitialized, 1)
@test typeof(f5150(Int)) === Array{Rational{Int},1}


Expand Down Expand Up @@ -1854,7 +1854,7 @@ mutable struct Polygon5884{T<:Real}
end

function test5884()
star = Array{Polygon5884}((3,))
star = Vector{Polygon5884}(uninitialized, (3,))
star[1] = Polygon5884([Complex(1.0,1.0)])
p1 = star[1].points[1]
@test p1 == Complex(1.0,1.0)
Expand Down Expand Up @@ -2046,7 +2046,7 @@ end
obj6387 = ObjMember(DateRange6387{Int64}())

function v6387(r::AbstractRange{T}) where T
a = Array{T}(1)
a = Vector{T}(uninitialized, 1)
a[1] = Core.Intrinsics.bitcast(Date6387{Int64}, Int64(1))
return a
end
Expand All @@ -2059,8 +2059,8 @@ end
day_in(obj6387)

# issue #6784
@test ndims(Array{Array{Float64}}(3,5)) == 2
@test ndims(Array{Array}(3,5)) == 2
@test ndims(Array{Array{Float64}}(uninitialized, 3,5)) == 2
@test ndims(Array{Array}(uninitialized, 3,5)) == 2

# issue #6793
function segfault6793(;gamma=1)
Expand Down Expand Up @@ -2295,7 +2295,7 @@ end

# issue #9475
module I9475
arr = Array{Any}(1)
arr = Vector{Any}(uninitialized, 1)
@eval @eval $arr[1] = 1
end

Expand Down Expand Up @@ -3184,7 +3184,7 @@ mutable struct D11597{T} <: C11597{T} d::T end
@test_throws TypeError repr(D11597(1.0))

# issue #11772
@test_throws UndefRefError (Vector{Any}(5)...,)
@test_throws UndefRefError (Vector{Any}(uninitialized, 5)...,)

# issue #11813
let a = UInt8[1, 107, 66, 88, 2, 99, 254, 13, 0, 0, 0, 0]
Expand Down Expand Up @@ -3407,7 +3407,7 @@ end

# issue #12394
mutable struct Empty12394 end
let x = Array{Empty12394}(1), y = [Empty12394()]
let x = Vector{Empty12394}(uninitialized, 1), y = [Empty12394()]
@test_throws UndefRefError x==y
@test_throws UndefRefError y==x
end
Expand Down Expand Up @@ -3545,7 +3545,7 @@ end
#13433, read!(::IO, a::Vector{UInt8}) should return a
mutable struct IO13433 <: IO end
Base.read(::IO13433, ::Type{UInt8}) = 0x01
@test read!(IO13433(), Array{UInt8}(4)) == [0x01, 0x01, 0x01, 0x01]
@test read!(IO13433(), Array{UInt8}(uninitialized, 4)) == [0x01, 0x01, 0x01, 0x01]

# issue #13647, comparing boxed isbits immutables
struct X13647
Expand Down Expand Up @@ -3582,7 +3582,7 @@ f11327(::Type{T},x::T) where {T} = x

# issue #8487
@test [x for x in 1:3] == [x for x ∈ 1:3] == [x for x = 1:3]
let A = Array{Int}(4,3)
let A = Matrix{Int}(uninitialized, 4,3)
for i ∈ 1:size(A,1), j ∈ 1:size(A,2)
A[i,j] = 17*i + 51*j
end
Expand Down Expand Up @@ -3872,15 +3872,15 @@ end

# issue #15180
function f15180(x::T) where T
X = Array{T}(1)
X = Vector{T}(uninitialized, 1)
X[1] = x
@noinline ef(::J) where {J} = (J,X[1]) # Use T
ef(::J, ::Int) where {J} = (T,J)
return ef
end
@test map(f15180(1), [1,2]) == [(Int,1),(Int,1)]

let ary = Vector{Any}(10)
let ary = Vector{Any}(uninitialized, 10)
check_undef_and_fill(ary, rng) = for i in rng
@test !isassigned(ary, i)
ary[i] = (Float64(i), i) # some non-cached content
Expand All @@ -3898,20 +3898,20 @@ let ary = Vector{Any}(10)
check_undef_and_fill(ary, 16:20)

# Now check grow/del_end
ary = Vector{Any}(1010)
ary = Vector{Any}(uninitialized, 1010)
check_undef_and_fill(ary, 1:1010)
# This del_beg should move the buffer
ccall(:jl_array_del_beg, Void, (Any, Csize_t), ary, 1000)
ccall(:jl_array_grow_beg, Void, (Any, Csize_t), ary, 1000)
check_undef_and_fill(ary, 1:1000)
ary = Vector{Any}(1010)
ary = Vector{Any}(uninitialized, 1010)
check_undef_and_fill(ary, 1:1010)
# This del_beg should not move the buffer
ccall(:jl_array_del_beg, Void, (Any, Csize_t), ary, 10)
ccall(:jl_array_grow_beg, Void, (Any, Csize_t), ary, 10)
check_undef_and_fill(ary, 1:10)

ary = Vector{Any}(1010)
ary = Vector{Any}(uninitialized, 1010)
check_undef_and_fill(ary, 1:1010)
ccall(:jl_array_grow_end, Void, (Any, Csize_t), ary, 10)
check_undef_and_fill(ary, 1011:1020)
Expand All @@ -3924,7 +3924,7 @@ let ary = Vector{Any}(10)
# we are malloc'ing the buffer after the grow_end and malloc is not using
# mmap directly (which may return a zero'd new page).
for n in [50, 51, 100, 101, 200, 201, 300, 301]
ary = Vector{Any}(n)
ary = Vector{Any}(uninitialized, n)
# Try to free the previous buffer that was filled with random content
# and to increase the chance of getting a non-zero'd buffer next time
gc()
Expand All @@ -3937,7 +3937,7 @@ let ary = Vector{Any}(10)
check_undef_and_fill(ary, 1:(2n + 4))
end

ary = Vector{Any}(100)
ary = Vector{Any}(uninitialized, 100)
ccall(:jl_array_grow_end, Void, (Any, Csize_t), ary, 10000)
ary[:] = 1:length(ary)
ccall(:jl_array_del_beg, Void, (Any, Csize_t), ary, 10000)
Expand All @@ -3951,7 +3951,7 @@ let ary = Vector{Any}(10)
end
end

ary = Vector{Any}(100)
ary = Vector{Any}(uninitialized, 100)
ary[:] = 1:length(ary)
ccall(:jl_array_grow_at, Void, (Any, Csize_t, Csize_t), ary, 50, 10)
for i in 51:60
Expand Down Expand Up @@ -4008,14 +4008,14 @@ end
@test M15455.partialsort(1,2)==0

# check that medium-sized array is 64-byte aligned (#15139)
@test Int(pointer(Vector{Float64}(1024))) % 64 == 0
@test Int(pointer(Vector{Float64}(uninitialized, 1024))) % 64 == 0

# PR #15413
# Make sure arrayset can handle `Array{T}` (where `T` is a type and not a
# `TypeVar`) without crashing
let
function arrayset_unknown_dim(::Type{T}, n) where T
Base.arrayset(true, reshape(Vector{T}(1), ones(Int, n)...), 2, 1)
Base.arrayset(true, reshape(Vector{T}(uninitialized, 1), ones(Int, n)...), 2, 1)
end
arrayset_unknown_dim(Any, 1)
arrayset_unknown_dim(Any, 2)
Expand All @@ -4031,7 +4031,7 @@ using Test
# not modify the original data
function test_shared_array_resize(::Type{T}) where T
len = 100
a = Vector{T}(len)
a = Vector{T}(uninitialized, len)
function test_unshare(f)
a′ = reshape(reshape(a, (len ÷ 2, 2)), len)
a[:] = 1:length(a)
Expand Down Expand Up @@ -4108,7 +4108,7 @@ f = unsafe_wrap(Array, ccall(:malloc, Ptr{UInt8}, (Csize_t,), 10), 10, true)
end

# Copy of `#undef`
copy!(Vector{Any}(10), Vector{Any}(10))
copy!(Vector{Any}(uninitialized, 10), Vector{Any}(uninitialized, 10))
function test_copy_alias(::Type{T}) where T
ary = T[1:100;]
unsafe_copy!(ary, 1, ary, 11, 90)
Expand Down Expand Up @@ -5067,7 +5067,7 @@ end
x::Array{T} where T<:Integer
end

let a = Array{Core.TypeofBottom, 1}(2)
let a = Vector{Core.TypeofBottom}(uninitialized, 2)
@test a[1] == Union{}
@test a == [Union{}, Union{}]
end
Expand Down Expand Up @@ -5108,7 +5108,7 @@ end
let ni128 = sizeof(FP128test) ÷ sizeof(Int),
ns128 = sizeof(FP128align) ÷ sizeof(Int),
nbit = sizeof(Int) * 8,
arr = Vector{FP128align}(2),
arr = Vector{FP128align}(uninitialized, 2),
offset = Base.datatype_alignment(FP128test) ÷ sizeof(Int),
little,
expected,
Expand Down Expand Up @@ -5632,11 +5632,11 @@ end
for U in boxedunions
local U
for N in (1, 2, 3, 4)
A = Array{U}(ntuple(x->0, N)...)
A = Array{U}(uninitialized, ntuple(x->0, N)...)
@test isempty(A)
@test sizeof(A) == 0

A = Array{U}(ntuple(x->10, N)...)
A = Array{U}(uninitialized, ntuple(x->10, N)...)
@test length(A) == 10^N
@test sizeof(A) == sizeof(Int) * (10^N)
@test !isassigned(A, 1)
Expand All @@ -5652,7 +5652,7 @@ let
end

# copy!
A23567 = Vector{Union{Float64, Void}}(5)
A23567 = Vector{Union{Float64, Void}}(uninitialized, 5)
B23567 = collect(Union{Float64, Void}, 1.0:3.0)
copy!(A23567, 2, B23567)
@test A23567[1] === nothing
Expand All @@ -5671,13 +5671,13 @@ t4 = vcat(A23567, t2, t3)
for U in unboxedunions
local U
for N in (1, 2, 3, 4)
A = Array{U}(ntuple(x->0, N)...)
A = Array{U}(uninitialized, ntuple(x->0, N)...)
@test isempty(A)
@test sizeof(A) == 0

len = ntuple(x->10, N)
mxsz = maximum(sizeof, Base.uniontypes(U))
A = Array{U}(len)
A = Array{U}(uninitialized, len)
@test length(A) == prod(len)
@test sizeof(A) == prod(len) * mxsz
@test isassigned(A, 1)
Expand Down