Merge branch 'bg/compiler-cover-and-clean' into dev

* bg/compiler-cover-and-clean:
  v3_life: Remove clause that cannot match in match_fail/3
  v3_life tests: Cover exception handling code in v3_life:function/1
  beam_type: Remove redundant clause
  v3_core tests: Cover make_bool_switch_guard/5
  v3_core tests: Cover handling of pattern aliases
  v3_core: Remove a clause in is_simple/1 that cannot match
  v3_core: Remove unused support for generating compilation errors
  Remove stray support for the put_literal/2 instruction
  Remove stray support for the bs_bits_to_bytes2/2 instruction
  Remove the bs_bits_to_bytes/3 instruction
  Cover handling of 'math' BIFs
  beam_bool: Remove a clause in live_regs/1 that cannot match
  beam_bool: Cover handling of bs_context_to_binary in initialized_regs/2
  beam_bool: Remove a clause in initialized_regs/2 that cannot match
  beam_block: Remove a clause that will never be executed
  erts: Stop supporting non-literal empty tuples
  compile: Remove code that is only executed on Solaris
  Do not cover-analyze core_scan
  core_SUITE_data: Don't ignore *.core files in this directory

OTP-8636 bg/compiler-cover-and-clean

1 files changed, 19 insertions, 5 deletions

diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index a460d54239..84cfd16e60 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 -module(andor_SUITE).
@@ -141,6 +141,10 @@ t_and_or(Config) when is_list(Config) ->
 
    ok.
 
+-define(GUARD(E), if E -> true;
+		     true -> false
+		  end).
+
 t_andalso(Config) when is_list(Config) ->
     Bs = [true,false],
     Ps = [{X,Y} || X <- Bs, Y <- Bs],
@@ -151,6 +155,11 @@ t_andalso(Config) when is_list(Config) ->
     ?line false = false andalso true,
     ?line false = false andalso false,
 
+    ?line true = ?GUARD(true andalso true),
+    ?line false = ?GUARD(true andalso false),
+    ?line false = ?GUARD(false andalso true),
+    ?line false = ?GUARD(false andalso false),
+
     ?line false = false andalso glurf,
     ?line false = false andalso exit(exit_now),
 
@@ -176,6 +185,11 @@ t_orelse(Config) when is_list(Config) ->
     ?line true = false orelse true,
     ?line false = false orelse false,
 
+    ?line true = ?GUARD(true orelse true),
+    ?line true = ?GUARD(true orelse false),
+    ?line true = ?GUARD(false orelse true),
+    ?line false = ?GUARD(false orelse false),
+
     ?line true = true orelse glurf,
     ?line true = true orelse exit(exit_now),