WIP: Backports for 1.5-RC1

base/abstractarray.jl

@@ -935,6 +935,12 @@ function copyto!(B::AbstractVecOrMat{R}, ir_dest::AbstractRange{Int}, jr_dest::A
  return B
 end
 
+function copyto_axcheck!(dest, src)
+ @noinline checkaxs(axd, axs) = axd == axs || throw(DimensionMismatch("axes must agree, got $axd and $axs"))
+
+ checkaxs(axes(dest), axes(src))
+ copyto!(dest, src)
+end
 
 """
  copymutable(a)
@@ -996,7 +1002,14 @@ end
 pointer(x::AbstractArray{T}) where {T} = unsafe_convert(Ptr{T}, x)
 function pointer(x::AbstractArray{T}, i::Integer) where T
  @_inline_meta
- unsafe_convert(Ptr{T}, x) + (i - first(LinearIndices(x)))*elsize(x)
+ unsafe_convert(Ptr{T}, x) + _memory_offset(x, i)
+end
+
+# The distance from pointer(x) to the element at x[I...] in bytes
+_memory_offset(x::DenseArray, I...) = (_to_linear_index(x, I...) - first(LinearIndices(x)))*elsize(x)
+function _memory_offset(x::AbstractArray, I...)
+ J = _to_subscript_indices(x, I...)
+ return sum(map((i, s, o)->s*(i-o), J, strides(x), Tuple(first(CartesianIndices(x)))))*elsize(x)
 end
 
 ## Approach:
@@ -1066,10 +1079,10 @@ function _getindex(::IndexLinear, A::AbstractArray, I::Vararg{Int,M}) where M
  @inbounds r = getindex(A, _to_linear_index(A, I...))
  r
 end
-_to_linear_index(A::AbstractArray, i::Int) = i
-_to_linear_index(A::AbstractVector, i::Int, I::Int...) = i
+_to_linear_index(A::AbstractArray, i::Integer) = i
+_to_linear_index(A::AbstractVector, i::Integer, I::Integer...) = i
 _to_linear_index(A::AbstractArray) = 1
-_to_linear_index(A::AbstractArray, I::Int...) = (@_inline_meta; _sub2ind(A, I...))
+_to_linear_index(A::AbstractArray, I::Integer...) = (@_inline_meta; _sub2ind(A, I...))
 
 ## IndexCartesian Scalar indexing: Canonical method is full dimensionality of Ints
 function _getindex(::IndexCartesian, A::AbstractArray, I::Vararg{Int,M}) where M
@@ -1082,12 +1095,12 @@ function _getindex(::IndexCartesian, A::AbstractArray{T,N}, I::Vararg{Int, N}) w
  @_propagate_inbounds_meta
  getindex(A, I...)
 end
-_to_subscript_indices(A::AbstractArray, i::Int) = (@_inline_meta; _unsafe_ind2sub(A, i))
+_to_subscript_indices(A::AbstractArray, i::Integer) = (@_inline_meta; _unsafe_ind2sub(A, i))
 _to_subscript_indices(A::AbstractArray{T,N}) where {T,N} = (@_inline_meta; fill_to_length((), 1, Val(N)))
 _to_subscript_indices(A::AbstractArray{T,0}) where {T} = ()
-_to_subscript_indices(A::AbstractArray{T,0}, i::Int) where {T} = ()
-_to_subscript_indices(A::AbstractArray{T,0}, I::Int...) where {T} = ()
-function _to_subscript_indices(A::AbstractArray{T,N}, I::Int...) where {T,N}
+_to_subscript_indices(A::AbstractArray{T,0}, i::Integer) where {T} = ()
+_to_subscript_indices(A::AbstractArray{T,0}, I::Integer...) where {T} = ()
+function _to_subscript_indices(A::AbstractArray{T,N}, I::Integer...) where {T,N}
  @_inline_meta
  J, Jrem = IteratorsMD.split(I, Val(N))
  _to_subscript_indices(A, J, Jrem)

base/array.jl

@@ -561,8 +561,8 @@ promote_rule(a::Type{Array{T,n}}, b::Type{Array{S,n}}) where {T,n,S} = el_same(p
 
 if nameof(@__MODULE__) === :Base # avoid method overwrite
 # constructors should make copies
-Array{T,N}(x::AbstractArray{S,N}) where {T,N,S} = copyto!(Array{T,N}(undef, size(x)), x)
-AbstractArray{T,N}(A::AbstractArray{S,N}) where {T,N,S} = copyto!(similar(A,T), A)
+Array{T,N}(x::AbstractArray{S,N}) where {T,N,S} = copyto_axcheck!(Array{T,N}(undef, size(x)), x)
+AbstractArray{T,N}(A::AbstractArray{S,N}) where {T,N,S} = copyto_axcheck!(similar(A,T), A)
 end
 
 ## copying iterators to containers

base/bitarray.jl

@@ -967,11 +967,11 @@ function deleteat!(B::BitVector, inds)
  n = new_l = length(B)
  y = iterate(inds)
  y === nothing && return B
- n == 0 && throw(BoundsError(B, inds))
 
  Bc = B.chunks
 
  (p, s) = y
+ checkbounds(B, p)
  q = p+1
  new_l -= 1
  y = iterate(inds, s)

base/math.jl

@@ -1000,7 +1000,7 @@ function rem2pi(x::Float64, ::RoundingMode{:ToZero})
  ax = abs(x)
  ax <= 2*Float64(pi,RoundDown) && return x
 
- n,y = rem_pio2_kernel(x)
+ n,y = rem_pio2_kernel(ax)
 
  if iseven(n)
  if n & 2 == 2 # n % 4 == 2: add pi

base/permuteddimsarray.jl

@@ -64,6 +64,7 @@ function Base.strides(A::PermutedDimsArray{T,N,perm}) where {T,N,perm}
  s = strides(parent(A))
  ntuple(d->s[perm[d]], Val(N))
 end
+Base.elsize(::Type{<:PermutedDimsArray{<:Any, <:Any, <:Any, <:Any, P}}) where {P} = Base.elsize(P)
 
 @inline function Base.getindex(A::PermutedDimsArray{T,N,perm,iperm}, I::Vararg{Int,N}) where {T,N,perm,iperm}
  @boundscheck checkbounds(A, I...)

base/subarray.jl

@@ -398,23 +398,12 @@ find_extended_inds(::ScalarIndex, I...) = (@_inline_meta; find_extended_inds(I..
 find_extended_inds(i1, I...) = (@_inline_meta; (i1, find_extended_inds(I...)...))
 find_extended_inds() = ()
 
-unsafe_convert(::Type{Ptr{T}}, V::SubArray{T,N,P,<:Tuple{Vararg{RangeIndex}}}) where {T,N,P} =
- unsafe_convert(Ptr{T}, V.parent) + (first_index(V)-1)*sizeof(T)
+function unsafe_convert(::Type{Ptr{T}}, V::SubArray{T,N,P,<:Tuple{Vararg{RangeIndex}}}) where {T,N,P}
+ return unsafe_convert(Ptr{T}, V.parent) + _memory_offset(V.parent, map(first, V.indices)...)
+end
 
 pointer(V::FastSubArray, i::Int) = pointer(V.parent, V.offset1 + V.stride1*i)
 pointer(V::FastContiguousSubArray, i::Int) = pointer(V.parent, V.offset1 + i)
-pointer(V::SubArray, i::Int) = _pointer(V, i)
-_pointer(V::SubArray{<:Any,1}, i::Int) = pointer(V, (i,))
-_pointer(V::SubArray, i::Int) = pointer(V, Base._ind2sub(axes(V), i))
-
-function pointer(V::SubArray{T,N,<:Array,<:Tuple{Vararg{RangeIndex}}}, is::Tuple{Vararg{Int}}) where {T,N}
- index = first_index(V)
- strds = strides(V)
- for d = 1:length(is)
- index += (is[d]-1)*strds[d]
- end
- return pointer(V.parent, index)
-end
 
 # indices are taken from the range/vector
 # Since bounds-checking is performance-critical and uses

deps/checksums/Pkg-dd7f762630b88a64a89ceaaadd3914bfcfb768dc.tar.gz/md5

@@ -0,0 +1 @@
+33090e964c34e70ca5b2723fad2f8414

deps/checksums/Pkg-dd7f762630b88a64a89ceaaadd3914bfcfb768dc.tar.gz/sha512

@@ -0,0 +1 @@
+e0519d62fc23cb1fd9d8f0da50a8187672d8269b48ac07668a197f04c8c72c7abdae5e9dac16f18c508f75f8e5d7eab83295361201542ea6d159ecc57f70afc8

doc/make.jl

@@ -41,112 +41,133 @@ cd(joinpath(@__DIR__, "src")) do
  end
 end
 
+# Check if we are building a PDF
+const render_pdf = "pdf" in ARGS
+
 # Generate a suitable markdown file from NEWS.md and put it in src
 str = read(joinpath(@__DIR__, "..", "NEWS.md"), String)
 splitted = split(str, "<!--- generated by NEWS-update.jl: -->")
 @assert length(splitted) == 2
 replaced_links = replace(splitted[1], r"\[\#([0-9]*?)\]" => s"[#\g<1>](https://github.com/JuliaLang/julia/issues/\g<1>)")
 write(joinpath(@__DIR__, "src", "NEWS.md"), replaced_links)
 
+Manual = [
+ "manual/getting-started.md",
+ "manual/variables.md",
+ "manual/integers-and-floating-point-numbers.md",
+ "manual/mathematical-operations.md",
+ "manual/complex-and-rational-numbers.md",
+ "manual/strings.md",
+ "manual/functions.md",
+ "manual/control-flow.md",
+ "manual/variables-and-scoping.md",
+ "manual/types.md",
+ "manual/methods.md",
+ "manual/constructors.md",
+ "manual/conversion-and-promotion.md",
+ "manual/interfaces.md",
+ "manual/modules.md",
+ "manual/documentation.md",
+ "manual/metaprogramming.md",
+ "manual/arrays.md",
+ "manual/missing.md",
+ "manual/networking-and-streams.md",
+ "manual/parallel-computing.md",
+ "manual/asynchronous-programming.md",
+ "manual/multi-threading.md",
+ "manual/distributed-computing.md",
+ "manual/running-external-programs.md",
+ "manual/calling-c-and-fortran-code.md",
+ "manual/handling-operating-system-variation.md",
+ "manual/environment-variables.md",
+ "manual/embedding.md",
+ "manual/code-loading.md",
+ "manual/profile.md",
+ "manual/stacktraces.md",
+ "manual/performance-tips.md",
+ "manual/workflow-tips.md",
+ "manual/style-guide.md",
+ "manual/faq.md",
+ "manual/noteworthy-differences.md",
+ "manual/unicode-input.md",
+]
+
+BaseDocs = [
+ "base/base.md",
+ "base/collections.md",
+ "base/math.md",
+ "base/numbers.md",
+ "base/strings.md",
+ "base/arrays.md",
+ "base/parallel.md",
+ "base/multi-threading.md",
+ "base/constants.md",
+ "base/file.md",
+ "base/io-network.md",
+ "base/punctuation.md",
+ "base/sort.md",
+ "base/iterators.md",
+ "base/c.md",
+ "base/libc.md",
+ "base/stacktraces.md",
+ "base/simd-types.md",
+]
+
+StdlibDocs = [stdlib.targetfile for stdlib in STDLIB_DOCS]
+
+DevDocs = [
+ "devdocs/reflection.md",
+ "Documentation of Julia's Internals" => [
+ "devdocs/init.md",
+ "devdocs/ast.md",
+ "devdocs/types.md",
+ "devdocs/object.md",
+ "devdocs/eval.md",
+ "devdocs/callconv.md",
+ "devdocs/compiler.md",
+ "devdocs/functions.md",
+ "devdocs/cartesian.md",
+ "devdocs/meta.md",
+ "devdocs/subarrays.md",
+ "devdocs/isbitsunionarrays.md",
+ "devdocs/sysimg.md",
+ "devdocs/llvm.md",
+ "devdocs/stdio.md",
+ "devdocs/boundscheck.md",
+ "devdocs/locks.md",
+ "devdocs/offset-arrays.md",
+ "devdocs/require.md",
+ "devdocs/inference.md",
+ "devdocs/ssair.md",
+ "devdocs/gc-sa.md",
+ ],
+ "Developing/debugging Julia's C code" => [
+ "devdocs/backtraces.md",
+ "devdocs/debuggingtips.md",
+ "devdocs/valgrind.md",
+ "devdocs/sanitizers.md",
+ ]
+]
+
+
+if render_pdf
 const PAGES = [
- "Home" => "index.md",
+ "Manual" => ["index.md", Manual...],
+ "Base" => BaseDocs,
+ "Standard Library" => StdlibDocs,
+ "Developer Documentation" => DevDocs,
  hide("NEWS.md"),
- "Manual" => [
- "manual/getting-started.md",
- "manual/variables.md",
- "manual/integers-and-floating-point-numbers.md",
- "manual/mathematical-operations.md",
- "manual/complex-and-rational-numbers.md",
- "manual/strings.md",
- "manual/functions.md",
- "manual/control-flow.md",
- "manual/variables-and-scoping.md",
- "manual/types.md",
- "manual/methods.md",
- "manual/constructors.md",
- "manual/conversion-and-promotion.md",
- "manual/interfaces.md",
- "manual/modules.md",
- "manual/documentation.md",
- "manual/metaprogramming.md",
- "manual/arrays.md",
- "manual/missing.md",
- "manual/networking-and-streams.md",
- "manual/parallel-computing.md",
- "manual/asynchronous-programming.md",
- "manual/multi-threading.md",
- "manual/distributed-computing.md",
- "manual/running-external-programs.md",
- "manual/calling-c-and-fortran-code.md",
- "manual/handling-operating-system-variation.md",
- "manual/environment-variables.md",
- "manual/embedding.md",
- "manual/code-loading.md",
- "manual/profile.md",
- "manual/stacktraces.md",
- "manual/performance-tips.md",
- "manual/workflow-tips.md",
- "manual/style-guide.md",
- "manual/faq.md",
- "manual/noteworthy-differences.md",
- "manual/unicode-input.md",
- ],
- "Base" => [
- "base/base.md",
- "base/collections.md",
- "base/math.md",
- "base/numbers.md",
- "base/strings.md",
- "base/arrays.md",
- "base/parallel.md",
- "base/multi-threading.md",
- "base/constants.md",
- "base/file.md",
- "base/io-network.md",
- "base/punctuation.md",
- "base/sort.md",
- "base/iterators.md",
- "base/c.md",
- "base/libc.md",
- "base/stacktraces.md",
- "base/simd-types.md",
- ],
- "Standard Library" =>
- [stdlib.targetfile for stdlib in STDLIB_DOCS],
- "Developer Documentation" => [
- "devdocs/reflection.md",
- "Documentation of Julia's Internals" => [
- "devdocs/init.md",
- "devdocs/ast.md",
- "devdocs/types.md",
- "devdocs/object.md",
- "devdocs/eval.md",
- "devdocs/callconv.md",
- "devdocs/compiler.md",
- "devdocs/functions.md",
- "devdocs/cartesian.md",
- "devdocs/meta.md",
- "devdocs/subarrays.md",
- "devdocs/isbitsunionarrays.md",
- "devdocs/sysimg.md",
- "devdocs/llvm.md",
- "devdocs/stdio.md",
- "devdocs/boundscheck.md",
- "devdocs/locks.md",
- "devdocs/offset-arrays.md",
- "devdocs/require.md",
- "devdocs/inference.md",
- "devdocs/ssair.md",
- "devdocs/gc-sa.md",
- ],
- "Developing/debugging Julia's C code" => [
- "devdocs/backtraces.md",
- "devdocs/debuggingtips.md",
- "devdocs/valgrind.md",
- "devdocs/sanitizers.md",
- ]
- ],
 ]
+else
+const PAGES = [
+ "Julia Documentation" => "index.md",
+ hide("NEWS.md"),
+ "Manual" => Manual,
+ "Base" => BaseDocs,
+ "Standard Library" => StdlibDocs,
+ "Developer Documentation" => DevDocs,
+]
+end
 
 for stdlib in STDLIB_DOCS
  @eval using $(stdlib.stdlib)
@@ -160,7 +181,6 @@ DocMeta.setdocmeta!(UUIDs, :DocTestSetup, :(using UUIDs, Random), recursive=true
 DocMeta.setdocmeta!(Pkg, :DocTestSetup, :(using Pkg, Pkg.Artifacts), recursive=true, warn=false)
 DocMeta.setdocmeta!(Pkg.BinaryPlatforms, :DocTestSetup, :(using Pkg, Pkg.BinaryPlatforms), recursive=true, warn=false)
 
-const render_pdf = "pdf" in ARGS
 let r = r"buildroot=(.+)", i = findfirst(x -> occursin(r, x), ARGS)
  global const buildroot = i === nothing ? (@__DIR__) : first(match(r, ARGS[i]).captures)
 end

stdlib/LinearAlgebra/src/adjtrans.jl

@@ -208,6 +208,9 @@ Base.strides(A::Transpose{<:Any, <:StridedMatrix}) = reverse(strides(A.parent))
 Base.unsafe_convert(::Type{Ptr{T}}, A::Adjoint{<:Real, <:StridedVecOrMat}) where {T} = Base.unsafe_convert(Ptr{T}, A.parent)
 Base.unsafe_convert(::Type{Ptr{T}}, A::Transpose{<:Any, <:StridedVecOrMat}) where {T} = Base.unsafe_convert(Ptr{T}, A.parent)
 
+Base.elsize(::Type{<:Adjoint{<:Real, P}}) where {P<:StridedVecOrMat} = Base.elsize(P)
+Base.elsize(::Type{<:Transpose{<:Any, P}}) where {P<:StridedVecOrMat} = Base.elsize(P)
+
 # for vectors, the semantics of the wrapped and unwrapped types differ
 # so attempt to maintain both the parent and wrapper type insofar as possible
 similar(A::AdjOrTransAbsVec) = wrapperop(A)(similar(A.parent))

stdlib/Pkg.version

@@ -1,2 +1,2 @@
 PKG_BRANCH = master
-PKG_SHA1 = e364c897b349d48372df4425cbb6f982a00b214d
+PKG_SHA1 = dd7f762630b88a64a89ceaaadd3914bfcfb768dc

stdlib/REPL/src/docview.jl

@@ -108,6 +108,8 @@ function Markdown.term(io::IO, msg::Message, columns)
  printstyled(io, msg.msg; msg.fmt...)
 end
 
+trimdocs(doc, brief::Bool) = doc
+
 function trimdocs(md::Markdown.MD, brief::Bool)
  brief || return md
  md, trimmed = _trimdocs(md, brief)