Keep compatibility with modules from archives

Author: josevalim

lib/elixir/lib/module/types/of.ex

@@ -930,7 +930,6 @@ defmodule Module.Types.Of do
   def format_diagnostic({:badapply, expr, args_types, domain, clauses, context}) do
     traces = collect_traces(expr, context)
     {{:., _, [mod, fun]}, _, args} = expr
-
     {mod, fun, args, converter} = :elixir_rewrite.erl_to_ex(mod, fun, args)
 
     %{

lib/elixir/src/elixir_erl.erl

@@ -141,10 +141,15 @@ compile(#{module := Module, anno := Anno} = Map) ->
   CheckerChunk = checker_chunk(Def, Defmacro, Map),
   load_form(Map, Prefix, Forms, TypeSpecs, DocsChunk ++ CheckerChunk).
 
-dynamic_form(#{module := Module, anno := Anno, relative_file := RelativeFile,
+dynamic_form(#{module := Module, relative_file := RelativeFile,
                attributes := Attributes, definitions := Definitions, unreachable := Unreachable,
                deprecated := Deprecated, compile_opts := Opts} = Map) ->
-  Line = erl_anno:line(Anno),
+  %% TODO: Match on anno directly in Elixir v1.22+
+  Line = case Map of
+    #{anno := AnnoValue} -> erl_anno:line(AnnoValue);
+    #{line := LineValue} -> LineValue
+  end,
+
   {Def, Defmacro, Macros, Exports, Functions} =
     split_definition(Definitions, Unreachable, Line, [], [], [], [], {[], []}),