Merge branch 'main' into domain-keys-in-map

Author: gldubc

.github/workflows/release.yml

@@ -218,7 +218,7 @@ jobs:
 
       - name: Attest Distribution Assets with SBoM
         id: attest-sbom
-        uses: actions/attest-sbom@115c3be05ff3974bcbd596578934b3f9ce39bf68 # v2.2.0
+        uses: actions/attest-sbom@bd218ad0dbcb3e146bd073d1d9c6d78e08aa8a0b # v2.4.0
         with:
           subject-path: |
             /tmp/build-artifacts/{elixir-otp-*.*,Docs.zip}

lib/elixir/lib/map.ex

@@ -317,6 +317,11 @@ defmodule Map do
       iex> Map.fetch!(%{a: 1}, :a)
       1
 
+  When the key is missing, an exception is raised:
+      
+      Map.fetch!(%{a: 1}, :b)
+      ** (KeyError) key :b not found in: %{a: 1}
+
   """
   @spec fetch!(map, key) :: value
   def fetch!(map, key) do

lib/elixir/lib/module/types/descr.ex

@@ -283,7 +283,7 @@ defmodule Module.Types.Descr do
     case descr do
       %{dynamic: %{optional: 1}} -> %{dynamic: %{optional: 1}}
       %{optional: 1} -> %{optional: 1}
-      _ -> %{}
+      _ -> @none
     end
   end
 
@@ -490,13 +490,21 @@ defmodule Module.Types.Descr do
 
   defp iterator_difference_static(:none, map), do: map
 
-  defp empty_difference_static?(left, :term), do: not Map.has_key?(left, :optional)
+  # This function is designed to compute the difference during subtyping efficiently.
+  # Do not use it for anything else.
+  defp empty_difference_subtype?(%{dynamic: dyn_left} = left, %{dynamic: dyn_right} = right) do
+    # Dynamic will either exist on both sides or on none
+    empty_difference_subtype?(dyn_left, dyn_right) and
+      empty_difference_subtype?(Map.delete(left, :dynamic), Map.delete(right, :dynamic))
+  end
+
+  defp empty_difference_subtype?(left, :term), do: keep_optional(left) == @none
 
-  defp empty_difference_static?(left, right) do
-    iterator_empty_difference_static?(:maps.next(:maps.iterator(unfold(left))), unfold(right))
+  defp empty_difference_subtype?(left, right) do
+    iterator_empty_difference_subtype?(:maps.next(:maps.iterator(unfold(left))), unfold(right))
   end
 
-  defp iterator_empty_difference_static?({key, v1, iterator}, map) do
+  defp iterator_empty_difference_subtype?({key, v1, iterator}, map) do
     case map do
       %{^key => v2} ->
         value = difference(key, v1, v2)
@@ -505,15 +513,14 @@ defmodule Module.Types.Descr do
       %{} ->
         empty_key?(key, v1)
     end and
-      iterator_empty_difference_static?(:maps.next(iterator), map)
+      iterator_empty_difference_subtype?(:maps.next(iterator), map)
   end
 
-  defp iterator_empty_difference_static?(:none, _map), do: true
+  defp iterator_empty_difference_subtype?(:none, _map), do: true
 
   # Returning 0 from the callback is taken as none() for that subtype.
   defp difference(:atom, v1, v2), do: atom_difference(v1, v2)
   defp difference(:bitmap, v1, v2), do: v1 - (v1 &&& v2)
-  defp difference(:dynamic, v1, v2), do: dynamic_difference(v1, v2)
   defp difference(:list, v1, v2), do: list_difference(v1, v2)
   defp difference(:map, v1, v2), do: map_difference(v1, v2)
   defp difference(:optional, 1, 1), do: 0
@@ -563,7 +570,6 @@ defmodule Module.Types.Descr do
   defp empty_key?(:map, value), do: map_empty?(value)
   defp empty_key?(:list, value), do: list_empty?(value)
   defp empty_key?(:tuple, value), do: tuple_empty?(value)
-  defp empty_key?(:dynamic, value), do: empty?(value)
   defp empty_key?(_, _value), do: false
 
   @doc """
@@ -690,7 +696,7 @@ defmodule Module.Types.Descr do
   end
 
   defp subtype_static?(same, same), do: true
-  defp subtype_static?(left, right), do: empty_difference_static?(left, right)
+  defp subtype_static?(left, right), do: empty_difference_subtype?(left, right)
 
   @doc """
   Check if a type is equal to another.
@@ -2145,13 +2151,6 @@ defmodule Module.Types.Descr do
   defp dynamic_intersection(left, right),
     do: symmetrical_intersection(unfold(left), unfold(right), &intersection/3)
 
-  defp dynamic_difference(left, right) do
-    case difference_static(left, right) do
-      value when value == @none -> 0
-      value -> value
-    end
-  end
-
   defp dynamic_to_quoted(descr, opts) do
     cond do
       descr == %{} ->

lib/elixir/src/elixir_erl_pass.erl

@@ -628,7 +628,8 @@ translate_remote(Left, Right, Meta, Args, S) ->
         [TOne, TTwo] -> {{op, Ann, Right, TOne, TTwo}, SA}
       end;
     {inline_pure, Result} ->
-      translate(Result, Ann, S);
+      Generated = erl_anno:set_generated(true, Ann),
+      translate(Result, Generated, S);
     {inline_args, NewArgs} ->
       {TLeft, SL} = translate(Left, Ann, S),
       {TArgs, SA} = translate_args(NewArgs, Ann, SL),
@@ -690,7 +691,7 @@ inline_pure_function('Elixir.URI', parse) -> true;
 inline_pure_function('Elixir.URI', encode_query) -> true;
 inline_pure_function('Elixir.URI', encode_www_form) -> true;
 inline_pure_function('Elixir.URI', decode) -> true;
-inline_pure_function('Elixir.URI', decode_www_for) -> true;
+inline_pure_function('Elixir.URI', decode_www_form) -> true;
 inline_pure_function('Elixir.Version', parse) -> true;
 inline_pure_function('Elixir.Version', 'parse!') -> true;
 inline_pure_function('Elixir.Version', parse_requirement) -> true;
@@ -717,7 +718,7 @@ generate_struct_name_guard([Field | Rest], Acc, S) ->
 %% TODO: Make this a runtime error on Elixir v2.0
 no_parens_remote(nil, _Key) -> {error, {badmap, nil}};
 no_parens_remote(false, _Key) -> {error, {badmap, false}};
-no_parens_remote(true, _Key) -> {error, {badmap, false}};
+no_parens_remote(true, _Key) -> {error, {badmap, true}};
 no_parens_remote(Atom, Fun) when is_atom(Atom) ->
   Message = fun() ->
     io_lib:format(

lib/elixir/test/elixir/fixtures/dialyzer/opaque_inline.ex

@@ -0,0 +1,10 @@
+defmodule Dialyzer.OpaqueInline do
+  @spec bar(MapSet.t()) :: term()
+  def bar(set) do
+    set
+  end
+
+  def foo() do
+    bar(MapSet.new([1, 2, 3]))
+  end
+end

lib/elixir/test/elixir/kernel/dialyzer_test.exs

@@ -32,6 +32,7 @@ defmodule Kernel.DialyzerTest do
       :elixir_env,
       :elixir_erl_pass,
       :maps,
+      :sets,
       ArgumentError,
       Atom,
       Code,
@@ -45,6 +46,7 @@ defmodule Kernel.DialyzerTest do
       List,
       Macro,
       Macro.Env,
+      MapSet,
       Module,
       Protocol,
       String,
@@ -176,6 +178,11 @@ defmodule Kernel.DialyzerTest do
     assert_dialyze_no_warnings!(context)
   end
 
+  test "no warning on inlined calls returning opaque", context do
+    copy_beam!(context, Dialyzer.OpaqueInline)
+    assert_dialyze_no_warnings!(context)
+  end
+
   defp copy_beam!(context, module) do
     name = "#{module}.beam"
     File.cp!(Path.join(context.base_dir, name), Path.join(context.outdir, name))