diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-09-07 14:19:37 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-09-07 14:19:37 +0200 |
| commit | d449c5a57f55ff0dd4fecd6efe305085def650a5 (patch) | |
| tree | e5bfc677fbbb2a94922968b2cda18b9519039387 /lib/compiler/src/beam_block.erl | |
| parent | dc12459b49c8332a574fb9ffe5272587c8ed8d4f (diff) | |
| parent | c4dcde5c694b9795f58563cf72c0701af30ed866 (diff) | |
| download | otp-d449c5a57f55ff0dd4fecd6efe305085def650a5.tar.gz otp-d449c5a57f55ff0dd4fecd6efe305085def650a5.tar.bz2 otp-d449c5a57f55ff0dd4fecd6efe305085def650a5.zip | |
Merge branch '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 4e179daa0e..75202d9379 100644 --- a/lib/compiler/src/beam_block.erl +++ b/lib/compiler/src/beam_block.erl @@ -255,7 +255,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]) -> |