diff options
| author | Björn Gustavsson <[email protected]> | 2012-08-15 11:11:09 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-08-15 11:11:09 +0200 |
| commit | 70e8c948bd762aa9e5413092d8c993e56197d69a (patch) | |
| tree | f26311047c6fda74e5296ea6c25b1fb49f0f7b46 /lib/compiler/src/beam_utils.erl | |
| parent | 160bf5da0e03f39b468ebba5d39d1658c8a370e6 (diff) | |
| parent | c5e5cf792d87e0d23f80ff572f499f0e3e044933 (diff) | |
| download | otp-70e8c948bd762aa9e5413092d8c993e56197d69a.tar.gz otp-70e8c948bd762aa9e5413092d8c993e56197d69a.tar.bz2 otp-70e8c948bd762aa9e5413092d8c993e56197d69a.zip | |
Merge branch 'maint'
* maint:
erl_lint: Add a deprecated warning for literal tuple funs
beam_utils:live_opt/1: Correct handling of try_case_end/1
Correct guard_SUITE_tuple_size.S
beam_type: Print the offending function if this pass crashes
beam_validator: Validate the size operand in bs_init_bits and bs_init2
Diffstat (limited to 'lib/compiler/src/beam_utils.erl')
| -rw-r--r-- | lib/compiler/src/beam_utils.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl index abcd93f280..194f089ba1 100644 --- a/lib/compiler/src/beam_utils.erl +++ b/lib/compiler/src/beam_utils.erl @@ -741,6 +741,9 @@ live_opt([{badmatch,Src}=I|Is], _, D, Acc) -> live_opt([{case_end,Src}=I|Is], _, D, Acc) -> Regs = x_live([Src], 0), live_opt(Is, Regs, D, [I|Acc]); +live_opt([{try_case_end,Src}=I|Is], _, D, Acc) -> + Regs = x_live([Src], 0), + live_opt(Is, Regs, D, [I|Acc]); live_opt([if_end=I|Is], _, D, Acc) -> Regs = 0, live_opt(Is, Regs, D, [I|Acc]); @@ -802,8 +805,6 @@ live_opt([{deallocate,_}=I|Is], Regs, D, Acc) -> live_opt(Is, Regs, D, [I|Acc]); live_opt([{kill,_}=I|Is], Regs, D, Acc) -> live_opt(Is, Regs, D, [I|Acc]); -live_opt([{try_case_end,_}=I|Is], Regs, D, Acc) -> - live_opt(Is, Regs, D, [I|Acc]); live_opt([{try_end,_}=I|Is], Regs, D, Acc) -> live_opt(Is, Regs, D, [I|Acc]); live_opt([{loop_rec_end,_}=I|Is], Regs, D, Acc) -> |