From 1fdb7e0e6db99f748190642f9af5a1235c78dd9d Mon Sep 17 00:00:00 2001 From: Lukasz Samson Date: Tue, 17 Nov 2026 10:55:41 +0100 Subject: [PATCH 1/3] Do not assign macro expansion counters to caller-supplied aliases Closes #16139. Assisted-by: Codex:GPT-6 Assisted-by: Claude Code:claude-fable-5-2 --- lib/elixir/src/elixir_quote.erl | 20 ++- lib/elixir/test/elixir/kernel/quote_test.exs | 141 ++++++++++++++++++- 2 files changed, 157 insertions(+), 4 deletions(-) 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..f1dc687168 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,61 @@ 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(block) do + quote do + alias HashDict, as: Dict + {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 + + defmacro with_quoted_argument do + quote do + unquote(__MODULE__).with_argument(alias HashDict, as: Dict) + end + end + + defmacro with_unhygienic_argument(block) do + quote do + unquote(block) + alias!(Dict.Bar) + end + end + + defmacro nested_alias do + quote do + quote do + alias HashDict, as: Dict + Dict.Bar + end + end + end +end + +defmodule Kernel.QuoteTest.NestedAliasHygiene do + require Kernel.QuoteTest.AliasHygiene + + defmacro quoted do + Kernel.QuoteTest.AliasHygiene.nested_alias() + end end defmodule Kernel.QuoteTest.AliasHygieneTest do @@ -570,8 +634,12 @@ defmodule Kernel.QuoteTest.AliasHygieneTest do test "annotate aliases" do assert {:__aliases__, [alias: false], [:Foo, :Bar]} = quote(do: Foo.Bar) - assert {:__aliases__, [alias: false], [:Dict, :Bar]} = quote(do: Dict.Bar) - assert {:__aliases__, [alias: Dict.Bar], [:SuperDict, :Bar]} = quote(do: SuperDict.Bar) + + assert {:__aliases__, [alias: false], [:Dict, :Bar]} = + quote(do: Dict.Bar) + + assert {:__aliases__, [alias: Dict.Bar], [:SuperDict, :Bar]} = + quote(do: SuperDict.Bar) # Edge-case assert {:__aliases__, _, [Elixir]} = quote(do: Elixir) @@ -598,6 +666,75 @@ 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 emitted by macros affect caller arguments and quoted aliases" do + require Kernel.QuoteTest.AliasHygiene + + result = Kernel.QuoteTest.AliasHygiene.with_alias(Dict.Bar) + assert result == {Elixir.HashDict.Bar, Elixir.HashDict.Bar} + + assert 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 in macro arguments retain their expansion counter" do + require Kernel.QuoteTest.AliasHygiene + + result = Kernel.QuoteTest.AliasHygiene.with_quoted_argument() + assert result == Elixir.Dict.Bar + end + + test "aliases in macro arguments affect alias!" do + require Kernel.QuoteTest.AliasHygiene + + result = Kernel.QuoteTest.AliasHygiene.with_unhygienic_argument(alias HashDict, as: Dict) + assert result == Elixir.HashDict.Bar + end + + test "aliases in nested quotes receive a new expansion counter" do + require Kernel.QuoteTest.NestedAliasHygiene + + result = Kernel.QuoteTest.NestedAliasHygiene.quoted() + 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 From 7fb68b5ea377fb53d1f520b4dbce1817cc818f53 Mon Sep 17 00:00:00 2001 From: Lukasz Samson Date: Tue, 17 Nov 2026 11:01:57 +0100 Subject: [PATCH 2/3] Restore formatting in alias annotation test --- lib/elixir/test/elixir/kernel/quote_test.exs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/elixir/test/elixir/kernel/quote_test.exs b/lib/elixir/test/elixir/kernel/quote_test.exs index f1dc687168..42c95d6974 100644 --- a/lib/elixir/test/elixir/kernel/quote_test.exs +++ b/lib/elixir/test/elixir/kernel/quote_test.exs @@ -634,12 +634,8 @@ defmodule Kernel.QuoteTest.AliasHygieneTest do test "annotate aliases" do assert {:__aliases__, [alias: false], [:Foo, :Bar]} = quote(do: Foo.Bar) - - assert {:__aliases__, [alias: false], [:Dict, :Bar]} = - quote(do: Dict.Bar) - - assert {:__aliases__, [alias: Dict.Bar], [:SuperDict, :Bar]} = - quote(do: SuperDict.Bar) + assert {:__aliases__, [alias: false], [:Dict, :Bar]} = quote(do: Dict.Bar) + assert {:__aliases__, [alias: Dict.Bar], [:SuperDict, :Bar]} = quote(do: SuperDict.Bar) # Edge-case assert {:__aliases__, _, [Elixir]} = quote(do: Elixir) From 4f0ed38bd968d624390206ff34786c7d9f5e0d48 Mon Sep 17 00:00:00 2001 From: Lukasz Samson Date: Tue, 17 Nov 2026 16:10:00 +0100 Subject: [PATCH 3/3] Trim alias hygiene tests to the regressions --- lib/elixir/test/elixir/kernel/quote_test.exs | 67 -------------------- 1 file changed, 67 deletions(-) diff --git a/lib/elixir/test/elixir/kernel/quote_test.exs b/lib/elixir/test/elixir/kernel/quote_test.exs index 42c95d6974..16ba0cd826 100644 --- a/lib/elixir/test/elixir/kernel/quote_test.exs +++ b/lib/elixir/test/elixir/kernel/quote_test.exs @@ -578,13 +578,6 @@ defmodule Kernel.QuoteTest.AliasHygiene do end end - defmacro with_alias(block) do - quote do - alias HashDict, as: Dict - {unquote(block), Dict.Bar} - end - end - defmacro with_alias_from_helper do Kernel.QuoteTest.AliasHygieneHelper.with_alias() end @@ -595,36 +588,6 @@ defmodule Kernel.QuoteTest.AliasHygiene do Dict.Bar end end - - defmacro with_quoted_argument do - quote do - unquote(__MODULE__).with_argument(alias HashDict, as: Dict) - end - end - - defmacro with_unhygienic_argument(block) do - quote do - unquote(block) - alias!(Dict.Bar) - end - end - - defmacro nested_alias do - quote do - quote do - alias HashDict, as: Dict - Dict.Bar - end - end - end -end - -defmodule Kernel.QuoteTest.NestedAliasHygiene do - require Kernel.QuoteTest.AliasHygiene - - defmacro quoted do - Kernel.QuoteTest.AliasHygiene.nested_alias() - end end defmodule Kernel.QuoteTest.AliasHygieneTest do @@ -667,15 +630,6 @@ defmodule Kernel.QuoteTest.AliasHygieneTest do assert argument_alias() == {Elixir.Dict.Bar, Elixir.HashDict.Bar} end - test "aliases emitted by macros affect caller arguments and quoted aliases" do - require Kernel.QuoteTest.AliasHygiene - - result = Kernel.QuoteTest.AliasHygiene.with_alias(Dict.Bar) - assert result == {Elixir.HashDict.Bar, Elixir.HashDict.Bar} - - assert Dict.Bar == Elixir.HashDict.Bar - end - test "aliases in quoted fragments from helpers retain hygiene" do require Kernel.QuoteTest.AliasHygiene @@ -686,27 +640,6 @@ defmodule Kernel.QuoteTest.AliasHygieneTest do assert result == Elixir.HashDict.Bar end - test "aliases in macro arguments retain their expansion counter" do - require Kernel.QuoteTest.AliasHygiene - - result = Kernel.QuoteTest.AliasHygiene.with_quoted_argument() - assert result == Elixir.Dict.Bar - end - - test "aliases in macro arguments affect alias!" do - require Kernel.QuoteTest.AliasHygiene - - result = Kernel.QuoteTest.AliasHygiene.with_unhygienic_argument(alias HashDict, as: Dict) - assert result == Elixir.HashDict.Bar - end - - test "aliases in nested quotes receive a new expansion counter" do - require Kernel.QuoteTest.NestedAliasHygiene - - result = Kernel.QuoteTest.NestedAliasHygiene.quoted() - 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