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_jump.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_jump.erl')
| -rw-r--r-- | lib/compiler/src/beam_jump.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/compiler/src/beam_jump.erl b/lib/compiler/src/beam_jump.erl index 5e58e0f6ac..3b6eb19fe8 100644 --- a/lib/compiler/src/beam_jump.erl +++ b/lib/compiler/src/beam_jump.erl @@ -495,7 +495,7 @@ is_label_used_in_block({set,_,_,Info}, Lbl) -> {alloc,_,{gc_bif,_,{f,F}}} -> F =:= Lbl; {alloc,_,{put_map,_,{f,F}}} -> F =:= Lbl; {get_map_elements,{f,F}} -> F =:= Lbl; - {'catch',{f,F}} -> F =:= Lbl; + {try_catch,_,{f,F}} -> F =:= Lbl; {alloc,_,_} -> false; {put_tuple,_} -> false; {get_tuple_element,_} -> false; |