diff options
| author | Björn Gustavsson <[email protected]> | 2019-02-01 12:43:16 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-02-01 12:43:16 +0100 |
| commit | bc0aef4bb631acbf0b8e8fd8ecc51cb1286ed8c9 (patch) | |
| tree | 18f624560887fc5d5cace679e5fd0e9d0f6c94c7 /lib/compiler/src | |
| parent | 572e233d8e5b1c894cfba0ce77cdb1426b946be2 (diff) | |
| parent | 53f85bfa09fa0aea9718c207d4245cb975eb6b08 (diff) | |
| download | otp-bc0aef4bb631acbf0b8e8fd8ecc51cb1286ed8c9.tar.gz otp-bc0aef4bb631acbf0b8e8fd8ecc51cb1286ed8c9.tar.bz2 otp-bc0aef4bb631acbf0b8e8fd8ecc51cb1286ed8c9.zip | |
Merge pull request #2122 from bjorng/bjorn/compiler/fix-beam_except
Fix internal consistency failure caused by beam_except
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/beam_except.erl | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/lib/compiler/src/beam_except.erl b/lib/compiler/src/beam_except.erl index 254a716b81..09925b2872 100644 --- a/lib/compiler/src/beam_except.erl +++ b/lib/compiler/src/beam_except.erl @@ -167,8 +167,10 @@ dig_out_fc_1([{block,Bl}|Is], Regs0, Acc) -> dig_out_fc_1(Is, Regs, Acc); dig_out_fc_1([{bs_set_position,_,_}=I|Is], Regs, Acc) -> dig_out_fc_1(Is, Regs, [I|Acc]); -dig_out_fc_1([{bs_get_tail,_,_,Live}=I|Is], Regs0, Acc) -> - Regs = prune_xregs(Live, Regs0), +dig_out_fc_1([{bs_get_tail,Src,Dst,Live0}|Is], Regs0, Acc) -> + Regs = prune_xregs(Live0, Regs0), + Live = dig_out_stack_live(Regs, Live0), + I = {bs_get_tail,Src,Dst,Live}, dig_out_fc_1(Is, Regs, [I|Acc]); dig_out_fc_1([_|_], _Regs, _Acc) -> {#{},[]}; @@ -189,6 +191,23 @@ dig_out_fc_block([{set,_,_,_}|_], _Regs) -> #{}; dig_out_fc_block([], Regs) -> Regs. +dig_out_stack_live(Regs, Default) -> + Reg = {x,2}, + case Regs of + #{Reg:=List} -> + dig_out_stack_live_1(List, Default); + #{} -> + Default + end. + +dig_out_stack_live_1({cons,{arg,N},T}, Live) -> + dig_out_stack_live_1(T, max(N + 1, Live)); +dig_out_stack_live_1({cons,_,T}, Live) -> + dig_out_stack_live_1(T, Live); +dig_out_stack_live_1(nil, Live) -> + Live; +dig_out_stack_live_1(_, Live) -> Live. + prune_xregs(Live, Regs) -> maps:filter(fun({x,X}, _) -> X < Live end, Regs). |