Reduce AST metadata compiled in definitions

Author: josevalim

lib/elixir/lib/kernel.ex

@@ -5135,31 +5135,22 @@ defmodule Kernel do
 
     unquoted_call = :elixir_quote.has_unquotes(call)
     unquoted_expr = :elixir_quote.has_unquotes(expr)
-    escaped_call = :elixir_quote.escape(call, :none, true)
 
-    escaped_expr =
-      case unquoted_expr do
+    store =
+      case unquoted_expr or unquoted_call do
         true ->
-          :elixir_quote.escape(expr, :none, true)
+          :elixir_quote.escape({call, expr}, :none, true)
 
         false ->
           key = :erlang.unique_integer()
-          :elixir_module.write_cache(module, key, expr)
-          quote(do: :elixir_module.read_cache(unquote(module), unquote(key)))
+          :elixir_module.write_cache(module, key, {call, expr})
+          key
       end
 
-    # Do not check clauses if any expression was unquoted
-    check_clauses = not (unquoted_expr or unquoted_call)
     pos = :elixir_locals.cache_env(env)
 
     quote do
-      :elixir_def.store_definition(
-        unquote(kind),
-        unquote(check_clauses),
-        unquote(escaped_call),
-        unquote(escaped_expr),
-        unquote(pos)
-      )
+      :elixir_def.store_definition(unquote(kind), unquote(store), unquote(pos))
     end
   end
 

lib/elixir/src/elixir_bootstrap.erl

@@ -35,12 +35,22 @@
    {defmodule, 2},
    {defp, 2}].
 
-define({Line, _S, E}, Kind, Call, Expr) ->
+define({Line, _S, #{module := Module} = E}, Kind, Call, Expr) ->
   UC = elixir_quote:has_unquotes(Call),
   UE = elixir_quote:has_unquotes(Expr),
-  EscapedCall = elixir_quote:escape(Call, none, true),
-  EscapedExpr = elixir_quote:escape(Expr, none, true),
-  Args = [Kind, not(UC or UE), EscapedCall, EscapedExpr, elixir_locals:cache_env(E#{line := Line})],
+
+  Store =
+    case UC or UE of
+      true ->
+        elixir_quote:escape({Call, Expr}, none, true);
+
+      false ->
+        Key = erlang:unique_integer(),
+        elixir_module:write_cache(Module, Key, {Call, Expr}),
+        Key
+    end,
+
+  Args = [Kind, Store, elixir_locals:cache_env(E#{line := Line})],
   {{'.', [], [elixir_def, store_definition]}, [], Args}.
 
 unless_loaded(Fun, Args, Callback) ->

lib/elixir/src/elixir_def.erl

@@ -1,7 +1,7 @@
 % Holds the logic responsible for function definitions (def(p) and defmacro(p)).
 -module(elixir_def).
 -export([setup/1, reset_last/1, local_for/5, external_for/5,
-  take_definition/2, store_definition/5, store_definition/9,
+  take_definition/2, store_definition/3, store_definition/9,
   fetch_definitions/2, format_error/1]).
 -include("elixir.hrl").
 -define(last_def, {elixir, last_def}).
@@ -127,8 +127,15 @@ head_and_definition_meta(false, _Meta, _HeadDefaults, _All) ->
 
 %% Section for storing definitions
 
-store_definition(Kind, CheckClauses, Call, Body, Pos) ->
-  #{line := Line} = E = elixir_locals:get_cached_env(Pos),
+store_definition(Kind, {Call, Body}, Pos) ->
+  E = elixir_locals:get_cached_env(Pos),
+  store_definition(Kind, false, Call, Body, E);
+store_definition(Kind, Key, Pos) ->
+  #{module := Module} = E = elixir_locals:get_cached_env(Pos),
+  {Call, Body} = elixir_module:read_cache(Module, Key),
+  store_definition(Kind, true, Call, Body, E).
+
+store_definition(Kind, CheckClauses, Call, Body, #{line := Line} = E) ->
   {NameAndArgs, Guards} = elixir_utils:extract_guards(Call),
 
   {Name, Args} = case NameAndArgs of