diff options
| author | Erlang/OTP <[email protected]> | 2019-05-29 13:24:44 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-05-29 13:24:44 +0200 |
| commit | ebab8243464392428b4e2e9f321c8716ec199355 (patch) | |
| tree | 4a42a71d418751dee15e8fc3facad7d5a1e5236c /lib/compiler/src | |
| parent | 06597726267e33ad7ec99c5ebe33392e0dd1671e (diff) | |
| parent | f7fe4573880ce94d794af266d0f37459b7a86709 (diff) | |
| download | otp-ebab8243464392428b4e2e9f321c8716ec199355.tar.gz otp-ebab8243464392428b4e2e9f321c8716ec199355.tar.bz2 otp-ebab8243464392428b4e2e9f321c8716ec199355.zip | |
Merge branch 'bjorn/compiler/fix-beam_except/ERL-954/OTP-15839' into maint-22
* bjorn/compiler/fix-beam_except/ERL-954/OTP-15839:
Fix compiler crash in beam_except
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/beam_except.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/compiler/src/beam_except.erl b/lib/compiler/src/beam_except.erl index 28c89782c9..2305502800 100644 --- a/lib/compiler/src/beam_except.erl +++ b/lib/compiler/src/beam_except.erl @@ -140,8 +140,11 @@ fix_block_1([{set,[],[],{alloc,Live,{F1,F2,Needed0,F3}}}|Is], Words) -> [{set,[],[],{alloc,Live,{F1,F2,Needed,F3}}}|Is] end; fix_block_1([I|Is], Words) -> - [I|fix_block_1(Is, Words)]. - + [I|fix_block_1(Is, Words)]; +fix_block_1([], _Words) -> + %% Rare. The heap allocation was probably done by a binary + %% construction instruction. + []. dig_out_fc(Arity, Is0) -> Regs0 = maps:from_list([{{x,X},{arg,X}} || X <- seq(0, Arity-1)]), |