diff options
| author | John Högberg <[email protected]> | 2019-07-04 14:46:08 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-07-04 14:46:08 +0200 |
| commit | c93d582069bf53b8a77ea24111974b3c2a3cd241 (patch) | |
| tree | 257524803fcc4a583589711272d816709449dd27 /lib/compiler/src/beam_ssa_bsm.erl | |
| parent | 19fc0a4f743685853fd579e7efb6fcbf92cfe05b (diff) | |
| parent | 0582460b5ad757b53e332a84fb365542b0e76e8e (diff) | |
| download | otp-c93d582069bf53b8a77ea24111974b3c2a3cd241.tar.gz otp-c93d582069bf53b8a77ea24111974b3c2a3cd241.tar.bz2 otp-c93d582069bf53b8a77ea24111974b3c2a3cd241.zip | |
Merge branch 'maint'
* maint:
beam_ssa_bsm: Leave ?BADARG_BLOCK alone when cloning fail path
beam_ssa_opt: Do not apply tuple_size optimization outside guards
Diffstat (limited to 'lib/compiler/src/beam_ssa_bsm.erl')
| -rw-r--r-- | lib/compiler/src/beam_ssa_bsm.erl | 6 |
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 abbda2ebe4..927a06edbf 100644 --- a/lib/compiler/src/beam_ssa_bsm.erl +++ b/lib/compiler/src/beam_ssa_bsm.erl @@ -684,8 +684,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}. |