Merge branch 'bjorn/compiler/badfun-literal/ERL-138/OTP-13552'

* bjorn/compiler/badfun-literal/ERL-138/OTP-13552:
  sys_core_fold: Don't generated failing calls such as 3(4)
  fun_SUITE: Test for failing calls to funs

2 files changed, 41 insertions, 6 deletions

diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index b5b8d8a8ec..dbc27db377 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -374,10 +374,21 @@ expr(#c_receive{clauses=Cs0,timeout=T0,action=A0}=Recv, Ctxt, Sub) ->
     T1 = expr(T0, value, Sub),
     A1 = body(A0, Ctxt, Sub),
     Recv#c_receive{clauses=Cs1,timeout=T1,action=A1};
-expr(#c_apply{op=Op0,args=As0}=App, _, Sub) ->
+expr(#c_apply{anno=Anno,op=Op0,args=As0}=App, _, Sub) ->
     Op1 = expr(Op0, value, Sub),
     As1 = expr_list(As0, value, Sub),
-    App#c_apply{op=Op1,args=As1};
+    case Op1 of
+	#c_var{} ->
+	    App#c_apply{op=Op1,args=As1};
+	_ ->
+	    add_warning(App, invalid_call),
+	    Err = #c_call{anno=Anno,
+			  module=#c_literal{val=erlang},
+			  name=#c_literal{val=error},
+			  args=[#c_tuple{es=[#c_literal{val='badfun'},
+					     Op1]}]},
+	    make_effect_seq(As1++[Err], Sub)
+    end;
 expr(#c_call{module=M0,name=N0}=Call0, Ctxt, Sub) ->
     M1 = expr(M0, value, Sub),
     N1 = expr(N0, value, Sub),
@@ -3395,6 +3406,8 @@ format_error({no_effect,{erlang,F,A}}) ->
 format_error(result_ignored) ->
     "the result of the expression is ignored "
 	"(suppress the warning by assigning the expression to the _ variable)";
+format_error(invalid_call) ->
+    "invalid function call";
 format_error(useless_building) ->
     "a term is constructed, but never used";
 format_error(bin_opt_alias) ->
diff --git a/lib/compiler/test/fun_SUITE.erl b/lib/compiler/test/fun_SUITE.erl
index 17ff8601d9..16474adf5b 100644
--- a/lib/compiler/test/fun_SUITE.erl
+++ b/lib/compiler/test/fun_SUITE.erl
@@ -22,7 +22,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 test1/1,overwritten_fun/1,otp_7202/1,bif_fun/1,
-         external/1,eep37/1,eep37_dup/1,badarity/1]).
+         external/1,eep37/1,eep37_dup/1,badarity/1,badfun/1]).
 
 %% Internal exports.
 -export([call_me/1,dup1/0,dup2/0]).
@@ -33,10 +33,12 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [test1,overwritten_fun,otp_7202,bif_fun,external,eep37,eep37_dup,badarity].
+    [{group,p}].
 
-groups() -> 
-    [].
+groups() ->
+    [{p,[parallel],
+      [test1,overwritten_fun,otp_7202,bif_fun,external,eep37,
+       eep37_dup,badarity,badfun]}].
 
 init_per_suite(Config) ->
     Config.
@@ -221,5 +223,25 @@ badarity(Config) when is_list(Config) ->
     {'EXIT',{{badarity,{_,[]}},_}} = (catch (fun badarity/1)()),
     ok.
 
+badfun(_Config) ->
+    X = not_a_fun,
+    expect_badfun(42, catch 42()),
+    expect_badfun(42.0, catch 42.0(1)),
+    expect_badfun(X, catch X()),
+    expect_badfun(X, catch X(1)),
+    Len = length(atom_to_list(X)),
+    expect_badfun(Len, catch begin length(atom_to_list(X)) end(1)),
+
+    expect_badfun(42, catch 42(put(?FUNCTION_NAME, yes))),
+    yes = erase(?FUNCTION_NAME),
+
+    expect_badfun(X, catch X(put(?FUNCTION_NAME, of_course))),
+    of_course = erase(?FUNCTION_NAME),
+
+    ok.
+
+expect_badfun(Term, Exit) ->
+    {'EXIT',{{badfun,Term},_}} = Exit.
+
 id(I) ->
     I.