diff --git a/lib/elixir/src/elixir_quote.erl b/lib/elixir/src/elixir_quote.erl index 7ff4f80fe9..4cc37d7ad2 100644 --- a/lib/elixir/src/elixir_quote.erl +++ b/lib/elixir/src/elixir_quote.erl @@ -119,9 +119,25 @@ do_linify(Fun, {Left, Meta, Receiver}, {Receiver, Counter} = Var, Gen) when is_atom(Left), is_list(Meta), Left /= '_' -> do_tuple_linify(Fun, keynew(counter, Meta, Counter), Left, Receiver, Var, Gen); +%% Only nodes that come from a quote receive the expansion counter. +%% Quoted lexical directives carry a context and quoted aliases carry +%% the alias annotation. Caller nodes spliced via unquote have neither. do_linify(Fun, {Lexical, Meta, [_ | _] = Args}, {_, Counter} = Var, Gen) - when ?lexical(Lexical); Lexical == '__aliases__' -> - do_tuple_linify(Fun, keynew(counter, Meta, Counter), Lexical, Args, Var, Gen); + when ?lexical(Lexical) -> + NewMeta = + case lists:keymember(context, 1, Meta) of + true -> keynew(counter, Meta, Counter); + false -> Meta + end, + do_tuple_linify(Fun, NewMeta, Lexical, Args, Var, Gen); + +do_linify(Fun, {'__aliases__', Meta, [_ | _] = Args}, {_, Counter} = Var, Gen) -> + NewMeta = + case lists:keymember(alias, 1, Meta) of + true -> keynew(counter, Meta, Counter); + false -> Meta + end, + do_tuple_linify(Fun, NewMeta, '__aliases__', Args, Var, Gen); do_linify(Fun, {Left, Meta, Right}, Var, Gen) when is_list(Meta) -> do_tuple_linify(Fun, Meta, Left, Right, Var, Gen); diff --git a/lib/elixir/test/elixir/kernel/quote_test.exs b/lib/elixir/test/elixir/kernel/quote_test.exs index 4cc278eaf3..16ba0cd826 100644 --- a/lib/elixir/test/elixir/kernel/quote_test.exs +++ b/lib/elixir/test/elixir/kernel/quote_test.exs @@ -551,6 +551,15 @@ defmodule Kernel.QuoteTest.VarHygieneTest do end end +defmodule Kernel.QuoteTest.AliasHygieneHelper do + def with_alias do + quote do + alias HashDict, as: Dict + Dict.Bar + end + end +end + defmodule Kernel.QuoteTest.AliasHygiene do alias Dict, as: SuperDict @@ -561,6 +570,24 @@ defmodule Kernel.QuoteTest.AliasHygiene do defmacro super_dict do quote(do: SuperDict.Bar) end + + defmacro with_argument(block) do + quote do + unquote(block) + Dict.Bar + end + end + + defmacro with_alias_from_helper do + Kernel.QuoteTest.AliasHygieneHelper.with_alias() + end + + defmacro with_alias_context do + quote context: Other do + alias HashDict, as: Dict + Dict.Bar + end + end end defmodule Kernel.QuoteTest.AliasHygieneTest do @@ -598,6 +625,45 @@ defmodule Kernel.QuoteTest.AliasHygieneTest do require Kernel.QuoteTest.AliasHygiene assert Kernel.QuoteTest.AliasHygiene.super_dict() == Elixir.Dict.Bar end + + test "aliases in macro arguments do not affect quoted aliases" do + assert argument_alias() == {Elixir.Dict.Bar, Elixir.HashDict.Bar} + end + + test "aliases in quoted fragments from helpers retain hygiene" do + require Kernel.QuoteTest.AliasHygiene + + result = Kernel.QuoteTest.AliasHygiene.with_alias_from_helper() + assert result == Elixir.HashDict.Bar + + result = Kernel.QuoteTest.AliasHygiene.with_alias_context() + assert result == Elixir.HashDict.Bar + end + + test "aliases from modules defined in macro arguments do not affect quoted aliases" do + assert module_argument_alias() == {Elixir.Dict.Bar, __MODULE__.Dict} + end + + # Keep these calls outside test/2. Before the fix, test/2 would assign its own + # expansion counter to the arguments, masking the bug in with_argument/1. + defp argument_alias do + require Kernel.QuoteTest.AliasHygiene + + result = Kernel.QuoteTest.AliasHygiene.with_argument(alias HashDict, as: Dict) + {result, Dict.Bar} + end + + defp module_argument_alias do + require Kernel.QuoteTest.AliasHygiene + + result = + Kernel.QuoteTest.AliasHygiene.with_argument( + defmodule Dict do + end + ) + + {result, Dict} + end end defmodule Kernel.QuoteTest.ImportsHygieneTest do