aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src/beam_split.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-06-23 19:52:39 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-08-26 12:12:47 +0200
commitbbabf6204d9ac7083828ced6b9ace97e240794c8 (patch)
treeaba0e9679d50ff9f4556df257459b5d51e06d590 /lib/compiler/src/beam_split.erl
parent83c35c4e7bcb7cabdad5f8b1082a7bfda9101600 (diff)
downloadotp-bbabf6204d9ac7083828ced6b9ace97e240794c8.tar.gz
otp-bbabf6204d9ac7083828ced6b9ace97e240794c8.tar.bz2
otp-bbabf6204d9ac7083828ced6b9ace97e240794c8.zip
compiler: Use variables in Map beam assmebler
Diffstat (limited to 'lib/compiler/src/beam_split.erl')
-rw-r--r--lib/compiler/src/beam_split.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/compiler/src/beam_split.erl b/lib/compiler/src/beam_split.erl
index 688bba9a94..f5dba314ae 100644
--- a/lib/compiler/src/beam_split.erl
+++ b/lib/compiler/src/beam_split.erl
@@ -53,8 +53,9 @@ split_block([{set,[D],[S|Puts],{alloc,R,{put_map,Op,{f,Lbl}=Fail}}}|Is],
Bl, Acc) when Lbl =/= 0 ->
split_block(Is, [], [{put_map,Fail,Op,S,D,R,{list,Puts}}|
make_block(Bl, Acc)]);
-split_block([{set,Gets,[S],{get_map_elements,{f,Lbl}=Fail}}|Is], Bl, Acc)
+split_block([{set,Ds,[S|Ss],{get_map_elements,{f,Lbl}=Fail}}|Is], Bl, Acc)
when Lbl =/= 0 ->
+ Gets = beam_utils:joineven(Ss,Ds),
split_block(Is, [], [{get_map_elements,Fail,S,{list,Gets}}|make_block(Bl, Acc)]);
split_block([{set,[R],[],{'catch',L}}|Is], Bl, Acc) ->
split_block(Is, [], [{'catch',R,L}|make_block(Bl, Acc)]);