Merge branch 'bjorn/compiler/match-fail/OTP-9842' into maint

* bjorn/compiler/match-fail/OTP-9842:
  Add the beam_except pass to optimize exceptions
  Eliminate the match_fail primop in v3_kernel and later passes

1 files changed, 18 insertions, 2 deletions

diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index 9b414cade6..5e13a93c52 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -190,6 +190,15 @@ silly_coverage(Config) when is_list(Config) ->
 		     {label,2}|non_proper_list]}],99},
     ?line expect_error(fun() -> beam_block:module(BlockInput, []) end),
 
+    %% beam_except
+    ExceptInput = {?MODULE,[{foo,0}],[],
+		   [{function,foo,0,2,
+		     [{label,1},
+		      {line,loc},
+		      {func_info,{atom,?MODULE},{atom,foo},0},
+		      {label,2}|non_proper_list]}],99},
+    expect_error(fun() -> beam_except:module(ExceptInput, []) end),
+
     %% beam_bool
     BoolInput = {?MODULE,[{foo,0}],[],
 		  [{function,foo,0,2,
@@ -253,8 +262,15 @@ expect_error(Fun) ->
 	    io:format("~p", [Any]),
 	    ?t:fail(call_was_supposed_to_fail)
     catch
-	_:_ ->
-	    io:format("~p\n", [erlang:get_stacktrace()])
+	Class:Reason ->
+	    Stk = erlang:get_stacktrace(),
+	    io:format("~p:~p\n~p\n", [Class,Reason,Stk]),
+	    case {Class,Reason} of
+		{error,undef} ->
+		    ?t:fail(not_supposed_to_fail_with_undef);
+		{_,_} ->
+		    ok
+	    end
     end.
 
 confused_literals(Config) when is_list(Config) ->