Represent the 'send' instruction as a call_ext/2 instruction

Somewhat reduce code bloat.

6 files changed, 10 insertions, 21 deletions

diff --git a/lib/compiler/src/beam_a.erl b/lib/compiler/src/beam_a.erl
index b7ed78c977..ed594bb0d4 100644
--- a/lib/compiler/src/beam_a.erl
+++ b/lib/compiler/src/beam_a.erl
@@ -78,4 +78,6 @@ rename_instr({select_val=I,Reg,Fail,{list,List}}) ->
     {select,I,Reg,Fail,List};
 rename_instr({select_tuple_arity=I,Reg,Fail,{list,List}}) ->
     {select,I,Reg,Fail,List};
+rename_instr(send) ->
+    {call_ext,2,send};
 rename_instr(I) -> I.
diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl
index 2f4649dac7..ed0abd6fb9 100644
--- a/lib/compiler/src/beam_bsm.erl
+++ b/lib/compiler/src/beam_bsm.erl
@@ -222,10 +222,10 @@ btb_reaches_match_2([{call_fun,Live}=I|Is], Regs, D) ->
     btb_call(Live, I, Regs, Is, D);
 btb_reaches_match_2([{make_fun2,_,_,_,Live}|Is], Regs, D) ->
     btb_call(Live, make_fun2, Regs, Is, D);
-btb_reaches_match_2([{call_ext,Arity,{extfunc,Mod,Name,Arity}=Func}|Is], Regs0, D) ->
+btb_reaches_match_2([{call_ext,Arity,Func}=I|Is], Regs0, D) ->
     %% Allow us scanning beyond the call in case the match
     %% context is saved on the stack.
-    case erl_bifs:is_exit_bif(Mod, Name, Arity) of
+    case beam_jump:is_exit_instruction(I) of
 	false ->
 	    btb_call(Arity, Func, Regs0, Is, D);
 	true ->
diff --git a/lib/compiler/src/beam_receive.erl b/lib/compiler/src/beam_receive.erl
index b19a9560b7..fe95a7e35b 100644
--- a/lib/compiler/src/beam_receive.erl
+++ b/lib/compiler/src/beam_receive.erl
@@ -188,8 +188,6 @@ opt_update_regs({call_fun,_}, R, L) ->
     {regs_kill_not_live(0, R),L};
 opt_update_regs({kill,Y}, R, L) ->
     {regs_kill([Y], R),L};
-opt_update_regs(send, R, L) ->
-    {regs_kill_not_live(0, R),L};
 opt_update_regs({'catch',_,{f,Lbl}}, R, L) ->
     {R,gb_sets:add(Lbl, L)};
 opt_update_regs({catch_end,_}, R, L) ->
diff --git a/lib/compiler/src/beam_trim.erl b/lib/compiler/src/beam_trim.erl
index ceeed603ab..05ebe917d9 100644
--- a/lib/compiler/src/beam_trim.erl
+++ b/lib/compiler/src/beam_trim.erl
@@ -182,8 +182,6 @@ remap([{bs_put=Op,Fail,Info,Ss}|Is], Map, Acc) ->
     remap(Is, Map, [I|Acc]);
 remap([{kill,Y}|T], Map, Acc) ->
     remap(T, Map, [{kill,Map(Y)}|Acc]);
-remap([send=I|T], Map, Acc) ->
-    remap(T, Map, [I|Acc]);
 remap([{make_fun2,_,_,_,_}=I|T], Map, Acc) ->
     remap(T, Map, [I|Acc]);
 remap([{deallocate,N}|Is], Map, Acc) ->
@@ -260,8 +258,8 @@ frame_size([{call_fun,_}|Is], Safe) ->
     frame_size(Is, Safe);
 frame_size([{call,_,_}|Is], Safe) ->
     frame_size(Is, Safe);
-frame_size([{call_ext,A,{extfunc,M,F,A}}|Is], Safe) ->
-    case erl_bifs:is_exit_bif(M, F, A) of
+frame_size([{call_ext,_,_}=I|Is], Safe) ->
+    case beam_jump:is_exit_instruction(I) of
 	true -> throw(not_possible);
 	false -> frame_size(Is, Safe)
     end;
@@ -281,8 +279,6 @@ frame_size([{bs_put,{f,L},_,_}|Is], Safe) ->
     frame_size_branch(L, Is, Safe);
 frame_size([{kill,_}|Is], Safe) ->
     frame_size(Is, Safe);
-frame_size([send|Is], Safe) ->
-    frame_size(Is, Safe);
 frame_size([{make_fun2,_,_,_,_}|Is], Safe) ->
     frame_size(Is, Safe);
 frame_size([{deallocate,N}|_], _) -> N;
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index 152c242a11..c27e82485d 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -345,15 +345,14 @@ check_liveness(R, [{call,Live,_}|Is], St) ->
 	{x,_} -> {killed,St};
 	{y,_} -> check_liveness(R, Is, St)
     end;
-check_liveness(R, [{call_ext,Live,Func}|Is], St) ->
+check_liveness(R, [{call_ext,Live,_}=I|Is], St) ->
     case R of
 	{x,X} when X < Live ->
 	    {used,St};
 	{x,_} ->
 	    {killed,St};
 	{y,_} ->
-	    {extfunc,Mod,Name,Arity} = Func,
-	    case erl_bifs:is_exit_bif(Mod, Name, Arity) of
+	    case beam_jump:is_exit_instruction(I) of
 		false ->
 		    check_liveness(R, Is, St);
 		true ->
@@ -381,12 +380,6 @@ check_liveness(R, [{apply,Args}|Is], St) ->
     end;
 check_liveness(R, [{apply_last,Args,_}|_], St) ->
     check_liveness_live_ret(R, Args+2, St);
-check_liveness(R, [send|Is], St) ->
-    case R of
-	{x,X} when X < 2 -> {used,St};
-	{x,_} -> {killed,St};
-	{y,_} -> check_liveness(R, Is, St)
-    end;
 check_liveness({x,R}, [{'%live',Live}|Is], St) ->
     if
 	R < Live -> check_liveness(R, Is, St);
@@ -741,8 +734,6 @@ live_opt([{call_ext_only,Arity,_}=I|Is], _, D, Acc) ->
     live_opt(Is, live_call(Arity), D, [I|Acc]);
 live_opt([{make_fun2,_,_,_,Arity}=I|Is], _, D, Acc) ->
     live_opt(Is, live_call(Arity), D, [I|Acc]);
-live_opt([send=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(2), D, [I|Acc]);
 live_opt([{test,_,Fail,Ss}=I|Is], Regs0, D, Acc) ->
     Regs1 = x_live(Ss, Regs0),
     Regs = live_join_label(Fail, D, Regs1),
diff --git a/lib/compiler/src/beam_z.erl b/lib/compiler/src/beam_z.erl
index f0e640c84a..f45f7abf38 100644
--- a/lib/compiler/src/beam_z.erl
+++ b/lib/compiler/src/beam_z.erl
@@ -60,4 +60,6 @@ undo_rename({bs_init,_,bs_init_writable=I,_,_,_}) ->
     I;
 undo_rename({select,I,Reg,Fail,List}) ->
     {I,Reg,Fail,{list,List}};
+undo_rename({call_ext,2,send}) ->
+    send;
 undo_rename(I) -> I.