diff options
| author | Björn Gustavsson <[email protected]> | 2016-10-05 15:06:09 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-10-05 15:06:09 +0200 |
| commit | 7af3910bb06433f7c9182db11d853823f202c2b6 (patch) | |
| tree | 5fd0b1fe04e670123f9b31381e195ed5ce55d1cf /lib/compiler/src/beam_flatten.erl | |
| parent | ef6f8da5d027055a36c70196df69dfbb7b464800 (diff) | |
| parent | 497330a828089b465ac026551edf33fb947ae2f6 (diff) | |
| download | otp-7af3910bb06433f7c9182db11d853823f202c2b6.tar.gz otp-7af3910bb06433f7c9182db11d853823f202c2b6.tar.bz2 otp-7af3910bb06433f7c9182db11d853823f202c2b6.zip | |
Merge branch 'maint'
* maint:
Update primary bootstrap
beam_block: Avoid unsafe inclusion of get_map_elements in blocks
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}}. |