Improve stacktrace reporting

Author: josevalim

lib/elixir/src/elixir.erl

@@ -401,10 +401,8 @@ eval_external_handler(Ann, FunOrModFun, Args) ->
       %% Add file+line information at the bottom
       Bottom =
         case erlang:get(?elixir_eval_env) of
-          #{file := File} ->
-            [{elixir_eval, '__FILE__', 1,
-             [{file, elixir_utils:characters_to_list(File)}, {line, erl_anno:line(Ann)}]}];
-
+          #{'__struct__' := 'Elixir.Macro.Env'} = E ->
+            'Elixir.Macro.Env':stacktrace(E#{line := erl_anno:line(Ann)});
           _ ->
             []
         end,

lib/elixir/src/elixir_compiler.erl

@@ -54,7 +54,14 @@ interpret(Quoted, ArgsList, #{line := Line} = E) ->
   ListBinding = lists:zipwith(fun({_, Var}, Arg) -> {Var, Arg} end, Vars, ArgsList),
   Binding = maps:from_list(ListBinding),
 
-  {value, Result, _} = elixir:erl_eval(ErlExprs, Binding, E),
+  {value, Result, _} =
+    try
+      elixir:erl_eval(ErlExprs, Binding, E)
+    catch
+      Kind:Reason:Stacktrace ->
+        erlang:raise(Kind, Reason, Stacktrace ++ 'Elixir.Macro.Env':stacktrace(E))
+    end,
+
   {Result, SE, EE}.
 
 compile(Quoted, ArgsList, CompilerOpts, #{line := Line} = E) ->