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

KristofferC · web-flow · commit b574c7dd620d · 2021-01-08T11:53:49.000+01:00
Backports release 1.6-beta1
diff --git a/base/array.jl b/base/array.jl
@@ -624,6 +624,20 @@ function _collect_indices(indsA, A)
     copyto!(B, CartesianIndices(axes(B)), A, CartesianIndices(indsA))
 end
 
+# NOTE: this function is not meant to be called, only inferred, for the
+# purpose of bounding the types of values generated by an iterator.
+function _iterator_upper_bound(itr)
+    x = iterate(itr)
+    while x !== nothing
+        val = getfield(x, 1)
+        if inferencebarrier(nothing)
+            return val
+        end
+        x = iterate(itr, getfield(x, 2))
+    end
+    throw(nothing)
+end
+
 # define this as a macro so that the call to Core.Compiler
 # gets inlined into the caller before recursion detection
 # gets a chance to see it, so that recursive calls to the caller
@@ -635,7 +649,7 @@ if isdefined(Core, :Compiler)
             if $I isa Generator && ($I).f isa Type
                 ($I).f
             else
-                Core.Compiler.return_type(first, Tuple{typeof($I)})
+                Core.Compiler.return_type(_iterator_upper_bound, Tuple{typeof($I)})
             end
         end
     end
diff --git a/base/cmd.jl b/base/cmd.jl
@@ -246,14 +246,19 @@ setenv(cmd::Cmd, env::Pair{<:AbstractString}...; dir="") =
 setenv(cmd::Cmd; dir="") = Cmd(cmd; dir=dir)
 
 """
-    addenv(command::Cmd, env...)
+    addenv(command::Cmd, env...; inherit::Bool = true)
 
 Merge new environment mappings into the given `Cmd` object, returning a new `Cmd` object.
-Duplicate keys are replaced.
+Duplicate keys are replaced.  If `command` does not contain any environment values set already,
+it inherits the current environment at time of `addenv()` call if `inherit` is `true`.
 """
-function addenv(cmd::Cmd, env::Dict)
+function addenv(cmd::Cmd, env::Dict; inherit::Bool = true)
     new_env = Dict{String,String}()
-    if cmd.env !== nothing
+    if cmd.env === nothing
+        if inherit
+            merge!(new_env, ENV)
+        end
+    else
         for (k, v) in split.(cmd.env, "=")
             new_env[string(k)::String] = string(v)::String
         end
@@ -264,12 +269,12 @@ function addenv(cmd::Cmd, env::Dict)
     return setenv(cmd, new_env)
 end
 
-function addenv(cmd::Cmd, pairs::Pair{<:AbstractString}...)
-    return addenv(cmd, Dict(k => v for (k, v) in pairs))
+function addenv(cmd::Cmd, pairs::Pair{<:AbstractString}...; inherit::Bool = true)
+    return addenv(cmd, Dict(k => v for (k, v) in pairs); inherit)
 end
 
-function addenv(cmd::Cmd, env::Vector{<:AbstractString})
-    return addenv(cmd, Dict(k => v for (k, v) in split.(env, "=")))
+function addenv(cmd::Cmd, env::Vector{<:AbstractString}; inherit::Bool = true)
+    return addenv(cmd, Dict(k => v for (k, v) in split.(env, "=")); inherit)
 end
 
 (&)(left::AbstractCmd, right::AbstractCmd) = AndCmds(left, right)
diff --git a/base/compiler/ssair/passes.jl b/base/compiler/ssair/passes.jl
@@ -637,6 +637,9 @@ function getfield_elim_pass!(ir::IRCode)
         isa(field, Union{Int, Symbol}) || continue
 
         struct_typ = unwrap_unionall(widenconst(compact_exprtype(compact, stmt.args[2])))
+        if isa(struct_typ, Union) && struct_typ <: Tuple
+            struct_typ = unswitchtupleunion(struct_typ)
+        end
         isa(struct_typ, DataType) || continue
 
         def, typeconstraint = stmt.args[2], struct_typ
diff --git a/base/compiler/typeutils.jl b/base/compiler/typeutils.jl
@@ -206,3 +206,21 @@ function improvable_via_constant_propagation(@nospecialize(t))
     end
     return false
 end
+
+# convert a Union of Tuple types to a Tuple of Unions
+function unswitchtupleunion(u::Union)
+    ts = uniontypes(u)
+    n = -1
+    for t in ts
+        if t isa DataType && t.name === Tuple.name && !isvarargtype(t.parameters[end])
+            if n == -1
+                n = length(t.parameters)
+            elseif n != length(t.parameters)
+                return u
+            end
+        else
+            return u
+        end
+    end
+    Tuple{Any[ Union{Any[t.parameters[i] for t in ts]...} for i in 1:n ]...}
+end
diff --git a/base/timing.jl b/base/timing.jl
@@ -203,12 +203,9 @@ macro time(ex)
         local stats = gc_num()
         local compile_elapsedtime = cumulative_compile_time_ns_before()
         local elapsedtime = time_ns()
-        local val = try
-            $(esc(ex))
-        finally
-            elapsedtime = time_ns() - elapsedtime
-            compile_elapsedtime = cumulative_compile_time_ns_after() - compile_elapsedtime
-        end
+        local val = $(esc(ex))
+        elapsedtime = time_ns() - 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, true)
         val
@@ -252,12 +249,9 @@ macro timev(ex)
         local stats = gc_num()
         local compile_elapsedtime = cumulative_compile_time_ns_before()
         local elapsedtime = time_ns()
-        local val = try
-            $(esc(ex))
-        finally
-            elapsedtime = time_ns() - elapsedtime
-            compile_elapsedtime = cumulative_compile_time_ns_after() - compile_elapsedtime
-        end
+        local val = $(esc(ex))
+        elapsedtime = time_ns() - elapsedtime
+        compile_elapsedtime = cumulative_compile_time_ns_after() - compile_elapsedtime
         local diff = GC_Diff(gc_num(), stats)
         timev_print(elapsedtime, diff, compile_elapsedtime)
         val
diff --git a/src/llvm-alloc-opt.cpp b/src/llvm-alloc-opt.cpp
@@ -66,7 +66,7 @@ static bool hasObjref(Type *ty)
         return ptrty->getAddressSpace() == AddressSpace::Tracked;
 #if JL_LLVM_VERSION >= 110000
     if (isa<ArrayType>(ty) || isa<VectorType>(ty))
-        return GetElementPtrInst::getTypeAtIndex(ty, (uint64_t)0);
+        return hasObjref(GetElementPtrInst::getTypeAtIndex(ty, (uint64_t)0));
 #else
     if (auto seqty = dyn_cast<SequentialType>(ty))
         return hasObjref(seqty->getElementType());
diff --git a/src/task.c b/src/task.c
@@ -587,6 +587,9 @@ static void JL_NORETURN throw_internal(jl_value_t *exception JL_MAYBE_UNROOTED)
 {
     jl_ptls_t ptls = jl_get_ptls_states();
     ptls->io_wait = 0;
+    // @time needs its compile timer disabled on error,
+    // and cannot use a try-finally as it would break scope for assignments
+    jl_measure_compile_time[ptls->tid] = 0;
     if (ptls->safe_restore)
         jl_longjmp(*ptls->safe_restore, 1);
     // During startup
diff --git a/test/compiler/irpasses.jl b/test/compiler/irpasses.jl
@@ -342,3 +342,20 @@ let code = code_typed(pi_on_argument, Tuple{Any})[1].first.code,
     @test nisa == 1
     @test found_pi
 end
+
+# issue #38936
+# check that getfield elim can handle unions of tuple types
+mutable struct S38936{T} content::T end
+struct PrintAll{T} <: Function
+    parts::T
+end
+function (f::PrintAll)(io::IO)
+    for x in f.parts
+        print(io, x)
+    end
+end
+let f = PrintAll((S38936("<span>"), "data", S38936("</span")))
+    @test !any(code_typed(f, (IOBuffer,))[1][1].code) do stmt
+        stmt isa Expr && stmt.head === :call && stmt.args[1] === GlobalRef(Core, :tuple)
+    end
+end
diff --git a/test/core.jl b/test/core.jl
@@ -5080,6 +5080,19 @@ end
 @test f17255(10000)[1]
 GC.enable(true)
 
+# PR #39133, ensure that @time evaluates in the same scope
+function time_macro_scope()
+    @time time_macro_local_var = 1
+    time_macro_local_var
+end
+@test time_macro_scope() == 1
+
+function timev_macro_scope()
+    @timev timev_macro_local_var = 1
+    timev_macro_local_var
+end
+@time timev_macro_scope() == 1
+
 # issue #18710
 bad_tvars() where {T} = 1
 @test isa(which(bad_tvars, ()), Method)
diff --git a/test/dict.jl b/test/dict.jl
@@ -159,6 +159,9 @@ end
     d = Dict(i==1 ? (1=>2) : (2.0=>3.0) for i=1:2)
     @test isa(d, Dict{Real,Real})
     @test d == Dict{Real,Real}(2.0=>3.0, 1=>2)
+
+    # issue #39117
+    @test Dict(t[1]=>t[2] for t in zip((1,"2"), (2,"2"))) == Dict{Any,Any}(1=>2, "2"=>"2")
 end
 
 @testset "type of Dict constructed from varargs of Pairs" begin
diff --git a/test/file.jl b/test/file.jl
@@ -1543,3 +1543,16 @@ end
         chmod(dir, 0o777; recursive=true)
     end
 end
+
+if Sys.iswindows()
+@testset "mkdir/rm permissions" begin
+    # test delete permission in system folders (i.e. impliclty test chmod permissions)
+    # issue #38433
+    @test withenv("TMP" => "C:\\") do
+        mktempdir() do dir end
+    end === nothing
+    # same as above, but test rm explicitly
+    tmp = mkdir(tempname("C:\\"))
+    @test rm(tmp) === nothing
+end
+end
diff --git a/test/llvmpasses/alloc-opt3.jl b/test/llvmpasses/alloc-opt3.jl
@@ -0,0 +1,23 @@
+# This file is a part of Julia. License is MIT: https://julialang.org/license
+
+# RUN: julia --startup-file=no %s %t -O
+# RUN: cat %t/* | FileCheck %s
+
+include(joinpath("..", "testhelpers", "llvmpasses.jl"))
+
+# JuliaLang/julia#38922
+function haszerolayout(x::NTuple{32, VecElement{UInt8}})
+    rx = Ref(x)
+    GC.@preserve rx begin
+        lower = iszero(unsafe_load(Ptr{UInt128}(pointer_from_objref(rx)), 1))
+        upper = iszero(unsafe_load(Ptr{UInt128}(pointer_from_objref(rx)), 2))
+        lower & upper
+    end
+end
+
+# CHECK-LABEL: @julia_haszerolayout
+# CHECK: top:
+# CHECK-NOT: @jl_gc_pool_alloc
+# CHECK: extractelement
+# CHECK: ret i8
+emit(haszerolayout, NTuple{32,VecElement{UInt8}})
diff --git a/test/spawn.jl b/test/spawn.jl
@@ -711,6 +711,28 @@ end
     @test strip(String(read(cmd))) == "bar bar"
     cmd = addenv(cmd, ["FOO=baz"])
     @test strip(String(read(cmd))) == "baz bar"
+
+    # Test that `addenv()` works properly with `inherit`
+    withenv("FOO" => "foo") do
+        cmd = Cmd(`$shcmd -c "echo \$FOO \$BAR"`)
+        @test strip(String(read(cmd))) == "foo"
+
+        cmd2 = addenv(cmd, "BAR" => "bar"; inherit=false)
+        @test strip(String(read(cmd2))) == "bar"
+
+        cmd2 = addenv(cmd, "BAR" => "bar"; inherit=true)
+        @test strip(String(read(cmd2))) == "foo bar"
+
+        # Changing the environment doesn't effect the command,
+        # because it was baked in at `addenv()` time
+        withenv("FOO" => "baz") do
+            @test strip(String(read(cmd2))) == "foo bar"
+        end
+
+        # Even with inheritance, `addenv()` dominates:
+        cmd2 = addenv(cmd, "FOO" => "foo2", "BAR" => "bar"; inherit=true)
+        @test strip(String(read(cmd2))) == "foo2 bar"
+    end
 end
 
 
