aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-07-12 16:12:50 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-07-12 16:12:50 +0200
commitdd1162846eb7942243ea285310cf100b6959a845 (patch)
tree1f847fd47cbf10127cda017b83f480a10e4894cb
parent8b83bc0b54b728cf9179ef3fa0e7610f99f7a6a4 (diff)
downloadotp-dd1162846eb7942243ea285310cf100b6959a845.tar.gz
otp-dd1162846eb7942243ea285310cf100b6959a845.tar.bz2
otp-dd1162846eb7942243ea285310cf100b6959a845.zip
Revert "beam_dead: Improve optimization of literal binary matching"
This reverts commit 105c5b0071056dc062797e58772e098d2a3a4627.
-rw-r--r--lib/compiler/src/beam_dead.erl7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/compiler/src/beam_dead.erl b/lib/compiler/src/beam_dead.erl
index b01f58f683..6f6d742293 100644
--- a/lib/compiler/src/beam_dead.erl
+++ b/lib/compiler/src/beam_dead.erl
@@ -272,17 +272,14 @@ backward([{jump,{f,To}}=J|[{bif,Op,_,Ops,Reg}|Is]=Is0], D, Acc) ->
catch
throw:not_possible -> backward(Is0, D, [J|Acc])
end;
-backward([{test,bs_start_match2,F,Live,[R,_]=Args,Ctxt}|Is], D,
+backward([{test,bs_start_match2,F,_,[R,_],Ctxt}=I|Is], D,
[{test,bs_match_string,F,[Ctxt,Bs]},
{test,bs_test_tail2,F,[Ctxt,0]}|Acc0]=Acc) ->
- {f,To0} = F,
- To = shortcut_bs_start_match(To0, R, D),
case beam_utils:is_killed(Ctxt, Acc0, D) of
true ->
- Eq = {test,is_eq_exact,{f,To},[R,{literal,Bs}]},
+ Eq = {test,is_eq_exact,F,[R,{literal,Bs}]},
backward(Is, D, [Eq|Acc0]);
false ->
- I = {test,bs_start_match2,{f,To},Live,Args,Ctxt},
backward(Is, D, [I|Acc])
end;
backward([{test,bs_start_match2,{f,To0},Live,[Src|_]=Info,Dst}|Is], D, Acc) ->