diff options
| author | Björn Gustavsson <[email protected]> | 2015-08-24 10:38:22 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-08-24 10:38:22 +0200 |
| commit | beb851eedcf7407f0a0db167dc9212f2a7f13bd8 (patch) | |
| tree | dfa31c179886d4ba7e25fa651e3b4b10df160bf6 /lib/compiler/src/beam_split.erl | |
| parent | f81065c4296c679bfdd023e988289b4d884cfdd2 (diff) | |
| parent | 93c5e457faeccfd8ccbb1e6c587ad6df1f200408 (diff) | |
| download | otp-beb851eedcf7407f0a0db167dc9212f2a7f13bd8.tar.gz otp-beb851eedcf7407f0a0db167dc9212f2a7f13bd8.tar.bz2 otp-beb851eedcf7407f0a0db167dc9212f2a7f13bd8.zip | |
Merge branch 'bjorn/compiler/opt/OTP-12951'
* bjorn/compiler/opt/OTP-12951:
beam_validator: Don't allow x(1023) to be used
v3_core: Improve code generation for guards
Move rewriting of select_val to is_boolean from beam_peep to beam_dead
Put 'try' in blocks to optimize allocation instructions
Reorder instructions across try/catch
Delay get_tuple_element instructions until they are needed
Optimize get_tuple_element instructions by moving them forward
beam_block: Improve the move optimizations
beam_block: Clean up optimization of move optimizations
beam_block: Eliminate redundant wasteful call to opt/1
Teach the compiler the 'da' and 'dz' options
Diffstat (limited to 'lib/compiler/src/beam_split.erl')
| -rw-r--r-- | lib/compiler/src/beam_split.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/compiler/src/beam_split.erl b/lib/compiler/src/beam_split.erl index 3be9311080..bb1c0e23a9 100644 --- a/lib/compiler/src/beam_split.erl +++ b/lib/compiler/src/beam_split.erl @@ -57,8 +57,8 @@ split_block([{set,[D],[S|Puts],{alloc,R,{put_map,Op,{f,Lbl}=Fail}}}|Is], 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],[],{'catch',L}}|Is], Bl, Acc) -> - split_block(Is, [], [{'catch',R,L}|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) -> split_block(Is, [], [Line|make_block(Bl, Acc)]); split_block([I|Is], Bl, Acc) -> |