Preserve variable versions in cond boolean optimization

lib/elixir/src/elixir_erl_pass.erl

@@ -399,8 +399,9 @@ build_truthy_clause(Meta, Condition, Body, S) ->
 %% In case a variable is defined to match in a condition
 %% but a condition returns boolean, we can replace the
 %% variable directly by the boolean result.
-returns_boolean({'=', _, [{Var, _, Ctx}, Condition]}, {Var, _, Ctx}) when is_atom(Var), is_atom(Ctx) ->
-  case elixir_utils:returns_boolean(Condition) of
+returns_boolean({'=', _, [{Var, VarMeta, Ctx}, Condition]}, {Var, BodyMeta, Ctx}) when is_atom(Var), is_atom(Ctx) ->
+  case elixir_utils:returns_boolean(Condition) andalso
+       lists:keyfind(version, 1, VarMeta) =:= lists:keyfind(version, 1, BodyMeta) of
     true  -> {Condition, true};
     false -> false
   end;

lib/elixir/test/elixir/kernel/macros_test.exs

@@ -17,6 +17,21 @@ defmodule Kernel.MacrosTest.Nested do
     end
   end
 
+  defmacro outer_cond do
+    quote do
+      x = :outer_value
+      Kernel.MacrosTest.Nested.inner_cond(x)
+    end
+  end
+
+  defmacro inner_cond(body) do
+    quote do
+      cond do
+        x = is_integer(1) -> unquote(body)
+      end
+    end
+  end
+
   defmacro wrap_empty_var(expr) do
     empty = Macro.var(:"", nil)
 
@@ -76,6 +91,10 @@ defmodule Kernel.MacrosTest do
     assert Nested.value() == 1
   end
 
+  test "cond preserves hygienically distinct variables in the body" do
+    assert Nested.outer_cond() == :outer_value
+  end
+
   test "local with private macro" do
     assert my_private_macro() == 4
   end