Address compilation on Erlang/OTP 24

Author: josevalim

lib/elixir/src/elixir.erl

@@ -358,7 +358,7 @@ eval_forms(Tree, Binding, OrigE, Opts) ->
           _ -> [Erl]
         end,
 
-      ExternalHandler = eval_external_handler(),
+      ExternalHandler = {value, fun ?MODULE:eval_external_handler/3},
 
       {value, Value, NewBinding} =
         try
@@ -387,8 +387,6 @@ eval_forms(Tree, Binding, OrigE, Opts) ->
 
 %% TODO: Remove conditional once we require Erlang/OTP 25+.
 -if(?OTP_RELEASE >= 25).
-eval_external_handler() -> {value, fun ?MODULE:eval_external_handler/3}.
-
 eval_external_handler(Ann, FunOrModFun, Args) ->
   try
     case FunOrModFun of
@@ -452,7 +450,11 @@ drop_common([], [{?MODULE, _, _, _} | T2], _ToDrop) -> T2;
 drop_common([], [_ | T2], true) -> T2;
 drop_common([], T2, _) -> T2.
 -else.
-  eval_external_handler() -> none.
+eval_external_handler(_Ann, FunOrModFun, Args) ->
+  case FunOrModFun of
+    {Mod, Fun} -> apply(Mod, Fun, Args);
+    Fun -> apply(Fun, Args)
+  end.
 -endif.
 
 %% Converts a quoted expression to Erlang abstract format