From dfa4ae40076a472161a5ad7a7824f28ebfc46847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Sat, 14 May 2016 08:35:05 +0200
Subject: Add missing test cases in andor_SUITE and beam_block_SUITE

Two test cases were not actually run. Even if their main purpose is to
ensure that the compiler doesn't crash, we always try to also run the
test case (when practial) to also ensure that the generated code is
correct.
---
 lib/compiler/test/andor_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/compiler/test/andor_SUITE.erl')

diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index f6e7b09010..fa1cedbe02 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -36,7 +36,7 @@ all() ->
 groups() -> 
     [{p,[parallel],
       [t_case,t_and_or,t_andalso,t_orelse,inside,overlap,
-       combined,in_case,before_and_inside_if]}].
+       combined,in_case,before_and_inside_if,slow_compilation]}].
 
 init_per_suite(Config) ->
     Config.
-- 
cgit v1.2.3


From f679efe1c19cb7d6bab8a68226a9d748474ef902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Sat, 14 May 2016 08:12:36 +0200
Subject: Add beam_bool_SUITE

It's time that we have a dedicated test suite for beam_bool.
---
 lib/compiler/test/andor_SUITE.erl | 63 ++-------------------------------------
 1 file changed, 2 insertions(+), 61 deletions(-)

(limited to 'lib/compiler/test/andor_SUITE.erl')

diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index fa1cedbe02..05c087104d 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -22,8 +22,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 t_case/1,t_and_or/1,t_andalso/1,t_orelse/1,inside/1,overlap/1,
-	 combined/1,in_case/1,before_and_inside_if/1,
-	 slow_compilation/1]).
+	 combined/1,in_case/1,slow_compilation/1]).
 	 
 -include_lib("common_test/include/ct.hrl").
 
@@ -36,7 +35,7 @@ all() ->
 groups() -> 
     [{p,[parallel],
       [t_case,t_and_or,t_andalso,t_orelse,inside,overlap,
-       combined,in_case,before_and_inside_if,slow_compilation]}].
+       combined,in_case,slow_compilation]}].
 
 init_per_suite(Config) ->
     Config.
@@ -450,64 +449,6 @@ in_case_1_guard(LenUp, LenDw, LenN, Rotation, Count) ->
 	false -> loop
     end.
 
-before_and_inside_if(Config) when is_list(Config) ->
-    no = before_and_inside_if([a], [b], delete),
-    no = before_and_inside_if([a], [b], x),
-    no = before_and_inside_if([a], [], delete),
-    no = before_and_inside_if([a], [], x),
-    no = before_and_inside_if([], [], delete),
-    yes = before_and_inside_if([], [], x),
-    yes = before_and_inside_if([], [b], delete),
-    yes = before_and_inside_if([], [b], x),
-
-    {ch1,ch2} = before_and_inside_if_2([a], [b], blah),
-    {ch1,ch2} = before_and_inside_if_2([a], [b], xx),
-    {ch1,ch2} = before_and_inside_if_2([a], [], blah),
-    {ch1,ch2} = before_and_inside_if_2([a], [], xx),
-    {no,no} = before_and_inside_if_2([], [b], blah),
-    {no,no} = before_and_inside_if_2([], [b], xx),
-    {ch1,no} = before_and_inside_if_2([], [], blah),
-    {no,ch2} = before_and_inside_if_2([], [], xx),
-    ok.
-
-%% Thanks to Simon Cornish and Kostis Sagonas.
-%% Used to crash beam_bool.
-before_and_inside_if(XDo1, XDo2, Do3) ->
-    Do1 = (XDo1 =/= []),
-    Do2 = (XDo2 =/= []),
-    if
-	%% This expression occurs in a try/catch (protected)
-	%% block, which cannot refer to variables outside of
-	%% the block that are boolean expressions.
-	Do1 =:= true;
-	Do1 =:= false, Do2 =:= false, Do3 =:= delete ->
-	    no;
-       true ->
-	    yes
-    end.
-
-%% Thanks to Simon Cornish.
-%% Used to generate code that would not set {y,0} on
-%% all paths before its use (and therefore fail
-%% validation by the beam_validator).
-before_and_inside_if_2(XDo1, XDo2, Do3) ->
-    Do1    = (XDo1 =/= []),
-    Do2    = (XDo2 =/= []),
-    CH1 = if Do1 == true;
-	     Do1 == false,Do2==false,Do3 == blah ->
-		  ch1;
-	     true ->
-		  no
-	  end,
-    CH2 = if Do1 == true;
-	     Do1 == false,Do2==false,Do3 == xx ->
-		  ch2;
-	     true ->
-		  no
-	  end,
-    {CH1,CH2}.
-
-
 -record(state, {stack = []}).
 
 slow_compilation(_) ->
-- 
cgit v1.2.3