diff options
| author | Björn Gustavsson <[email protected]> | 2016-09-26 15:01:19 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-10-05 13:00:45 +0200 |
| commit | 0c599bcad1e7f5f66dd2342ab27791048145e892 (patch) | |
| tree | 2f9702b3f3c829d6862df0cc193d5abc394251b4 /lib/compiler/src/beam_flatten.erl | |
| parent | 3f3f25b23379b1afb15cc97462cf5d385690f5a0 (diff) | |
| download | otp-0c599bcad1e7f5f66dd2342ab27791048145e892.tar.gz otp-0c599bcad1e7f5f66dd2342ab27791048145e892.tar.bz2 otp-0c599bcad1e7f5f66dd2342ab27791048145e892.zip | |
beam_block: Avoid unsafe inclusion of get_map_elements in blocks
c2035ebb8b restricted the get_map_elements instruction so that it
could only occur at the beginning of a block. It turns out that
including it anywhere in a block is unsafe.
Therefore, never put get_map_elements instruction in blocks.
(Also remove the beam_utils:join_even/2 function since it is no
longer used.)
ERL-266
Diffstat (limited to 'lib/compiler/src/beam_flatten.erl')
| -rw-r--r-- | lib/compiler/src/beam_flatten.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/compiler/src/beam_flatten.erl b/lib/compiler/src/beam_flatten.erl index 36369bd0b4..c9ff07b496 100644 --- a/lib/compiler/src/beam_flatten.erl +++ b/lib/compiler/src/beam_flatten.erl @@ -64,7 +64,6 @@ 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}}; -%% get_map_elements is always handled in beam_split (moved out of block) norm({set,[],[],remove_message}) -> remove_message; norm({set,[],[],fclearerror}) -> fclearerror; norm({set,[],[],fcheckerror}) -> {fcheckerror,{f,0}}. |