aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src/beam_block.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-08-05 19:19:56 +0200
committerBjörn Gustavsson <[email protected]>2015-08-21 15:56:14 +0200
commit30cc5c902d9e653d48452a7f84fcd664cfc3f0a8 (patch)
treeed5fdd76bb7ce60315e5614a09df4f5903021085 /lib/compiler/src/beam_block.erl
parent3640e5c89bda0ca45b3320e8a00efb48b9d9f531 (diff)
downloadotp-30cc5c902d9e653d48452a7f84fcd664cfc3f0a8.tar.gz
otp-30cc5c902d9e653d48452a7f84fcd664cfc3f0a8.tar.bz2
otp-30cc5c902d9e653d48452a7f84fcd664cfc3f0a8.zip
Put 'try' in blocks to optimize allocation instructions
Put 'try' instructions inside block to improve the optimization of allocation instructions. Currently, the compiler only looks at initialization of y registers inside blocks when determining which y registers that will be "naturally" initialized.
Diffstat (limited to 'lib/compiler/src/beam_block.erl')
-rw-r--r--lib/compiler/src/beam_block.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index 49e66b379b..0b284299be 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -149,7 +149,10 @@ collect({put_map,F,Op,S,D,R,{list,Puts}}) ->
collect({get_map_elements,F,S,{list,Gets}}) ->
{Ss,Ds} = beam_utils:split_even(Gets),
{set,Ds,[S|Ss],{get_map_elements,F}};
-collect({'catch',R,L}) -> {set,[R],[],{'catch',L}};
+collect({'catch'=Op,R,L}) ->
+ {set,[R],[],{try_catch,Op,L}};
+collect({'try'=Op,R,L}) ->
+ {set,[R],[],{try_catch,Op,L}};
collect(fclearerror) -> {set,[],[],fclearerror};
collect({fcheckerror,{f,0}}) -> {set,[],[],fcheckerror};
collect({fmove,S,D}) -> {set,[D],[S],fmove};
@@ -346,7 +349,7 @@ opt_tuple_element([]) -> [].
opt_tuple_element_1([{set,_,_,{alloc,_,_}}|_], _, _, _) ->
no;
-opt_tuple_element_1([{set,_,_,{'catch',_}}|_], _, _, _) ->
+opt_tuple_element_1([{set,_,_,{try_catch,_,_}}|_], _, _, _) ->
no;
opt_tuple_element_1([{set,[D],[S],move}|Is0], I0, {_,S}, Acc) ->
case eliminate_use_of_from_reg(Is0, S, D, []) of