aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src/beam_ssa_bsm.erl
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-07-03 15:07:15 +0200
committerJohn Högberg <[email protected]>2019-07-03 15:22:59 +0200
commita8461ffed773c4ff80779c16a3637ba3d2e915fd (patch)
tree7cfc0fa80571001ade1d8e9ac83512a90118aa1a /lib/compiler/src/beam_ssa_bsm.erl
parent4319a7f8bc93388ec540e954eb9bb73ea1eec4ef (diff)
downloadotp-a8461ffed773c4ff80779c16a3637ba3d2e915fd.tar.gz
otp-a8461ffed773c4ff80779c16a3637ba3d2e915fd.tar.bz2
otp-a8461ffed773c4ff80779c16a3637ba3d2e915fd.zip
beam_ssa_bsm: Leave ?BADARG_BLOCK alone when cloning fail path
Diffstat (limited to 'lib/compiler/src/beam_ssa_bsm.erl')
-rw-r--r--lib/compiler/src/beam_ssa_bsm.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/compiler/src/beam_ssa_bsm.erl b/lib/compiler/src/beam_ssa_bsm.erl
index 382e6f635e..1ac9e6a3bb 100644
--- a/lib/compiler/src/beam_ssa_bsm.erl
+++ b/lib/compiler/src/beam_ssa_bsm.erl
@@ -683,8 +683,12 @@ aca_copy_successors(Lbl0, Blocks0, Counter0) ->
Lbl = maps:get(Lbl0, BRs),
{Lbl, Blocks, Counter}.
+aca_cs_build_brs([?BADARG_BLOCK=Lbl | Path], Counter, Acc) ->
+ %% ?BADARG_BLOCK is a marker and not an actual block, so renaming it will
+ %% break exception handling.
+ aca_cs_build_brs(Path, Counter, Acc#{ Lbl => Lbl });
aca_cs_build_brs([Lbl | Path], Counter0, Acc) ->
- aca_cs_build_brs(Path, Counter0 + 1, maps:put(Lbl, Counter0, Acc));
+ aca_cs_build_brs(Path, Counter0 + 1, Acc#{ Lbl => Counter0 });
aca_cs_build_brs([], Counter, Acc) ->
{Acc, Counter}.