Properly track gradual types in for comprehensions :into

elixir-lang · Dec 30, 2024 · b0abc2b · b0abc2b
1 parent 1f9256a
commit b0abc2b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/lib/elixir/lib/module/types/expr.ex b/lib/elixir/lib/module/types/expr.ex
@@ -351,20 +351,20 @@ defmodule Module.Types.Expr do
       {dynamic(), context}
     else
       into = Keyword.get(opts, :into, [])
-      {into_wrapper, context} = for_into(into, meta, stack, context)
+      {into_wrapper, gradual?, context} = for_into(into, meta, stack, context)
       {block_type, context} = of_expr(block, stack, context)
 
       for_type =
         for type <- into_wrapper do
           case type do
             :binary -> binary()
             :list -> list(block_type)
-            :dynamic -> dynamic()
+            :term -> term()
           end
         end
         |> Enum.reduce(&union/2)
 
-      {for_type, context}
+      {if(gradual?, do: dynamic(for_type), else: for_type), context}
     end
   end
 
@@ -523,20 +523,20 @@ defmodule Module.Types.Expr do
   @into_compile union(binary(), empty_list())
 
   defp for_into([], _meta, _stack, context),
-    do: {[:list], context}
+    do: {[:list], false, context}
 
   defp for_into(binary, _meta, _stack, context) when is_binary(binary),
-    do: {[:binary], context}
+    do: {[:binary], false, context}
 
   # TODO: Use the collectable protocol for the output
   defp for_into(into, meta, stack, context) do
     {type, context} = of_expr(into, stack, context)
 
     if subtype?(type, @into_compile) do
       case {binary_type?(type), empty_list_type?(type)} do
-        {false, true} -> {[:list], context}
-        {true, false} -> {[:binary], context}
-        {_, _} -> {[:binary, :list], context}
+        {false, true} -> {[:list], gradual?(type), context}
+        {true, false} -> {[:binary], gradual?(type), context}
+        {_, _} -> {[:binary, :list], gradual?(type), context}
       end
     else
       meta =
@@ -547,7 +547,7 @@ defmodule Module.Types.Expr do
 
       expr = {:__block__, [type_check: :into] ++ meta, [into]}
       {_type, context} = Apply.remote(Collectable, :into, [into], [type], expr, stack, context)
-      {[:dynamic], context}
+      {[:term], true, context}
     end
   end
 

diff --git a/lib/elixir/test/elixir/module/types/expr_test.exs b/lib/elixir/test/elixir/module/types/expr_test.exs
@@ -1443,6 +1443,22 @@ defmodule Module.Types.ExprTest do
       assert typecheck!([enum], for(x <- enum, do: x, into: [])) == list(dynamic())
       assert typecheck!([enum], for(x <- enum, do: x, into: "")) == binary()
       assert typecheck!([enum, other], for(x <- enum, do: x, into: other)) == dynamic()
+
+      assert typecheck!(
+               [binary],
+               (
+                 into = if :rand.uniform() > 0.5, do: [], else: "0"
+                 for(<<x::float <- binary>>, do: x, into: into)
+               )
+             ) == union(binary(), list(float()))
+
+      assert typecheck!(
+               [binary, empty_list = []],
+               (
+                 into = if :rand.uniform() > 0.5, do: empty_list, else: "0"
+                 for(<<x::float <- binary>>, do: x, into: into)
+               )
+             ) == dynamic(union(binary(), list(float())))
     end
   end