diff options
| author | Björn Gustavsson <[email protected]> | 2015-01-21 10:18:27 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-01-21 10:18:27 +0100 |
| commit | 2efa0d7d6c4bcc529aa128f859fed83bda12a884 (patch) | |
| tree | b4c16bdaf17325dff1226b0236673dcecdb3052d /lib/compiler/src/beam_utils.erl | |
| parent | 046751dc8ca305a390aa4cf9ee132f0190d809f5 (diff) | |
| parent | 9f181f07d452a63c1787c71199ca4ac61ea5f688 (diff) | |
| download | otp-2efa0d7d6c4bcc529aa128f859fed83bda12a884.tar.gz otp-2efa0d7d6c4bcc529aa128f859fed83bda12a884.tar.bz2 otp-2efa0d7d6c4bcc529aa128f859fed83bda12a884.zip | |
Merge branch 'bjorn/compiler/coverage'
* bjorn/compiler/coverage:
map_SUITE: Ensure recompilation when running cover
Add beam_utils_SUITE to cover more lines in beam_utils
beam_utils: Remove unreachable clauses in live_opt/4
receive_SUITE: Cover handling of recv_mark & recv_set in beam_utils
beam_validator_SUITE: Mend the compiler_bug/1 test case
beam_clean: Remove handling of forgotten instructions
compile_SUITE: Test the 'dialyzer' option
Diffstat (limited to 'lib/compiler/src/beam_utils.erl')
| -rw-r--r-- | lib/compiler/src/beam_utils.erl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl index e82ba82d38..84a2b782e9 100644 --- a/lib/compiler/src/beam_utils.erl +++ b/lib/compiler/src/beam_utils.erl @@ -758,13 +758,9 @@ live_opt([{line,_}=I|Is], Regs, D, Acc) -> live_opt(Is, Regs, D, [I|Acc]); %% The following instructions can occur if the "compilation" has been -%% started from a .S file using the 'asm' option. +%% started from a .S file using the 'from_asm' option. live_opt([{trim,_,_}=I|Is], Regs, D, Acc) -> live_opt(Is, Regs, D, [I|Acc]); -live_opt([{allocate,_,Live}=I|Is], _, D, Acc) -> - live_opt(Is, live_call(Live), D, [I|Acc]); -live_opt([{allocate_heap,_,_,Live}=I|Is], _, D, Acc) -> - live_opt(Is, live_call(Live), D, [I|Acc]); live_opt([{'%',_}=I|Is], Regs, D, Acc) -> live_opt(Is, Regs, D, [I|Acc]); live_opt([{recv_set,_}=I|Is], Regs, D, Acc) -> |