diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-09-07 14:19:17 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-09-07 14:19:17 +0200 |
| commit | c4dcde5c694b9795f58563cf72c0701af30ed866 (patch) | |
| tree | 192cdf7b768a9f88645c1b59b090e4ada1d4f5b8 /lib/compiler/src/beam_block.erl | |
| parent | 2785d9952f45fff1956243c25042b75b299af3de (diff) | |
| parent | d0784035abb22f4f385c8a8737a7b15c3741bbca (diff) | |
| download | otp-c4dcde5c694b9795f58563cf72c0701af30ed866.tar.gz otp-c4dcde5c694b9795f58563cf72c0701af30ed866.tar.bz2 otp-c4dcde5c694b9795f58563cf72c0701af30ed866.zip | |
Merge branch 'egil/fix-compiler-map-register/OTP-12967' into maint
Diffstat (limited to 'lib/compiler/src/beam_block.erl')
| -rw-r--r-- | lib/compiler/src/beam_block.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl index 2def3de7f3..0321b1c07b 100644 --- a/lib/compiler/src/beam_block.erl +++ b/lib/compiler/src/beam_block.erl @@ -251,7 +251,9 @@ opt([{set,_,_,{line,_}}=Line1, {set,[D2],[{integer,Idx2},Reg],{bif,element,{f,0}}}=I2|Is]) when Idx1 < Idx2, D1 =/= D2, D1 =/= Reg, D2 =/= Reg -> opt([Line2,I2,Line1,I1|Is]); -opt([{set,Ds0,Ss,Op}|Is0]) -> +opt([{set,[_|_],_Ss,{get_map_elements,_F}}=I|Is]) -> + [I|opt(Is)]; +opt([{set,Ds0,Ss,Op}|Is0]) -> {Ds,Is} = opt_moves(Ds0, Is0), [{set,Ds,Ss,Op}|opt(Is)]; opt([{'%live',_,_}=I|Is]) -> |