Backports 1.5.4

Make.inc

@@ -1107,6 +1107,18 @@ $(foreach proj,$(BB_PROJECTS),$(eval $(call SET_BB_DEFAULT,$(proj))))
 # Use the Assertions build
 BINARYBUILDER_LLVM_ASSERTS ?= 0
 
+# XXX: Ensure assertion/debug flags are properly propagated in the absence of
+# assert-enabled LLVM builds from BinaryBuilder. Note that this does not apply
+# to Julia master, which has corresponding assert-enabled LLVM builds.
+ifeq ($(USE_BINARYBUILDER_LLVM),1)
+ifeq ($(BINARYBUILDER_LLVM_ASSERTS),0)
+override LLVM_ASSERTIONS := 0
+endif
+endif
+
+ifeq ($(LLVM_ASSERTIONS),0)
+CXX_DISABLE_ASSERTION += -DNDEBUG
+endif
 
 
 # OS specific stuff

base/boot.jl

@@ -8,7 +8,7 @@
 #abstract type Vararg{T} end
 
 #mutable struct Symbol
-#    #opaque
+## opaque
 #end
 
 #mutable struct TypeName
@@ -53,28 +53,43 @@
 #abstract type DenseArray{T,N} <: AbstractArray{T,N} end
 
 #mutable struct Array{T,N} <: DenseArray{T,N}
+## opaque
 #end
 
 #mutable struct Module
-#    name::Symbol
+## opaque
+#end
+
+#mutable struct SimpleVector
+## opaque
+#end
+
+#mutable struct String
+## opaque
 #end
 
 #mutable struct Method
+#...
 #end
 
 #mutable struct MethodInstance
+#...
 #end
 
 #mutable struct CodeInstance
+#...
 #end
 
 #mutable struct CodeInfo
+#...
 #end
 
 #mutable struct TypeMapLevel
+#...
 #end
 
 #mutable struct TypeMapEntry
+#...
 #end
 
 #abstract type Ref{T} end
@@ -93,7 +108,8 @@
 #end
 
 #struct LineInfoNode
-#    method::Any
+#    module::Module
+#    method::Symbol
 #    file::Symbol
 #    line::Int
 #    inlined_at::Int
@@ -379,8 +395,8 @@ eval(Core, :(PiNode(val, typ) = $(Expr(:new, :PiNode, :val, :typ))))
 eval(Core, :(PhiCNode(values::Array{Any, 1}) = $(Expr(:new, :PhiCNode, :values))))
 eval(Core, :(UpsilonNode(val) = $(Expr(:new, :UpsilonNode, :val))))
 eval(Core, :(UpsilonNode() = $(Expr(:new, :UpsilonNode))))
-eval(Core, :(LineInfoNode(@nospecialize(method), file::Symbol, line::Int, inlined_at::Int) =
-             $(Expr(:new, :LineInfoNode, :method, :file, :line, :inlined_at))))
+eval(Core, :(LineInfoNode(mod::Module, @nospecialize(method), file::Symbol, line::Int, inlined_at::Int) =
+             $(Expr(:new, :LineInfoNode, :mod, :method, :file, :line, :inlined_at))))
 
 Module(name::Symbol=:anonymous, std_imports::Bool=true) = ccall(:jl_f_new_module, Ref{Module}, (Any, Bool), name, std_imports)
 

base/compiler/ssair/inlining.jl

@@ -30,7 +30,6 @@ struct InliningTodo
     sparams::Vector{Any} # The static parameters we computed for this call site
     metharg # ::Type
     # The LineTable and IR of the inlinee
-    linetable::Vector{LineInfoNode}
     ir::IRCode
     # If the function being inlined is a single basic block we can use a
     # simpler inlining algorithm. This flag determines whether that's allowed
@@ -307,8 +306,8 @@ function ir_inline_item!(compact::IncrementalCompact, idx::Int, argexprs::Vector
     linetable_offset = length(linetable)
     # Append the linetable of the inlined function to our line table
     inlined_at = Int(compact.result_lines[idx])
-    for entry in item.linetable
-        push!(linetable, LineInfoNode(entry.method, entry.file, entry.line,
+    for entry in item.ir.linetable
+        push!(linetable, LineInfoNode(entry.module, entry.method, entry.file, entry.line,
             (entry.inlined_at > 0 ? entry.inlined_at + linetable_offset : inlined_at)))
     end
     if item.isva
@@ -734,23 +733,23 @@ function analyze_method!(idx::Int, sig::Signature, @nospecialize(metharg), meths
 
     @timeit "inline IR inflation" begin
         ir2 = inflate_ir(src, mi)
-        # prepare inlining linetable with method instance information
-        inline_linetable = Vector{LineInfoNode}(undef, length(src.linetable))
-        for i = 1:length(src.linetable)
-            entry = src.linetable[i]
-            if entry.inlined_at === 0 && entry.method === method
-                entry = LineInfoNode(mi, entry.file, entry.line, entry.inlined_at)
-            end
-            inline_linetable[i] = entry
-        end
+        # #optional: prepare inlining linetable with method instance information
+        # inline_linetable = ir2.linetable
+        # for i = 1:length(inline_linetable)
+        #     entry = inline_linetable[i]
+        #     if entry.inlined_at === 0 && entry.method === method
+        #         entry = LineInfoNode(entry.module, mi, entry.file, entry.line, entry.inlined_at)
+        #         inline_linetable[i] = entry
+        #     end
+        # end
     end
     #verify_ir(ir2)
 
     return InliningTodo(idx,
         na > 0 && method.isva,
         isinvoke, na,
         method, Any[methsp...], metharg,
-        inline_linetable, ir2, linear_inline_eligible(ir2))
+        ir2, linear_inline_eligible(ir2))
 end
 
 # Neither the product iterator not CartesianIndices are available

base/compiler/tfuncs.jl

@@ -925,11 +925,11 @@ function fieldtype_tfunc(@nospecialize(s0), @nospecialize(name))
     if s0 === Any || s0 === Type || DataType ⊑ s0 || UnionAll ⊑ s0
         return Type
     end
-    # fieldtype only accepts Types, errors on `Module`
-    if isa(s0, Const) && (!(isa(s0.val, DataType) || isa(s0.val, UnionAll) || isa(s0.val, Union)) || s0.val === Module)
+    # fieldtype only accepts Types
+    if isa(s0, Const) && !(isa(s0.val, DataType) || isa(s0.val, UnionAll) || isa(s0.val, Union))
         return Bottom
     end
-    if s0 == Type{Module} || s0 == Type{Union{}} || isa(s0, Conditional)
+    if (s0 isa Type && s0 == Type{Union{}}) || isa(s0, Conditional)
         return Bottom
     end
 

base/compiler/typeinfer.jl

@@ -536,7 +536,7 @@ function typeinf_ext(mi::MethodInstance, params::Params)
                 tree.slotflags = fill(0x00, nargs)
                 tree.ssavaluetypes = 1
                 tree.codelocs = Int32[1]
-                tree.linetable = [LineInfoNode(method, method.file, Int(method.line), 0)]
+                tree.linetable = [LineInfoNode(method.module, method.name, method.file, Int(method.line), 0)]
                 tree.inferred = true
                 tree.ssaflags = UInt8[0]
                 tree.pure = true

base/gcutils.jl

@@ -99,7 +99,20 @@ the current Task. Finalizers will only run when the counter is at zero. (Set
 `true` for enabling, `false` for disabling). They may still run concurrently on
 another Task or thread.
 """
-enable_finalizers(on::Bool) = ccall(:jl_gc_enable_finalizers, Cvoid, (Ptr{Cvoid}, Int32,), C_NULL, on)
+enable_finalizers(on::Bool) = on ? enable_finalizers() : disable_finalizers()
+
+function enable_finalizers()
+    Base.@_inline_meta
+    ccall(:jl_gc_enable_finalizers_internal, Cvoid, ())
+    if unsafe_load(cglobal(:jl_gc_have_pending_finalizers, Cint)) != 0
+        ccall(:jl_gc_run_pending_finalizers, Cvoid, (Ptr{Cvoid},), C_NULL)
+    end
+end
+
+function disable_finalizers()
+    Base.@_inline_meta
+    ccall(:jl_gc_disable_finalizers_internal, Cvoid, ())
+end
 
 """
     GC.@preserve x1 x2 ... xn expr

base/lock.jl

@@ -59,7 +59,7 @@ function trylock(rl::ReentrantLock)
     if rl.reentrancy_cnt == 0
         rl.locked_by = t
         rl.reentrancy_cnt = 1
-        GC.enable_finalizers(false)
+        GC.disable_finalizers()
         got = true
     elseif t === notnothing(rl.locked_by)
         rl.reentrancy_cnt += 1
@@ -87,7 +87,7 @@ function lock(rl::ReentrantLock)
         if rl.reentrancy_cnt == 0
             rl.locked_by = t
             rl.reentrancy_cnt = 1
-            GC.enable_finalizers(false)
+            GC.disable_finalizers()
             break
         elseif t === notnothing(rl.locked_by)
             rl.reentrancy_cnt += 1
@@ -128,7 +128,7 @@ function unlock(rl::ReentrantLock)
                 rethrow()
             end
         end
-        GC.enable_finalizers(true)
+        GC.enable_finalizers()
     end
     unlock(rl.cond_wait)
     return
@@ -150,7 +150,7 @@ function unlockall(rl::ReentrantLock)
             rethrow()
         end
     end
-    GC.enable_finalizers(true)
+    GC.enable_finalizers()
     unlock(rl.cond_wait)
     return n
 end

base/locks-mt.jl

@@ -61,12 +61,12 @@ Base.assert_havelock(l::SpinLock) = islocked(l) ? nothing : Base.concurrency_vio
 function lock(l::SpinLock)
     while true
         if _get(l) == 0
-            GC.enable_finalizers(false)
+            GC.disable_finalizers()
             p = _xchg!(l, 1)
             if p == 0
                 return
             end
-            GC.enable_finalizers(true)
+            GC.enable_finalizers()
         end
         ccall(:jl_cpu_pause, Cvoid, ())
         # Temporary solution before we have gc transition support in codegen.
@@ -76,20 +76,20 @@ end
 
 function trylock(l::SpinLock)
     if _get(l) == 0
-        GC.enable_finalizers(false)
+        GC.disable_finalizers()
         p = _xchg!(l, 1)
         if p == 0
             return true
         end
-        GC.enable_finalizers(true)
+        GC.enable_finalizers()
     end
     return false
 end
 
 function unlock(l::SpinLock)
     _get(l) == 0 && error("unlock count must match lock count")
     _set!(l, 0)
-    GC.enable_finalizers(true)
+    GC.enable_finalizers()
     ccall(:jl_cpu_wake, Cvoid, ())
     return
 end

deps/Versions.make

@@ -30,7 +30,7 @@ CURL_BB_REL = 1
 LIBGIT2_VER = 0.28.2
 LIBGIT2_BB_REL = 1
 LIBUV_VER = 1.29.1
-LIBUV_BB_REL = 9
+LIBUV_BB_REL = 12
 OBJCONV_VER = 2.49.0
 OBJCONV_BB_REL = 0
 ZLIB_VER = 1.2.11

deps/checksums/LibUV.v2.0.0-12.aarch64-linux-gnu.tar.gz/md5

@@ -0,0 +1 @@
+a5532dcc43089e5c3590903c647dd532

deps/checksums/LibUV.v2.0.0-12.aarch64-linux-gnu.tar.gz/sha512

@@ -0,0 +1 @@
+36bb45035c0a52a7c826b2b6574cd220c91d46f2a71b4b023514a0f6ad9132c072bdb09e83127c36c96ad03eff63d04d231c6aef716eeb51f13d2eb3d5625e54

deps/checksums/LibUV.v2.0.0-12.aarch64-linux-musl.tar.gz/md5

@@ -0,0 +1 @@
+3ebd2aaf5c2deedf89cb04f72e88f4e3

deps/checksums/LibUV.v2.0.0-12.aarch64-linux-musl.tar.gz/sha512

@@ -0,0 +1 @@
+3198642bee9b06b48c99102f4f4a24d7d8bfc7691d890a3596ecb433ea75c1b0d4d9ff55161735bbfae071f2e570ef16f6b14ba350a822bd451324069eee19aa

deps/checksums/LibUV.v2.0.0-12.armv7l-linux-gnueabihf.tar.gz/md5

@@ -0,0 +1 @@
+2e5e802747e9101c4c70bd88d98f0aa7

deps/checksums/LibUV.v2.0.0-12.armv7l-linux-gnueabihf.tar.gz/sha512

@@ -0,0 +1 @@
+a21fb98e33cd901ec1bfc79163687f6cb6dac02406fb3ebd33c6d8b63309b66cbe850c9da608bbc1a61a967a4309dafc308431d40c6ba8beab837e345f526f5e

deps/checksums/LibUV.v2.0.0-12.armv7l-linux-musleabihf.tar.gz/md5

@@ -0,0 +1 @@
+0661f12762e2f2bbc90bce17d90fdbcf

deps/checksums/LibUV.v2.0.0-12.armv7l-linux-musleabihf.tar.gz/sha512

@@ -0,0 +1 @@
+a0f40ca80578d3d9e6b94a7f11d292ecd52de90374645c8fa8607e28b9f421709fbbba941ee3e7c9fba88abfe87daf6d265dbe8fcaf0e2faf1b83d8b5ab8a9a7

deps/checksums/LibUV.v2.0.0-12.i686-linux-gnu.tar.gz/md5

@@ -0,0 +1 @@
+5adc7739a9c5d4568870e2852c85485b