Pass signatures on the side instead of module map

Author: josevalim

lib/elixir/lib/module/parallel_checker.ex

@@ -63,14 +63,14 @@ defmodule Module.ParallelChecker do
   @doc """
   Spawns a process that runs the parallel checker.
   """
-  def spawn({pid, {checker, table}}, module, module_map, beam_location, log?) do
+  def spawn({pid, {checker, table}}, module, module_map, signatures, beam_location, log?) do
     # Protocols may have been consolidated. So if we know their beam location,
     # we discard their module map on purpose and start from file.
     info =
       if beam_location != [] and Keyword.has_key?(module_map.attributes, :__protocol__) do
         List.to_string(beam_location)
       else
-        cache_from_module_map(table, module_map)
+        cache_from_module_map(table, module_map, signatures)
       end
 
     inner_spawn(pid, checker, table, module, info, log?)
@@ -477,12 +477,12 @@ defmodule Module.ParallelChecker do
     if Keyword.has_key?(attributes, :__protocol__), do: :protocol, else: :elixir
   end
 
-  defp cache_from_module_map(table, map) do
+  defp cache_from_module_map(table, map, signatures) do
     exports =
       behaviour_exports(map) ++
         for({function, :def, _meta, _clauses} <- map.definitions, do: function)
 
-    cache_info(table, map.module, exports, Map.new(map.deprecated), map.signatures)
+    cache_info(table, map.module, exports, Map.new(map.deprecated), signatures)
     {elixir_mode(map.attributes), module_map_to_module_tuple(map)}
   end
 

lib/elixir/src/elixir_erl.erl

@@ -5,7 +5,7 @@
 %% Compiler backend to Erlang.
 
 -module(elixir_erl).
--export([elixir_to_erl/1, elixir_to_erl/2, definition_to_anonymous/5, compile/1, consolidate/4,
+-export([elixir_to_erl/1, elixir_to_erl/2, definition_to_anonymous/5, compile/2, consolidate/4,
          get_ann/1, debug_info/4, scope/2, checker_version/0, format_error/1]).
 -include("elixir.hrl").
 -define(typespecs, 'Elixir.Kernel.Typespec').
@@ -142,7 +142,7 @@ consolidate(Map, Checker, TypeSpecs, DocsChunk) ->
 
 %% Dynamic compilation hook, used in regular compiler
 
-compile(#{module := Module, anno := Anno} = BaseMap) ->
+compile(#{module := Module, anno := Anno} = BaseMap, Signatures) ->
   Map =
     case elixir_erl_compiler:env_compiler_options() of
       [] -> BaseMap;
@@ -164,7 +164,7 @@ compile(#{module := Module, anno := Anno} = BaseMap) ->
 
   ChunkOpts = chunk_opts(Map),
   DocsChunk = docs_chunk(Map, Set, Module, Anno, Def, Defmacro, Types, Callbacks, ChunkOpts),
-  CheckerChunk = checker_chunk(Map, Def, ChunkOpts),
+  CheckerChunk = checker_chunk(Map, Def, Signatures, ChunkOpts),
   load_form(Map, Prefix, Forms, TypeSpecs, DocsChunk ++ CheckerChunk).
 
 chunk_opts(Map) ->
@@ -519,10 +519,8 @@ load_form(#{file := File, compile_opts := Opts} = Map, Prefix, Forms, Specs, Chu
   Binary.
 
 debug_opts(Map, Specs, Opts) ->
-  %% Signatures are moved to ExCk, no need to duplicate in chunks
-  Keys = [signatures],
   case take_debug_opts(Opts) of
-    {true, Rest} -> [{debug_info, {?MODULE, {elixir_v1, maps:without(Keys, Map), Specs}}} | Rest];
+    {true, Rest} -> [{debug_info, {?MODULE, {elixir_v1, Map, Specs}}} | Rest];
     {false, Rest} -> [{debug_info, {?MODULE, none}} | Rest]
   end.
 
@@ -649,9 +647,8 @@ checker_chunk(nil, _ChunkOpts) ->
 checker_chunk(Contents, ChunkOpts) ->
   [{<<"ExCk">>, term_to_binary({checker_version(), Contents}, ChunkOpts)}].
 
-checker_chunk(Map, Def, ChunkOpts) ->
-  #{deprecated := Deprecated, defines_behaviour := DefinesBehaviour,
-    signatures := Signatures, attributes := Attributes} = Map,
+checker_chunk(Map, Def, Signatures, ChunkOpts) ->
+  #{deprecated := Deprecated, defines_behaviour := DefinesBehaviour, attributes := Attributes} = Map,
   DeprecatedMap = maps:from_list(Deprecated),
 
   Exports =

lib/elixir/src/elixir_module.erl

@@ -219,14 +219,13 @@ compile(Meta, Module, ModuleAsCharlist, Block, Vars, Prune, E) ->
           deprecated => get_deprecated(DataBag),
           defines_behaviour => defines_behaviour(DataBag),
           impls => Impls,
-          unreachable => Unreachable,
-          signatures => Signatures
+          unreachable => Unreachable
         },
 
         compile_error_if_tainted(DataSet, E),
-        Binary = elixir_erl:compile(ModuleMap),
+        Binary = elixir_erl:compile(ModuleMap, Signatures),
         Autoload = Forceload or proplists:get_value(autoload, CompileOpts, false),
-        spawn_parallel_checker(CheckerInfo, Module, ModuleMap, BeamLocation),
+        spawn_parallel_checker(CheckerInfo, Module, ModuleMap, Signatures, BeamLocation),
         {Binary, PersistedAttributes, Autoload}
       end),
 
@@ -581,15 +580,15 @@ checker_info() ->
     _ -> 'Elixir.Module.ParallelChecker':get()
   end.
 
-spawn_parallel_checker({_, nil}, _Module, _ModuleMap, _BeamLocation) ->
+spawn_parallel_checker({_, nil}, _Module, _ModuleMap, _Signatures, _BeamLocation) ->
   ok;
-spawn_parallel_checker(CheckerInfo, Module, ModuleMap, BeamLocation) ->
+spawn_parallel_checker(CheckerInfo, Module, ModuleMap, Signatures, BeamLocation) ->
   Log =
     case erlang:get(elixir_code_diagnostics) of
       {_, false} -> false;
       _ -> true
     end,
-  'Elixir.Module.ParallelChecker':spawn(CheckerInfo, Module, ModuleMap, BeamLocation, Log).
+  'Elixir.Module.ParallelChecker':spawn(CheckerInfo, Module, ModuleMap, Signatures, BeamLocation, Log).
 
 make_module_available(Module, Binary, Loaded) ->
   case get(elixir_module_binaries) of