2 files changed, 49 insertions, 0 deletions

diff --git a/lib/compiler/test/beam_except_SUITE.erl b/lib/compiler/test/beam_except_SUITE.erl
index 67947dc292..f52239f2a8 100644
--- a/lib/compiler/test/beam_except_SUITE.erl
+++ b/lib/compiler/test/beam_except_SUITE.erl
@@ -72,11 +72,25 @@ bs_get_tail(Config) ->
      {function_clause,
       [{?MODULE,bs_get_tail_1,[<<>>,0,0,Config],_}|_]}} =
         (catch bs_get_tail_1(id(<<>>), 0, 0, Config)),
+
+    ok = bs_get_tail_2(<<"W">>, <<"X">>, <<"Z">>),
+    ok = bs_get_tail_2(<<"M">>, <<"X">>, <<"Z">>),
+    {'EXIT',
+     {function_clause,
+      [{?MODULE,do_get_bs_tail_2,[<<"A">>,<<"B">>,[],<<"C">>],_}|_]}} =
+        (catch bs_get_tail_2(<<"A">>, <<"B">>, <<"C">>)),
+
     ok.
 
 bs_get_tail_1(<<_:32, Rest/binary>>, Z1, Z2, F1) ->
     {Rest,Z1,Z2,F1}.
 
+bs_get_tail_2(A, B, C) ->
+    do_get_bs_tail_2(A, B, [], C).
+
+do_get_bs_tail_2(<<"W">>, <<"X">>, _, <<"Z">>) -> ok;
+do_get_bs_tail_2(<<"M">>, <<"X">>, _, <<"Z">>) -> ok.
+
 coverage(_) ->
     File = {file,"fake.erl"},
     ok = fc(a),
diff --git a/lib/compiler/test/receive_SUITE.erl b/lib/compiler/test/receive_SUITE.erl
index 752491f0f8..8cd864c59e 100644
--- a/lib/compiler/test/receive_SUITE.erl
+++ b/lib/compiler/test/receive_SUITE.erl
@@ -431,6 +431,20 @@ elusive_common_exit(_Config) ->
     self() ! {1, a},
     self() ! {2, b},
     {[z], [{2,b},{1,a}]} = elusive_loop([x,y,z], 2, []),
+
+    CodeServer = whereis(code_server),
+    Self = self(),
+    Self ! {Self, abc},
+    Self ! {CodeServer, []},
+    Self ! {Self, other},
+    try elusive2([]) of
+        Unexpected ->
+            ct:fail("Expected an exception; got ~p\n", [Unexpected])
+    catch
+        throw:[other, CodeServer, Self] ->
+            ok
+    end,
+
     ok.
 
 elusive_loop(List, 0, Results) ->
@@ -449,4 +463,25 @@ elusive_loop(List, ToReceive, Results) ->
     %% that it would not insert all necessary copy instructions.
     elusive_loop(RemList, ToReceive-1, [Result | Results]).
 
+
+elusive2(Acc) ->
+    receive
+        {Pid, abc} ->
+            ok;
+        {Pid, []} ->
+            ok;
+        {Pid, Res} ->
+            %% beam_ssa_pre_codegen:find_loop_exit/2 attempts to find
+            %% the first block of the common code after the receive
+            %% statement. It used to only look at the two last clauses
+            %% of the receive. In this function, the last two clauses
+            %% don't have any common block, so it would be assumed
+            %% that there was no common block for any of the
+            %% clauses. That would mean that copy instructions would
+            %% not be inserted as needed.
+            throw([Res | Acc])
+    end,
+    %% Common code.
+    elusive2([Pid | Acc]).
+
 id(I) -> I.