Use attributes field to compute behaviours

Author: josevalim

lib/elixir/lib/module/parallel_checker.ex

@@ -217,7 +217,7 @@ defmodule Module.ParallelChecker do
       file: file,
       compile_opts: compile_opts,
       definitions: definitions,
-      uses_behaviours: uses_behaviours,
+      attributes: attributes,
       impls: impls
     } = module_map
 
@@ -228,6 +228,8 @@ defmodule Module.ParallelChecker do
         %{line: line} -> line
       end
 
+    behaviours = for {:behaviour, module} <- attributes, do: module
+
     no_warn_undefined =
       compile_opts
       |> extract_no_warn_undefined()
@@ -238,7 +240,7 @@ defmodule Module.ParallelChecker do
         module,
         file,
         line,
-        uses_behaviours,
+        behaviours,
         impls,
         definitions
       )

lib/elixir/src/elixir_erl.erl

@@ -502,7 +502,7 @@ extra_chunks_opts([], Opts) -> Opts;
 extra_chunks_opts(Chunks, Opts) -> [{extra_chunks, Chunks} | Opts].
 
 docs_chunk(Map, Set, Module, Anno, Def, Defmacro, Types, Callbacks) ->
-  #{file := File, uses_behaviours := UsesBehaviours} = Map,
+  #{file := File, attributes := Attributes} = Map,
 
   case elixir_config:get(docs) of
     true ->
@@ -516,7 +516,7 @@ docs_chunk(Map, Set, Module, Anno, Def, Defmacro, Types, Callbacks) ->
       ModuleMeta = ModuleDocMeta#{
         source_path => File,
         source_annos => [Anno],
-        behaviours => UsesBehaviours
+        behaviours => [Mod || {behaviour, Mod} <- Attributes]
       },
 
       DocsChunkData = term_to_binary({docs_v1,

lib/elixir/src/elixir_module.erl

@@ -161,7 +161,6 @@ compile(Meta, Module, ModuleAsCharlist, Block, Vars, Prune, E) ->
 
         RawCompileOpts = bag_lookup_element(DataBag, {accumulate, compile}, 2),
         CompileOpts = validate_compile_opts(RawCompileOpts, AllDefinitions, Unreachable, Line, E),
-        UsesBehaviours = bag_lookup_element(DataBag, {accumulate, behaviour}, 2),
         Impls = bag_lookup_element(DataBag, impls, 2),
 
         AfterVerify = bag_lookup_element(DataBag, {accumulate, after_verify}, 2),
@@ -181,7 +180,6 @@ compile(Meta, Module, ModuleAsCharlist, Block, Vars, Prune, E) ->
           compile_opts => CompileOpts,
           deprecated => get_deprecated(DataBag),
           defines_behaviour => defines_behaviour(DataBag),
-          uses_behaviours => UsesBehaviours,
           impls => Impls
         },