Merge branch 'bjorn/compiler/crash/OTP-10794'

* bjorn/compiler/crash/OTP-10794:
  Test setelement(1, not_a_tuple, NewValue)
  Fix crash in the compiler when compiling element(2, not_a_tuple)

2 files changed, 8 insertions, 0 deletions

diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index d5fec0c869..07b054c5d7 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -1272,6 +1272,8 @@ eval_element(Call, #c_literal{val=Pos}, #c_var{name=V}, Types)
 		true ->
 		    eval_failure(Call, badarg)
 	    end;
+	{ok,_} ->
+	    eval_failure(Call, badarg);
 	error ->
 	    Call
     end;
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index 53a65d8d17..c2a592f699 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -69,6 +69,9 @@ t_element(Config) when is_list(Config) ->
     ?line {'EXIT',{badarg,_}} = (catch element(5, {a,b,c,d})),
     ?line {'EXIT',{badarg,_}} = (catch element(5, {a,b,X,d})),
     ?line {'EXIT',{badarg,_}} = (catch element(5.0, {a,b,X,d})),
+    {'EXIT',{badarg,_}} = (catch element(2, not_a_tuple)),
+    {'EXIT',{badarg,_}} = (catch element(2, [])),
+    {'EXIT',{badarg,_}} = (catch element(2, Tuple == 3)),
     case id({a,b,c}) of
 	{_,_,_}=Tup ->
 	    ?line {'EXIT',{badarg,_}} = (catch element(4, Tup))
@@ -89,6 +92,9 @@ setelement(Config) when is_list(Config) ->
 
     ?line {'EXIT',{badarg,_}} = (catch setelement_crash({a,b,c,d,e,f})),
     ?line error = setelement_crash_2({a,b,c,d,e,f}, <<42>>),
+
+    {'EXIT',{badarg,_}} = (catch setelement(1, not_a_tuple, New)),
+
     ok.
 
 setelement_crash(Tuple) ->