Continue raising on unbound __CALLER__

Author: José Valim

lib/elixir/src/elixir.hrl

@@ -5,7 +5,6 @@
 -define(var_context, ?MODULE).
 
 -record(elixir_erl, {
-  def=nil,                 %% the definition kind (def, defp, etc)
   context=nil,             %% can be match, guards or nil
   extra=nil,               %% extra information about the context, like pin_guard and map_key
   caller=false,            %% when true, it means caller was invoked

lib/elixir/src/elixir_erl.erl

@@ -2,7 +2,7 @@
 -module(elixir_erl).
 -export([elixir_to_erl/1, definition_to_anonymous/5, compile/1,
          get_ann/1, remote/4, add_beam_chunks/2, debug_info/4,
-         definition_scope/3]).
+         definition_scope/2]).
 -include("elixir.hrl").
 
 %% TODO: Remove extra chunk functionality when OTP 20+.
@@ -137,14 +137,14 @@ elixir_to_erl_cons2([], Acc) ->
 
 %% Returns a definition scope for translation.
 
-definition_scope(Meta, Kind, File) ->
+definition_scope(Meta, File) ->
   %% TODO: We only need to do this dance because some
   %% warnings are raised in elixir_erl_pass. Once we remove
   %% all warnings from the Erlang pass, we can remove the
   %% file field from #elixir_erl and clean up the code.
   case lists:keyfind(location, 1, Meta) of
-    {location, {F, _}} -> #elixir_erl{def=Kind,file=F};
-    false -> #elixir_erl{def=Kind,file=File}
+    {location, {F, _}} -> #elixir_erl{file=F};
+    false -> #elixir_erl{file=File}
   end.
 
 %% Compilation hook.
@@ -234,7 +234,7 @@ translate_definition(Kind, Meta, File, {Name, Arity}, Clauses) ->
   end.
 
 translate_clause(Kind, {Meta, Args, Guards, Body}, File) ->
-  S = definition_scope(Meta, Kind, File),
+  S = definition_scope(Meta, File),
 
   {TClause, TS} = elixir_erl_clauses:clause(Meta,
                     fun elixir_erl_pass:translate_args/2, Args, Body, Guards, S),

lib/elixir/src/elixir_erl_pass.erl

@@ -38,13 +38,8 @@ translate({'__block__', Meta, Args}, S) when is_list(Args) ->
 
 %% Compilation environment macros
 
-translate({'__CALLER__', Meta, Atom}, #elixir_erl{def=Kind}=S) when is_atom(Atom) ->
-  if
-    Kind == defmacro; Kind == defmacrop ->
-      {{var, ?ann(Meta), '__CALLER__'}, S#elixir_erl{caller=true}};
-    true ->
-      {{atom, ?ann(Meta), nil}, S}
-  end;
+translate({'__CALLER__', Meta, Atom}, S) when is_atom(Atom) ->
+  {{var, ?ann(Meta), '__CALLER__'}, S#elixir_erl{caller=true}};
 
 translate({'super', Meta, [{Kind, Name} | Args]}, S) ->
   %% In the expanded AST, super is used to invoke a function

lib/elixir/test/elixir/kernel/errors_test.exs

@@ -15,6 +15,12 @@ defmodule Kernel.ErrorsTest do
       '[foo: \u200B]\noops'
   end
 
+  test "invalid __CALLER__" do
+    assert_compile_fail CompileError,
+      "nofile:1: variable '__CALLER__' is unbound",
+      'defmodule Sample do def hello do __CALLER__ end end'
+  end
+
   test "invalid quoted token" do
     assert_compile_fail SyntaxError,
       "nofile:1: syntax error before: \"world\"",

lib/elixir/test/elixir/kernel/expansion_test.exs

@@ -169,11 +169,6 @@ defmodule Kernel.ExpansionTest do
       assert expand(quote do: __DIR__) == __DIR__
     end
 
-    test "__CALLER__" do
-      assert __CALLER__ == nil
-      assert expand(quote do: __CALLER__) == quote do: __CALLER__
-    end
-
     test "__ENV__" do
       env = %{__ENV__ | line: 0}
       assert expand_env(quote(do: __ENV__), env) ==