Merge pull request #38795 from JuliaLang/backports-release-1.6

Backports for 1.6-beta

base/Base.jl

@@ -391,6 +391,42 @@ end_base_include = time_ns()
 const _sysimage_modules = PkgId[]
 in_sysimage(pkgid::PkgId) = pkgid in _sysimage_modules
 
+# Precompiles for Revise
+# TODO: move these to contrib/generate_precompile.jl
+# The problem is they don't work there
+let m = which(+, (Int, Int))
+ while true # defeat interpreter heuristic to force compilation
+ delete!(push!(Set{Method}(), m), m)
+ copy(Core.Compiler.retrieve_code_info(Core.Compiler.specialize_method(m, [Int, Int], Core.svec())))
+
+ empty!(Set())
+ push!(push!(Set{Union{GlobalRef,Symbol}}(), :two), GlobalRef(Base, :two))
+ (setindex!(Dict{String,Base.PkgId}(), Base.PkgId(Base), "file.jl"))["file.jl"]
+ (setindex!(Dict{Symbol,Vector{Int}}(), [1], :two))[:two]
+ (setindex!(Dict{Base.PkgId,String}(), "file.jl", Base.PkgId(Base)))[Base.PkgId(Base)]
+ (setindex!(Dict{Union{GlobalRef,Symbol}, Vector{Int}}(), [1], :two))[:two]
+ (setindex!(IdDict{Type, Union{Missing, Vector{Tuple{LineNumberNode, Expr}}}}(), missing, Int))[Int]
+ Dict{Symbol, Union{Nothing, Bool, Symbol}}(:one => false)[:one]
+ Dict(Base => [:(1+1)])[Base]
+ Dict(:one => [1])[:one]
+ Dict("abc" => Set())["abc"]
+ pushfirst!([], sum)
+ get(Base.pkgorigins, Base.PkgId(Base), nothing)
+ sort!([1,2,3])
+ unique!([1,2,3])
+ cumsum([1,2,3])
+ append!(Int[], BitSet())
+ isempty(BitSet())
+ delete!(BitSet([1,2]), 3)
+ deleteat!(Int32[1,2,3], [1,3])
+ deleteat!(Any[1,2,3], [1,3])
+ Core.svec(1, 2) == Core.svec(3, 4)
+ any(t->t[1].line > 1, [(LineNumberNode(2,:none), :(1+1))])
+
+ break # end defeat interpreter heuristic
+ end
+end
+
 if is_primary_base_module
 function __init__()
  # try to ensuremake sure OpenBLAS does not set CPU affinity (#1070, #9639)

base/compiler/utilities.jl

@@ -72,17 +72,21 @@ function quoted(@nospecialize(x))
  return is_self_quoting(x) ? x : QuoteNode(x)
 end
 
-function count_const_size(@nospecialize(x))
+function count_const_size(@nospecialize(x), count_self::Bool = true)
  (x isa Type || x isa Symbol) && return 0
  ismutable(x) && return MAX_INLINE_CONST_SIZE + 1
  isbits(x) && return Core.sizeof(x)
  dt = typeof(x)
- sz = sizeof(dt)
+ sz = count_self ? sizeof(dt) : 0
  sz > MAX_INLINE_CONST_SIZE && return MAX_INLINE_CONST_SIZE + 1
  dtfd = DataTypeFieldDesc(dt)
  for i = 1:nfields(x)
- dtfd[i].isptr || continue
- sz += count_const_size(getfield(x, i))
+ isdefined(x, i) || continue
+ f = getfield(x, i)
+ if !dtfd[i].isptr && datatype_pointerfree(typeof(f))
+ continue
+ end
+ sz += count_const_size(f, dtfd[i].isptr)
  sz > MAX_INLINE_CONST_SIZE && return MAX_INLINE_CONST_SIZE + 1
  end
  return sz

base/docs/Docs.jl

@@ -73,7 +73,12 @@ const modules = Module[]
 const META = gensym(:meta)
 const METAType = IdDict{Any,Any}
 
-meta(m::Module) = isdefined(m, META) ? getfield(m, META)::METAType : METAType()
+function meta(m::Module)
+ if !isdefined(m, META)
+ initmeta(m)
+ end
+ return getfield(m, META)::METAType
+end
 
 function initmeta(m::Module)
  if !isdefined(m, META)

base/reflection.jl

@@ -143,15 +143,19 @@ julia> fieldname(Rational, 2)
 ```
 """
 function fieldname(t::DataType, i::Integer)
- if t.abstract
- throw(ArgumentError("type does not have definite field names"))
+ throw_not_def_field() = throw(ArgumentError("type does not have definite field names"))
+ function throw_field_access(t, i, n_fields)
+ field_label = n_fields == 1 ? "field" : "fields"
+ throw(ArgumentError("Cannot access field $i since type $t only has $n_fields $field_label."))
  end
+ throw_need_pos_int(i) = throw(ArgumentError("Field numbers must be positive integers. $i is invalid."))
+
+ t.abstract && throw_not_def_field()
  names = _fieldnames(t)
  n_fields = length(names)::Int
- field_label = n_fields == 1 ? "field" : "fields"
- i > n_fields && throw(ArgumentError("Cannot access field $i since type $t only has $n_fields $field_label."))
- i < 1 && throw(ArgumentError("Field numbers must be positive integers. $i is invalid."))
- return names[i]::Symbol
+ i > n_fields && throw_field_access(t, i, n_fields)
+ i < 1 && throw_need_pos_int(i)
+ return @inbounds names[i]::Symbol
 end
 
 fieldname(t::UnionAll, i::Integer) = fieldname(unwrap_unionall(t), i)

base/timing.jl

@@ -56,7 +56,8 @@ function gc_alloc_count(diff::GC_Diff)
 end
 
 # cumulative total time spent on compilation
-cumulative_compile_time_ns() = ccall(:jl_cumulative_compile_time_ns, UInt64, ())
+cumulative_compile_time_ns_before() = ccall(:jl_cumulative_compile_time_ns_before, UInt64, ())
+cumulative_compile_time_ns_after() = ccall(:jl_cumulative_compile_time_ns_after, UInt64, ())
 
 # total time spend in garbage collection, in nanoseconds
 gc_time_ns() = ccall(:jl_gc_total_hrtime, UInt64, ())
@@ -197,11 +198,11 @@ macro time(ex)
  quote
  while false; end # compiler heuristic: compile this block (alter this if the heuristic changes)
  local stats = gc_num()
- local compile_elapsedtime = cumulative_compile_time_ns()
+ local compile_elapsedtime = cumulative_compile_time_ns_before()
  local elapsedtime = time_ns()
  local val = $(esc(ex))
  elapsedtime = time_ns() - elapsedtime
- compile_elapsedtime = cumulative_compile_time_ns() - compile_elapsedtime
+ compile_elapsedtime = cumulative_compile_time_ns_after() - compile_elapsedtime
  local diff = GC_Diff(gc_num(), stats)
  time_print(elapsedtime, diff.allocd, diff.total_time,
  gc_alloc_count(diff), compile_elapsedtime)
@@ -245,11 +246,11 @@ macro timev(ex)
  quote
  while false; end # compiler heuristic: compile this block (alter this if the heuristic changes)
  local stats = gc_num()
- local compile_elapsedtime = cumulative_compile_time_ns()
+ local compile_elapsedtime = cumulative_compile_time_ns_before()
  local elapsedtime = time_ns()
  local val = $(esc(ex))
  elapsedtime = time_ns() - elapsedtime
- compile_elapsedtime = cumulative_compile_time_ns() - compile_elapsedtime
+ compile_elapsedtime = cumulative_compile_time_ns_after() - compile_elapsedtime
  timev_print(elapsedtime, GC_Diff(gc_num(), stats), compile_elapsedtime)
  val
  end

base/toml_parser.jl

@@ -925,21 +925,21 @@ ok_end_value(c::Char) = iswhitespace(c) || c == '#' || c == EOF_CHAR || c == ']'
 accept_two(l, f::F) where {F} = accept_n(l, 2, f) || return(ParserError(ErrParsingDateTime))
 function parse_datetime(l)
  # Year has already been eaten when we reach here
- year = parse_int(l, false)::Int64
+ year = @try parse_int(l, false)
  year in 0:9999 || return ParserError(ErrParsingDateTime)
 
  # Month
  accept(l, '-') || return ParserError(ErrParsingDateTime)
  set_marker!(l)
  @try accept_two(l, isdigit)
- month = parse_int(l, false)
+ month = @try parse_int(l, false)
  month in 1:12 || return ParserError(ErrParsingDateTime)
  accept(l, '-') || return ParserError(ErrParsingDateTime)
 
  # Day
  set_marker!(l)
  @try accept_two(l, isdigit)
- day = parse_int(l, false)
+ day = @try parse_int(l, false)
  # Verify the real range in the constructor below
  day in 1:31 || return ParserError(ErrParsingDateTime)
 
@@ -976,9 +976,10 @@ function parse_datetime(l)
 end
 
 function try_return_datetime(p, year, month, day, h, m, s, ms)
- if p.Dates !== nothing
+ Dates = p.Dates
+ if Dates !== nothing
  try
- return p.Dates.DateTime(year, month, day, h, m, s, ms)
+ return Dates.DateTime(year, month, day, h, m, s, ms)
  catch
  return ParserError(ErrParsingDateTime)
  end
@@ -988,9 +989,10 @@ function try_return_datetime(p, year, month, day, h, m, s, ms)
 end
 
 function try_return_date(p, year, month, day)
- if p.Dates !== nothing
+ Dates = p.Dates
+ if Dates !== nothing
  try
- return p.Dates.Date(year, month, day)
+ return Dates.Date(year, month, day)
  catch
  return ParserError(ErrParsingDateTime)
  end
@@ -1000,7 +1002,7 @@ function try_return_date(p, year, month, day)
 end
 
 function parse_local_time(l::Parser)
- h = parse_int(l, false)
+ h = @try parse_int(l, false)
  h in 0:23 || return ParserError(ErrParsingDateTime)
  _, m, s, ms = @try _parse_local_time(l, true)
  # TODO: Could potentially parse greater accuracy for the
@@ -1009,9 +1011,10 @@ function parse_local_time(l::Parser)
 end
 
 function try_return_time(p, h, m, s, ms)
- if p.Dates !== nothing
+ Dates = p.Dates
+ if Dates !== nothing
  try
- return p.Dates.Time(h, m, s, ms)
+ return Dates.Time(h, m, s, ms)
  catch
  return ParserError(ErrParsingDateTime)
  end
@@ -1133,7 +1136,7 @@ function parse_string_continue(l::Parser, multiline::Bool, quoted::Bool)::Err{St
  if !accept_n(l, n, isvalid_hex)
  return ParserError(ErrInvalidUnicodeScalar)
  end
- codepoint = parse_int(l, false, 16)
+ codepoint = parse_int(l, false, 16)::Int64
  #=
  Unicode Scalar Value
  ---------------------

base/tuple.jl

@@ -210,9 +210,9 @@ end
 
 # 1 argument function
 map(f, t::Tuple{}) = ()
-map(f, t::Tuple{Any,}) = (f(t[1]),)
-map(f, t::Tuple{Any, Any}) = (f(t[1]), f(t[2]))
-map(f, t::Tuple{Any, Any, Any}) = (f(t[1]), f(t[2]), f(t[3]))
+map(f, t::Tuple{Any,}) = (@_inline_meta; (f(t[1]),))
+map(f, t::Tuple{Any, Any}) = (@_inline_meta; (f(t[1]), f(t[2])))
+map(f, t::Tuple{Any, Any, Any}) = (@_inline_meta; (f(t[1]), f(t[2]), f(t[3])))
 map(f, t::Tuple) = (@_inline_meta; (f(t[1]), map(f,tail(t))...))
 # stop inlining after some number of arguments to avoid code blowup
 const Any16{N} = Tuple{Any,Any,Any,Any,Any,Any,Any,Any,
@@ -229,8 +229,8 @@ function map(f, t::Any16)
 end
 # 2 argument function
 map(f, t::Tuple{}, s::Tuple{}) = ()
-map(f, t::Tuple{Any,}, s::Tuple{Any,}) = (f(t[1],s[1]),)
-map(f, t::Tuple{Any,Any}, s::Tuple{Any,Any}) = (f(t[1],s[1]), f(t[2],s[2]))
+map(f, t::Tuple{Any,}, s::Tuple{Any,}) = (@_inline_meta; (f(t[1],s[1]),))
+map(f, t::Tuple{Any,Any}, s::Tuple{Any,Any}) = (@_inline_meta; (f(t[1],s[1]), f(t[2],s[2])))
 function map(f, t::Tuple, s::Tuple)
  @_inline_meta
  (f(t[1],s[1]), map(f, tail(t), tail(s))...)

base/util.jl

@@ -306,7 +306,13 @@ if Sys.iswindows()
  succeeded = ccall((:CredPackAuthenticationBufferW, "credui.dll"), stdcall, Bool,
  (UInt32, Cwstring, Cwstring, Ptr{UInt8}, Ptr{UInt32}),
  CRED_PACK_GENERIC_CREDENTIALS, default_username, "", credbuf, credbufsize)
- @assert succeeded
+ if !succeeded
+ credbuf = resize!(credbuf, credbufsize[])
+ succeeded = ccall((:CredPackAuthenticationBufferW, "credui.dll"), stdcall, Bool,
+ (UInt32, Cwstring, Cwstring, Ptr{UInt8}, Ptr{UInt32}),
+ CRED_PACK_GENERIC_CREDENTIALS, default_username, "", credbuf, credbufsize)
+ @assert succeeded
+ end
 
  # Step 2: Create the actual dialog
  # 2.1: Set up the window

cli/Makefile

@@ -114,7 +114,7 @@ endef
 endif
 
 $(build_shlibdir)/libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT): $(LIB_OBJS) | $(build_shlibdir) $(build_libdir)
- @$(call PRINT_LINK, $(CC) $(call IMPLIB_FLAGS,$@) $(LOADER_CFLAGS) -DLIBRARY_EXPORTS -shared $(SHIPFLAGS) $(LIB_OBJS) -o $@ $(LOADER_LDFLAGS) $(RPATH_LIB)) $(call SONAME_FLAGS,libjulia.$(JL_MAJOR_SHLIB_EXT))
+ @$(call PRINT_LINK, $(CC) $(call IMPLIB_FLAGS,$@) $(LOADER_CFLAGS) -DLIBRARY_EXPORTS -shared $(SHIPFLAGS) $(LIB_OBJS) -o $@ $(JLIBLDFLAGS) $(LOADER_LDFLAGS) $(RPATH_LIB)) $(call SONAME_FLAGS,libjulia.$(JL_MAJOR_SHLIB_EXT))
  $(INSTALL_NAME_CMD)libjulia.$(SHLIB_EXT) $@
 ifneq ($(OS), WINNT)
  @ln -sf $(notdir $@) $(build_shlibdir)/libjulia.$(JL_MAJOR_SHLIB_EXT)
@@ -124,7 +124,7 @@ else
 endif
 
 $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(LIB_DOBJS) | $(build_shlibdir) $(build_libdir)
- @$(call PRINT_LINK, $(CC) $(call IMPLIB_FLAGS,$@) $(LOADER_CFLAGS) -DLIBRARY_EXPORTS -shared $(DEBUGFLAGS) $(LIB_DOBJS) -o $@ $(LOADER_LDFLAGS) $(RPATH_LIB)) $(call SONAME_FLAGS,$(notdir $@))
+ @$(call PRINT_LINK, $(CC) $(call IMPLIB_FLAGS,$@) $(LOADER_CFLAGS) -DLIBRARY_EXPORTS -shared $(DEBUGFLAGS) $(LIB_DOBJS) -o $@ $(JLIBLDFLAGS) $(LOADER_LDFLAGS) $(RPATH_LIB)) $(call SONAME_FLAGS,$(notdir $@))
  $(INSTALL_NAME_CMD)libjulia-debug.$(SHLIB_EXT) $@
 ifneq ($(OS), WINNT)
  @ln -sf $(notdir $@) $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_SHLIB_EXT)

cli/trampolines/trampolines_x86_64.S

@@ -40,8 +40,8 @@ SEH_START1(name); \
 name##:; \
 SEH_START2(); \
  CET_START(); \
- mov CNAME(name##_addr)(%rip),%rax; \
- jmpq *%rax; \
+ mov CNAME(name##_addr)(%rip),%r11; \
+ jmpq *%r11; \
  ud2; \
 SEH_END(); \
 .cfi_endproc; \

contrib/generate_precompile.jl

@@ -15,12 +15,11 @@ UP_ARROW = "\e[A"
 DOWN_ARROW = "\e[B"
 
 hardcoded_precompile_statements = """
-# used by JuliaInterpreter.jl and Revise.jl
+# used by Revise.jl
 @assert precompile(Tuple{typeof(Base.parse_cache_header), String})
-@assert precompile(Tuple{typeof(pushfirst!), Vector{Any}, Function})
-@assert precompile(Tuple{typeof(push!), Set{Module}, Module})
-@assert precompile(Tuple{typeof(push!), Set{Method}, Method})
-@assert precompile(Tuple{typeof(empty!), Set{Any}})
+@assert precompile(Base.read_dependency_src, (String, String))
+@assert precompile(Base.CoreLogging.current_logger_for_env, (Base.CoreLogging.LogLevel, String, Module))
+
 # used by Requires.jl
 @assert precompile(Tuple{typeof(get!), Type{Vector{Function}}, Dict{Base.PkgId,Vector{Function}}, Base.PkgId})
 @assert precompile(Tuple{typeof(haskey), Dict{Base.PkgId,Vector{Function}}, Base.PkgId})
@@ -56,10 +55,38 @@ cd("complet_path\t\t$CTRL_C
 """
 
 precompile_script = """
-# Used by Revise
-(setindex!(Dict{String,Base.PkgId}(), Base.PkgId(Base), "file.jl"))["file.jl"]
-(setindex!(Dict{Base.PkgId,String}(), "file.jl", Base.PkgId(Base)))[Base.PkgId(Base)]
-get(Base.pkgorigins, Base.PkgId(Base), nothing)
+# NOTE: these were moved to the end of Base.jl. TODO: move back here.
+# # Used by Revise & its dependencies
+# while true # force inference
+# delete!(push!(Set{Module}(), Base), Main)
+# m = first(methods(+))
+# delete!(push!(Set{Method}(), m), m)
+# empty!(Set())
+# push!(push!(Set{Union{GlobalRef,Symbol}}(), :two), GlobalRef(Base, :two))
+# (setindex!(Dict{String,Base.PkgId}(), Base.PkgId(Base), "file.jl"))["file.jl"]
+# (setindex!(Dict{Symbol,Vector{Int}}(), [1], :two))[:two]
+# (setindex!(Dict{Base.PkgId,String}(), "file.jl", Base.PkgId(Base)))[Base.PkgId(Base)]
+# (setindex!(Dict{Union{GlobalRef,Symbol}, Vector{Int}}(), [1], :two))[:two]
+# (setindex!(IdDict{Type, Union{Missing, Vector{Tuple{LineNumberNode, Expr}}}}(), missing, Int))[Int]
+# Dict{Symbol, Union{Nothing, Bool, Symbol}}(:one => false)[:one]
+# Dict(Base => [:(1+1)])[Base]
+# Dict(:one => [1])[:one]
+# Dict("abc" => Set())["abc"]
+# pushfirst!([], sum)
+# get(Base.pkgorigins, Base.PkgId(Base), nothing)
+# sort!([1,2,3])
+# unique!([1,2,3])
+# cumsum([1,2,3])
+# append!(Int[], BitSet())
+# isempty(BitSet())
+# delete!(BitSet([1,2]), 3)
+# deleteat!(Int32[1,2,3], [1,3])
+# deleteat!(Any[1,2,3], [1,3])
+# Core.svec(1, 2) == Core.svec(3, 4)
+# # copy(Core.Compiler.retrieve_code_info(Core.Compiler.specialize_method(which(+, (Int, Int)), [Int, Int], Core.svec())))
+# any(t->t[1].line > 1, [(LineNumberNode(2,:none),:(1+1))])
+# break # end force inference
+# end
 """
 
 julia_exepath() = joinpath(Sys.BINDIR::String, Base.julia_exename())
@@ -72,21 +99,26 @@ if have_repl
  """
 end
 
-# This is disabled because it doesn't give much benefit
-# and the code in Distributed is poorly typed causing many invalidations
-#=
 Distributed = get(Base.loaded_modules,
  Base.PkgId(Base.UUID("8ba89e20-285c-5b6f-9357-94700520ee1b"), "Distributed"),
  nothing)
 if Distributed !== nothing
+ hardcoded_precompile_statements *= """
+ @assert precompile(Tuple{typeof(Distributed.remotecall),Function,Int,Module,Vararg{Any, 100}})
+ @assert precompile(Tuple{typeof(Distributed.procs)})
+ @assert precompile(Tuple{typeof(Distributed.finalize_ref), Distributed.Future})
+ """
+# This is disabled because it doesn't give much benefit
+# and the code in Distributed is poorly typed causing many invalidations
+#=
  precompile_script *= """
  using Distributed
  addprocs(2)
  pmap(x->iseven(x) ? 1 : 0, 1:4)
  @distributed (+) for i = 1:100 Int(rand(Bool)) end
  """
-end
 =#
+end
 
 
 Artifacts = get(Base.loaded_modules,
@@ -121,6 +153,7 @@ if FileWatching !== nothing
  hardcoded_precompile_statements *= """
  @assert precompile(Tuple{typeof(FileWatching.watch_file), String, Float64})
  @assert precompile(Tuple{typeof(FileWatching.watch_file), String, Int})
+ @assert precompile(Tuple{typeof(FileWatching._uv_hook_close), FileWatching.FileMonitor})
  """
 end