aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src/beam_dead.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-07-14 11:22:31 +0200
committerErlang/OTP <[email protected]>2016-07-14 11:22:31 +0200
commite84614bb7454087cf5c249a470d2dc47b05f6d28 (patch)
tree8ec9fbe3ef7c952718b0aae4c34f2c171cc5614b /lib/compiler/src/beam_dead.erl
parentc7d729da231c40a656725f2e9bb84c40a6bddc7d (diff)
parent8fa0a2d96e3d5c89f68b8724a125e11fe04e993d (diff)
downloadotp-e84614bb7454087cf5c249a470d2dc47b05f6d28.tar.gz
otp-e84614bb7454087cf5c249a470d2dc47b05f6d28.tar.bz2
otp-e84614bb7454087cf5c249a470d2dc47b05f6d28.zip
Merge branch 'egil/compiler/fix-literal-binary-match/ERL-190/OTP-13738' into maint-19
* egil/compiler/fix-literal-binary-match/ERL-190/OTP-13738: Update primary bootstrap Revert "beam_dead: Improve optimization of literal binary matching" compiler: Test literal binary matching
Diffstat (limited to 'lib/compiler/src/beam_dead.erl')
-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) ->