aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src/beam_flatten.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_flatten.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_flatten.erl')
-rw-r--r--lib/compiler/src/beam_flatten.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/compiler/src/beam_flatten.erl b/lib/compiler/src/beam_flatten.erl
index 46835bece1..05d067dc48 100644
--- a/lib/compiler/src/beam_flatten.erl
+++ b/lib/compiler/src/beam_flatten.erl
@@ -63,7 +63,8 @@ norm({set,[],[S,D],{set_tuple_element,I}}) -> {set_tuple_element,S,D,I};
norm({set,[D1,D2],[S],get_list}) -> {get_list,S,D1,D2};
norm({set,[D],[S|Puts],{alloc,R,{put_map,Op,F}}}) ->
{put_map,F,Op,S,D,R,{list,Puts}};
-norm({set,Gets,[S],{get_map_elements,F}}) ->
+norm({set,Ds,[S|Ss],{get_map_elements,F}}) ->
+ Gets = beam_utils:joineven(Ss,Ds),
{get_map_elements,F,S,{list,Gets}};
norm({set,[],[],remove_message}) -> remove_message;
norm({set,[],[],fclearerror}) -> fclearerror;