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_split.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_split.erl')
| -rw-r--r-- | lib/compiler/src/beam_split.erl | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/compiler/src/beam_split.erl b/lib/compiler/src/beam_split.erl index c83c686953..feeab0af50 100644 --- a/lib/compiler/src/beam_split.erl +++ b/lib/compiler/src/beam_split.erl @@ -56,9 +56,6 @@ 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,Ds,[S|Ss],{get_map_elements,Fail}}|Is], Bl, Acc) -> - Gets = beam_utils:join_even(Ss,Ds), - split_block(Is, [], [{get_map_elements,Fail,S,{list,Gets}}|make_block(Bl, Acc)]); split_block([{set,[R],[],{try_catch,Op,L}}|Is], Bl, Acc) -> split_block(Is, [], [{Op,R,L}|make_block(Bl, Acc)]); split_block([{set,[],[],{line,_}=Line}|Is], Bl, Acc) -> |