Avoid the number of duplicate traces on imports

Author: josevalim

lib/elixir/src/elixir_dispatch.erl

@@ -133,9 +133,15 @@ dispatch_import(Meta, Name, Args, S, E, Callback) ->
       check_deprecated(macro, Meta, Receiver, Name, Arity, E),
       expand_quoted(Meta, Receiver, Name, Arity, Expander(Args, S), S, E);
     {function, Receiver, NewName} ->
-      elixir_expand:expand({{'.', Meta, [Receiver, NewName]}, Meta, Args}, S, E);
+      case elixir_rewrite:inline(Receiver, NewName, Arity) of
+        {AR, AN} ->
+          Callback({AR, AN});
+        false ->
+          check_deprecated(function, Meta, Receiver, Name, Arity, E),
+          Callback({Receiver, NewName})
+      end;
     not_found ->
-      Callback();
+      Callback(local);
     Error ->
       elixir_errors:file_error(Meta, E, ?MODULE, {import, Error, Name, Arity})
   end.
@@ -146,7 +152,7 @@ dispatch_require(Meta, Receiver, Name, Args, S, E, Callback) when is_atom(Receiv
   case elixir_rewrite:inline(Receiver, Name, Arity) of
     {AR, AN} ->
       elixir_env:trace({remote_function, Meta, Receiver, Name, Arity}, E),
-      Callback(AR, AN, Args);
+      Callback(AR, AN);
     false ->
       case expand_require(Meta, Receiver, Name, Arity, E, true) of
         {macro, Receiver, Expander} ->
@@ -155,12 +161,12 @@ dispatch_require(Meta, Receiver, Name, Args, S, E, Callback) when is_atom(Receiv
         error ->
           check_deprecated(function, Meta, Receiver, Name, Arity, E),
           elixir_env:trace({remote_function, Meta, Receiver, Name, Arity}, E),
-          Callback(Receiver, Name, Args)
+          Callback(Receiver, Name)
       end
   end;
 
-dispatch_require(_Meta, Receiver, Name, Args, _S, _E, Callback) ->
-  Callback(Receiver, Name, Args).
+dispatch_require(_Meta, Receiver, Name, _Args, _S, _E, Callback) ->
+  Callback(Receiver, Name).
 
 %% Macros expansion
 

lib/elixir/src/elixir_expand.erl

@@ -429,8 +429,12 @@ expand({Name, Meta, Kind}, S, E) when is_atom(Name), is_atom(Kind) ->
 expand({Atom, Meta, Args}, S, E) when is_atom(Atom), is_list(Meta), is_list(Args) ->
   assert_no_ambiguous_op(Atom, Meta, Args, S, E),
 
-  elixir_dispatch:dispatch_import(Meta, Atom, Args, S, E, fun() ->
-    expand_local(Meta, Atom, Args, S, E)
+  elixir_dispatch:dispatch_import(Meta, Atom, Args, S, E, fun
+    ({AR, AF}) ->
+      expand_remote(AR, Meta, AF, Meta, Args, S, elixir_env:prepare_write(S), E);
+
+    (local) ->
+      expand_local(Meta, Atom, Args, S, E)
   end);
 
 %% Remote calls
@@ -439,8 +443,8 @@ expand({{'.', DotMeta, [Left, Right]}, Meta, Args}, S, E)
     when (is_tuple(Left) orelse is_atom(Left)), is_atom(Right), is_list(Meta), is_list(Args) ->
   {ELeft, SL, EL} = expand(Left, elixir_env:prepare_write(S), E),
 
-  elixir_dispatch:dispatch_require(Meta, ELeft, Right, Args, S, EL, fun(AR, AF, AA) ->
-    expand_remote(AR, DotMeta, AF, Meta, AA, S, SL, EL)
+  elixir_dispatch:dispatch_require(Meta, ELeft, Right, Args, S, EL, fun(AR, AF) ->
+    expand_remote(AR, DotMeta, AF, Meta, Args, S, SL, EL)
   end);
 
 %% Anonymous calls

lib/elixir/src/elixir_module.erl

@@ -457,8 +457,8 @@ expand_callback(Line, M, F, Args, Acc, Fun) ->
   Meta = [{line, Line}, {required, true}],
 
   {EE, _S, ET} =
-    elixir_dispatch:dispatch_require(Meta, M, F, Args, S, E, fun(AM, AF, AA) ->
-      Fun(AM, AF, AA),
+    elixir_dispatch:dispatch_require(Meta, M, F, Args, S, E, fun(AM, AF) ->
+      Fun(AM, AF, Args),
       {ok, S, E}
     end),
 

lib/elixir/test/elixir/kernel/tracers_test.exs

@@ -84,9 +84,7 @@ defmodule Kernel.TracersTest do
     assert meta[:line] == 3
     assert meta[:column] == 11
 
-    assert_received {{:remote_function, meta, Integer, :parse, 1}, _}
-    assert meta[:line] == 3
-    assert meta[:column] == 11
+    refute_received {{:remote_function, _, Integer, :parse, 1}, _}
   end
 
   test "traces imports via capture" do
@@ -107,6 +105,8 @@ defmodule Kernel.TracersTest do
     assert_received {{:imported_function, meta, Integer, :parse, 1}, _}
     assert meta[:line] == 3
     assert meta[:column] == 2
+
+    refute_received {{:remote_function, _meta, Integer, :parse, 1}, _}
   end
 
   test "traces structs" do

lib/mix/lib/mix/tasks/xref.ex

@@ -61,10 +61,9 @@ defmodule Mix.Tasks.Xref do
 
       lib/b.ex:2: require A (export)
       lib/b.ex:3: call A.macro/0 (compile)
-      lib/b.ex:4: import A.macro/0 (compile)
+      lib/b.ex:4: import call A.macro/0 (compile)
       lib/b.ex:5: call A.fun/0 (compile)
-      lib/b.ex:6: call A.fun/0 (compile)
-      lib/b.ex:6: import A.fun/0 (compile)
+      lib/b.ex:6: import call A.fun/0 (compile)
       lib/b.ex:7: call A.macro/0 (compile)
       lib/b.ex:8: call A.fun/0 (runtime)
       lib/b.ex:9: struct A (export)
@@ -637,7 +636,7 @@ defmodule Mix.Tasks.Xref do
       shell.info([
         Exception.format_file_line(Path.relative_to_cwd(file), line),
         ?\s,
-        Atom.to_string(type),
+        trace_type(type),
         ?\s,
         format_module_or_mfa(module_or_mfa),
         " (#{mode})"
@@ -647,6 +646,9 @@ defmodule Mix.Tasks.Xref do
     end
   end
 
+  defp trace_type(:import), do: "import call"
+  defp trace_type(other), do: Atom.to_string(other)
+
   defp trace_label(nil), do: nil
   defp trace_label("compile"), do: :compile
   defp trace_label("export"), do: :export

lib/mix/test/mix/tasks/xref_test.exs

@@ -239,10 +239,9 @@ defmodule Mix.Tasks.XrefTest do
       Generated sample app
       lib/b.ex:2: require A (export)
       lib/b.ex:3: call A.macro/0 (compile)
-      lib/b.ex:4: import A.macro/0 (compile)
+      lib/b.ex:4: import call A.macro/0 (compile)
       lib/b.ex:5: call A.fun/0 (compile)
-      lib/b.ex:6: call A.fun/0 (compile)
-      lib/b.ex:6: import A.fun/0 (compile)
+      lib/b.ex:6: import call A.fun/0 (compile)
       lib/b.ex:7: call A.macro/0 (compile)
       lib/b.ex:8: call A.fun/0 (runtime)
       lib/b.ex:9: struct A (export)