From 31bba8bb3bb3eff077031a59e7eedcd909f228e6 Mon Sep 17 00:00:00 2001 From: Lukasz Samson Date: Mon, 16 Nov 2026 15:21:44 +0100 Subject: [PATCH] Preserve Record argument evaluation order when hoisting Assisted-by: Codex:GPT-6 --- lib/elixir/lib/record.ex | 25 +++++++++++++++---------- lib/elixir/test/elixir/record_test.exs | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/lib/elixir/lib/record.ex b/lib/elixir/lib/record.ex index 43425d4579f..a62ef8b54e3 100644 --- a/lib/elixir/lib/record.ex +++ b/lib/elixir/lib/record.ex @@ -444,13 +444,14 @@ defmodule Record do raise ArgumentError, "cannot invoke update style macro inside match" end - {keyword, exprs} = hoist_expressions(keyword, caller) - if Keyword.has_key?(keyword, :_) do message = "updating a record with a default (:_) is equivalent to creating a new record" IO.warn(message, caller) create(tag, fields, keyword, caller) else + {[{:record, var} | keyword], exprs} = + hoist_expressions([{:record, var} | keyword], caller) + updates = Enum.map(keyword, fn {key, value} -> if index = find_index(fields, key, 2) do @@ -465,14 +466,18 @@ defmodule Record do end defp hoist_expressions(keyword, %{context: nil, module: module}) do - Enum.map_reduce(keyword, [], fn {key, expr}, acc -> - if simple_argument?(expr) do - {{key, expr}, acc} - else - var = Macro.unique_var(key, module) - {{key, var}, [{:=, [], [var, expr]} | acc]} - end - end) + if Enum.all?(keyword, fn {_, expr} -> simple_argument?(expr) end) do + {keyword, []} + else + Enum.map_reduce(keyword, [], fn {key, expr}, acc -> + if Macro.quoted_literal?(expr) do + {{key, expr}, acc} + else + var = Macro.unique_var(key, module) + {{key, var}, [{:=, [], [var, expr]} | acc]} + end + end) + end end defp hoist_expressions(keyword, _), do: {keyword, []} diff --git a/lib/elixir/test/elixir/record_test.exs b/lib/elixir/test/elixir/record_test.exs index 90685d5d4bb..dca42af510a 100644 --- a/lib/elixir/test/elixir/record_test.exs +++ b/lib/elixir/test/elixir/record_test.exs @@ -396,4 +396,25 @@ defmodule RecordTest do :code.delete(module) end end + + test "records preserve variable reads before rebinding" do + x = 1 + assert user(name: x, age: x = 2) == {RecordTest, 1, 2} + assert x == 2 + + x = 1 + assert user(user(), age: x, name: x = 2) == {RecordTest, 2, 1} + assert x == 2 + end + + test "record updates evaluate the base before fields" do + record = user() + assert user(record, name: record = :name) == {RecordTest, :name, 25} + assert record == :name + + assert user(user(name: send(self(), :base)), age: send(self(), :field)) == + {RecordTest, :base, :field} + + assert for(_ <- 1..2, do: assert_receive(_)) == [:base, :field] + end end