Merge remote-tracking branch 'upstream/master' into local-names-linking

Author: xal-0

Compiler/src/abstractlattice.jl

@@ -183,7 +183,7 @@ end
 """
     has_nontrivial_extended_info(𝕃::AbstractLattice, t)::Bool
 
-Determines whether the given lattice element `t` of `𝕃` has non-trivial extended lattice
+Determine whether the given lattice element `t` of `𝕃` has non-trivial extended lattice
 information that would not be available from the type itself.
 """
 @nospecializeinfer has_nontrivial_extended_info(𝕃::AbstractLattice, @nospecialize t) =
@@ -206,7 +206,7 @@ end
 """
     is_const_prop_profitable_arg(𝕃::AbstractLattice, t)::Bool
 
-Determines whether the given lattice element `t` of `𝕃` has new extended lattice information
+Determine whether the given lattice element `t` of `𝕃` has new extended lattice information
 that should be forwarded along with constant propagation.
 """
 @nospecializeinfer is_const_prop_profitable_arg(𝕃::AbstractLattice, @nospecialize t) =

Compiler/src/ssair/EscapeAnalysis.jl

@@ -415,7 +415,7 @@ end
 """
     iridx(x, estate::EscapeState) -> xidx::Union{Int,Nothing}
 
-Tries to convert analyzable IR element `x::Union{Argument,SSAValue}` to
+Try to convert analyzable IR element `x::Union{Argument,SSAValue}` to
 its unique identifier number `xidx` that is valid in the analysis context of `estate`.
 Returns `nothing` if `x` isn't maintained by `estate` and thus unanalyzable (e.g. `x::GlobalRef`).
 

Compiler/src/ssair/domtree.jl

@@ -597,7 +597,7 @@ end
 """
     dominates(domtree::DomTree, bb1::Int, bb2::Int)::Bool
 
-Checks if `bb1` dominates `bb2`.
+Check if `bb1` dominates `bb2`.
 `bb1` and `bb2` are indexes into the `CFG` blocks.
 `bb1` dominates `bb2` if the only way to enter `bb2` is via `bb1`.
 (Other blocks may be in between, e.g `bb1->bbx->bb2`).
@@ -608,7 +608,7 @@ dominates(domtree::DomTree, bb1::BBNumber, bb2::BBNumber) =
 """
     postdominates(domtree::PostDomTree, bb1::Int, bb2::Int)::Bool
 
-Checks if `bb1` post-dominates `bb2`.
+Check if `bb1` post-dominates `bb2`.
 `bb1` and `bb2` are indexes into the `CFG` blocks.
 `bb1` post-dominates `bb2` if every pass from `bb2` to the exit is via `bb1`.
 (Other blocks may be in between, e.g `bb2->bbx->bb1->exit`).

JuliaLowering/src/macro_expansion.jl

@@ -300,7 +300,7 @@ function expand_macro(ctx, ex)
     else
         # Compat: attempt to invoke an old-style macro if there's no applicable
         # method for new-style macro arguments.
-        macro_args = Any[macro_loc, current_layer(ctx).mod]
+        macro_args = Any[macro_loc, ctx.scope_layers[1].mod]
         for arg in raw_args
             # For hygiene in old-style macros, we omit any additional scope
             # layer information from macro arguments. Old-style macros will
@@ -335,7 +335,6 @@ function expand_macro(ctx, ex)
         # method was defined (may be different from `parentmodule(macfunc)`)
         mod_for_ast = lookup_method_instance(macfunc, macro_args,
                                              ctx.macro_world).def.module
-        expanded = fix_toplevel_expansion(ctx, expanded, mod_for_ast, macro_loc)
         new_layer = ScopeLayer(length(ctx.scope_layers)+1, mod_for_ast,
                                current_layer_id(ctx), true)
         push_layer!(ctx, mod_for_ast, true)
@@ -454,6 +453,9 @@ function expand_forms_1(ctx::MacroExpansionContext, ex::SyntaxTree)
         end
     elseif k == K"macrocall"
         expand_macro(ctx, ex)
+    elseif k == K"toplevel" && length(ctx.scope_layer_stack) > 1
+        fix_toplevel_expansion(ctx, ex, current_layer(ctx).mod,
+                               source_location(LineNumberNode, ex))
     elseif k == K"module" || k == K"toplevel" || k == K"inert"
         # Remove scope layer information from any inert syntax which survives
         # macro expansion so that it doesn't contaminate lowering passes which

JuliaLowering/test/macros.jl

@@ -483,4 +483,37 @@ end
     @test_broken JuliaLowering.eval(test_mod, code) == ("outer x", "inner x")
 end
 
+@testset "toplevel macro hygiene" begin
+    @eval test_mod global mod = $test_mod
+    @eval test_mod module MacroMod
+    global mod = MacroMod
+    macro escaped_toplevel()
+        esc(Expr(:toplevel, :(mod)))
+    end
+    macro inner_escaped_toplevel()
+        Expr(:toplevel, esc(:(mod)))
+    end
+    macro unescaped_toplevel()
+        Expr(:toplevel, :(mod))
+    end
+    end
+    @test JuliaLowering.include_string(test_mod, "MacroMod.@escaped_toplevel") === test_mod
+    @test JuliaLowering.include_string(test_mod, "MacroMod.@inner_escaped_toplevel") === test_mod
+    @test JuliaLowering.include_string(test_mod, "MacroMod.@unescaped_toplevel") === test_mod.MacroMod
+end
+
+# JuliaLang/JuliaLowering.jl#120
+#
+# `__module__` should be expanded as the lexical module containing the expanded
+# code, not the module corresponding to the current hygienic scope
+JuliaLowering.include_string(test_mod, raw"""
+module Mod1
+macro indirect_MODULE()
+    return :(@__MODULE__())
+end
+end
+""")
+code = JuliaLowering.include_string(test_mod, """Mod1.@indirect_MODULE()""")
+@test JuliaLowering.eval(test_mod, code) === test_mod # !== test_mod.Mod1
+
 end

Make.inc

@@ -1508,11 +1508,9 @@ RPATH_LIB := $(RPATH_ORIGIN)
 
 # --whole-archive
 ifeq ($(OS), Darwin)
-  WHOLE_ARCHIVE := -Xlinker -all_load
-  NO_WHOLE_ARCHIVE :=
+  whole_archive = -Xlinker -force_load $(1)
 else
-  WHOLE_ARCHIVE := -Wl,--whole-archive
-  NO_WHOLE_ARCHIVE := -Wl,--no-whole-archive
+  whole_archive = -Wl,--whole-archive $(1) -Wl,--no-whole-archive
 endif
 
 # Initialize these once, then add to them in OS-specific blocks
@@ -1558,8 +1556,7 @@ ifeq (,$(findstring aarch64,$(ARCH)))
 OSLIBS += -lgcc_s
 endif
 
-OSLIBS += -Wl,--export-dynamic -Wl,--version-script=$(BUILDROOT)/src/julia.expmap \
-	$(NO_WHOLE_ARCHIVE)
+OSLIBS += -Wl,--export-dynamic -Wl,--version-script=$(BUILDROOT)/src/julia.expmap -Wl,--no-whole-archive
 endif
 
 ifeq ($(OS), OpenBSD)
@@ -1578,16 +1575,14 @@ endif
 ifeq ($(OS), Darwin)
 SHLIB_EXT := dylib
 OSLIBS += -framework CoreFoundation
-WHOLE_ARCHIVE := -Xlinker -all_load
-NO_WHOLE_ARCHIVE :=
 HAVE_SSP := 1
 JLIBLDFLAGS += -Wl,-compatibility_version,$(SOMAJOR) -Wl,-current_version,$(JULIA_MAJOR_VERSION).$(JULIA_MINOR_VERSION).$(JULIA_PATCH_VERSION)
 endif
 
 ifeq ($(OS), WINNT)
 HAVE_SSP := 1
 OSLIBS += -Wl,--export-all-symbols -Wl,--version-script=$(BUILDROOT)/src/julia.expmap \
-	$(NO_WHOLE_ARCHIVE) -lpsapi -lkernel32 -lws2_32 -liphlpapi -lwinmm -ldbghelp -luserenv -lsecur32 -latomic -lole32
+	-Wl,--no-whole-archive -lpsapi -lkernel32 -lws2_32 -liphlpapi -lwinmm -ldbghelp -luserenv -lsecur32 -latomic -lole32
 # N.B.: Unlike in the sysimage, we cannot -Wl,--disable-auto-import -Wl,--disable-runtime-pseudo-reloc here, because libstdc++/LLVM are not fully correct under
 # enforced visibility at this point.
 JLDFLAGS += -Wl,--stack,8388608

base/abstractset.jl

@@ -401,7 +401,7 @@ function ⊋ end
     ⊊(a, b)::Bool
     ⊋(b, a)::Bool
 
-Determines if `a` is a subset of, but not equal to, `b`.
+Determine if `a` is a subset of, but not equal to, `b`.
 
 See also [`issubset`](@ref) (`⊆`), [`⊈`](@ref).
 

base/channels.jl

@@ -13,7 +13,7 @@ popfirst!(c::AbstractChannel) = take!(c)
 """
     Channel{T=Any}(size::Int=0)
 
-Constructs a `Channel` with an internal buffer that can hold a maximum of `size` objects
+Construct a `Channel` with an internal buffer that can hold a maximum of `size` objects
 of type `T`.
 [`put!`](@ref) calls on a full channel block until an object is removed with [`take!`](@ref).
 
@@ -214,7 +214,7 @@ end
 """
     isopen(c::Channel)
 
-Determines whether a [`Channel`](@ref) is open for new [`put!`](@ref) operations.
+Determine whether a [`Channel`](@ref) is open for new [`put!`](@ref) operations.
 Notice that a `Channel` can be closed and still have buffered elements which can be
 consumed with [`take!`](@ref).
 
@@ -555,7 +555,7 @@ end
 """
     isready(c::Channel)
 
-Determines whether a [`Channel`](@ref) has a value stored in it.
+Determine whether a [`Channel`](@ref) has a value stored in it.
 Returns immediately, does not block.
 
 For unbuffered channels, return `true` if there are tasks waiting on a [`put!`](@ref).
@@ -600,7 +600,7 @@ end
 """
     isfull(c::Channel)
 
-Determines if a [`Channel`](@ref) is full, in the sense
+Determine if a [`Channel`](@ref) is full, in the sense
 that calling `put!(c, some_value)` would have blocked.
 Returns immediately, does not block.
 
@@ -646,7 +646,7 @@ trylock(c::Channel) = trylock(c.cond_take)
 """
     wait(c::Channel)
 
-Blocks until the `Channel` [`isready`](@ref).
+Block until the `Channel` [`isready`](@ref).
 
 ```jldoctest
 julia> c = Channel(1);

base/deprecated.jl

@@ -538,7 +538,7 @@ end
 """
     isbindingresolved(m::Module, s::Symbol) -> Bool
 
-Returns whether the binding of a symbol in a module is resolved.
+Return whether the binding of a symbol in a module is resolved.
 
 See also: [`isexported`](@ref), [`ispublic`](@ref), [`isdeprecated`](@ref)
 

base/docs/basedocs.jl

@@ -3199,7 +3199,7 @@ undef
 """
     Ptr{T}()
 
-Creates a null pointer to type `T`.
+Create a null pointer to type `T`.
 """
 Ptr{T}()