3 files changed, 65 insertions, 71 deletions
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/no_5.erl b/lib/compiler/test/receive_SUITE_data/ref_opt/no_5.erl
new file mode 100644
index 0000000000..4fbde3a83d
--- /dev/null
+++ b/lib/compiler/test/receive_SUITE_data/ref_opt/no_5.erl
@@ -0,0 +1,38 @@
+-module(no_5).
+-compile([export_all,nowarn_export_all]).
+
+?MODULE() ->
+    ok.
+
+%% Nested receives were not handled properly.
+
+confusing_recv_mark(Pid) ->
+    Ref = make_ref(),
+    %% There would be a recv_mark here.
+    MRef = erlang:monitor(process, Pid),
+    receive
+        Ref ->
+            %% And a recv_set here.
+            receive
+                MRef -> gurka
+            end;
+        MRef ->
+            gaffel
+    end.
+
+%% The optimization could potentially be improved to
+%% handle matching of multiple refs, like this:
+
+proper_recv_mark(Pid) ->
+    %% Place the recv_mark before the creation of both refs.
+    Ref = make_ref(),
+    MRef = erlang:monitor(process, Pid),
+    %% Place the recv_set here.
+    receive
+        Ref ->
+            receive
+                MRef -> gurka
+            end;
+        MRef ->
+            gaffel
+    end.
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.S b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.S
deleted file mode 100644
index fd14228135..0000000000
--- a/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.S
+++ /dev/null
@@ -1,71 +0,0 @@
-{module, yes_14}.  %% version = 0
-
-{exports, [{f,2},{module_info,0},{module_info,1},{yes_14,0}]}.
-
-{attributes, []}.
-
-{labels, 12}.
-
-
-{function, yes_14, 0, 2}.
-  {label,1}.
-    {func_info,{atom,yes_14},{atom,yes_14},0}.
-  {label,2}.
-    {move,{atom,ok},{x,0}}.
-    return.
-
-
-{function, f, 2, 4}.
-  {label,3}.
-    {func_info,{atom,yes_14},{atom,f},2}.
-  {label,4}.
-    {allocate_heap,2,3,2}.
-    {move,{x,0},{y,1}}.
-    {put_tuple,2,{y,0}}.
-    {put,{atom,data}}.
-    {put,{x,1}}.
-    {call_ext,0,{extfunc,erlang,make_ref,0}}. % Ref in [x0]
-    {test_heap,4,1}.
-    {put_tuple,3,{x,1}}.
-    {put,{atom,request}}.
-    {put,{x,0}}.
-    {put,{y,0}}.
-    {move,{x,0},{y,0}}. % Ref in [x0,y0]
-    {move,{y,1},{x,0}}. % Ref in [y0]
-    {kill,{y,1}}.
-    send.
-    {move,{y,0},{x,0}}. % Ref in [x0,y0]
-    {move,{x,0},{y,1}}. % Ref in [x0,y0,y1]
-  {label,5}.
-    {loop_rec,{f,7},{x,0}}. % Ref in [y0,y1]
-    {test,is_tuple,{f,6},[{x,0}]}.
-    {test,test_arity,{f,6},[{x,0},2]}.
-    {get_tuple_element,{x,0},0,{x,1}}.
-    {get_tuple_element,{x,0},1,{x,2}}.
-    {test,is_eq_exact,{f,6},[{x,1},{atom,reply}]}.
-    {test,is_eq_exact,{f,6},[{x,2},{y,1}]}.
-    remove_message.
-    {move,{atom,ok},{x,0}}.
-    {deallocate,2}.
-    return.
-  {label,6}.
-    {loop_rec_end,{f,5}}.
-  {label,7}.
-    {wait,{f,5}}.
-
-
-{function, module_info, 0, 9}.
-  {label,8}.
-    {func_info,{atom,yes_14},{atom,module_info},0}.
-  {label,9}.
-    {move,{atom,yes_14},{x,0}}.
-    {call_ext_only,1,{extfunc,erlang,get_module_info,1}}.
-
-
-{function, module_info, 1, 11}.
-  {label,10}.
-    {func_info,{atom,yes_14},{atom,module_info},1}.
-  {label,11}.
-    {move,{x,0},{x,1}}.
-    {move,{atom,yes_14},{x,0}}.
-    {call_ext_only,2,{extfunc,erlang,get_module_info,2}}.
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.erl b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.erl
new file mode 100644
index 0000000000..aa47c02af9
--- /dev/null
+++ b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.erl
@@ -0,0 +1,27 @@
+-module(yes_14).
+-compile(export_all).
+
+?MODULE() ->
+    ok.
+
+do_call(Process, Request) ->
+    Mref = erlang:monitor(process, Process),
+    Process ! Request,
+    Local = case node(Process) of
+                Node when Node =:= node() -> true;
+                _Node -> false
+            end,
+    id(Local),
+    receive
+	{X,Y,Z} when Mref =/= X, Z =:= 42, Mref =:= Y ->
+	    error;
+	{X,Y,_} when Mref =/= X, Mref =:= Y ->
+	    error;
+	{Mref, Reply} ->
+	    erlang:demonitor(Mref, [flush]),
+	    {ok, Reply};
+	{'DOWN', Mref, _, _, _} ->
+	    error
+    end.
+
+id(I) -> I.