Record each definition on tracker as soon as defined

Author: José Valim

lib/elixir/include/elixir.hrl

@@ -16,7 +16,6 @@
   name_args=false,         %% when true, it means arguments should be named
   module=nil,              %% the current module
   function=nil,            %% the current function
-  function_kind=nil,       %% the current function kind
   vars=[],                 %% a dict of defined variables and their alias
   temp_vars=[],            %% a dict of all variables defined in a particular assign
   clause_vars=nil,         %% a dict of all variables defined in a particular clause

lib/elixir/lib/macro/env.ex

@@ -12,7 +12,6 @@ defmodule Macro.Env do
   * `function` - a tuple as `{ atom, integer` }, where the first
     element is the function name and the seconds its arity. Returns
     `nil` if not inside a function
-  * `function_kind` - the kind of the function (`def`, `defp`, etc)
   * `aliases` -  a list of two item tuples, where the first
     item is the aliased name and the second the actual name
   * `context` - the context of the environment. It can be nil
@@ -32,15 +31,13 @@ defmodule Macro.Env do
   @type functions :: [{ module, [name_arity] }]
   @type macros :: [{ module, [name_arity] }]
   @type context_modules :: [module]
-  @type function_kind :: :def | :defp | :defmacro | :defmacrop
 
   fields = [:module, :file, :line, :function, :aliases, :context, :requires,
-            :functions, :macros, :context_modules, :function_kind]
+            :functions, :macros, :context_modules]
 
   types  = quote do: [module: module, file: file, line: line,
     function: name_arity, aliases: aliases, requires: requires,
-    functions: functions, macros: macros, context_modules: context_modules,
-    function_kind: function_kind]
+    functions: functions, macros: macros, context_modules: context_modules]
 
   Record.deffunctions(fields, __MODULE__)
   Record.deftypes(fields, types, __MODULE__)

lib/elixir/lib/module/dispatch_tracker.ex

@@ -158,12 +158,6 @@ defmodule Module.DispatchTracker do
   # clauses a private function have.
   @doc false
   def collect_unused_locals(pid, private) do
-    # Add a vertex for each private given
-    lc { tuple, kind, _defaults } inlist private do
-      add_definition(pid, kind, tuple)
-    end
-
-    # Process all unused
     reachable = reachable(pid)
     :lists.foldl(collect_unused_locals(&1, &2, reachable), [], private)
   end

lib/elixir/src/elixir_def.erl

@@ -114,7 +114,9 @@ store_definition(Kind, Line, _CheckClauses, nil, _Name, _Args, _Guards, _Body, #
 
 store_definition(Kind, Line, CheckClauses, Module, Name, Args, Guards, Body, #elixir_scope{} = DS) ->
   Arity = length(Args),
-  S = DS#elixir_scope{module=Module, function={Name,Arity}, function_kind=Kind},
+  Tuple = { Name, Arity },
+  S = DS#elixir_scope{module=Module, function=Tuple},
+  elixir_tracker:record_definition(Tuple, Kind, Module),
 
   CO = elixir_compiler:get_opts(),
   Location = retrieve_file(Line, Module, S, CO),

lib/elixir/src/elixir_scope.erl

@@ -76,18 +76,18 @@ build_ex_var(Line, Key, Name, S) when is_integer(Line) ->
 % Handle Macro.Env conversion
 
 to_erl_env({ 'Elixir.Macro.Env', Module, File, _Line, Function, Aliases, Context,
-    Requires, Functions, Macros, FileModules, FunctionKind }) ->
+    Requires, Functions, Macros, FileModules }) ->
   #elixir_scope{module=Module,file=File,
     function=Function,aliases=Aliases,context=Context,
     requires=Requires,macros=Macros,functions=Functions,
-    context_modules=FileModules,function_kind=FunctionKind}.
+    context_modules=FileModules}.
 
 to_ex_env({ Line, #elixir_scope{module=Module,file=File,
     function=Function,aliases=Aliases,context=Context,
     requires=Requires,macros=Macros,functions=Functions,
-    context_modules=FileModules,function_kind=FunctionKind} }) when is_integer(Line) ->
+    context_modules=FileModules} }) when is_integer(Line) ->
   { 'Elixir.Macro.Env', Module, File, Line, Function, Aliases,
-    Context, Requires, Functions, Macros, FileModules, FunctionKind }.
+    Context, Requires, Functions, Macros, FileModules }.
 
 % Provides a tuple with only the scope information we want to serialize.
 

lib/elixir/src/elixir_tracker.erl

@@ -4,7 +4,7 @@
 -export([
   setup/1, cleanup/1,
   record_local/2, record_import/3,
-  record_warn/4,
+  record_warn/4, record_definition/3,
   ensure_no_import_conflict/4, ensure_all_imports_used/3,
   warn_unused_local/3, format_error/1
 ]).
@@ -31,9 +31,8 @@ record_local(Tuple, Module) when is_atom(Module) ->
   end);
 record_local(Tuple, #elixir_scope{function=Function})
   when Function == nil; Function == Tuple -> false;
-record_local(Tuple, #elixir_scope{module=Module, function=Function, function_kind=Kind}) ->
+record_local(Tuple, #elixir_scope{module=Module, function=Function}) ->
   if_tracker(Module, fun(Pid) ->
-    ?tracker:add_definition(Pid, Kind, Function),
     ?tracker:add_local(Pid, Function, Tuple),
     true
   end).
@@ -54,6 +53,12 @@ record_import(Tuple, Receiver, Module) ->
     error:badarg -> false
   end.
 
+record_definition(Tuple, Kind, Module) ->
+  if_tracker(Module, fun(Pid) ->
+    ?tracker:add_definition(Pid, Kind, Tuple),
+    true
+  end).
+
 %% HELPERS
 
 if_tracker(Module, Callback) ->