Remove beam_bool

The guard optimizations in v3_kernel has removed the need for
beam_bool.

5 files changed, 151 insertions, 211 deletions

diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index de06e8760f..f2c68505fc 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -9,7 +9,6 @@ MODULES= \
 	andor_SUITE \
 	apply_SUITE \
 	beam_block_SUITE \
-	beam_bool_SUITE \
 	beam_validator_SUITE \
 	beam_disasm_SUITE \
 	beam_except_SUITE \
@@ -49,7 +48,6 @@ NO_OPT= \
 	andor \
 	apply \
 	beam_block \
-	beam_bool \
 	beam_except \
 	beam_jump \
 	beam_reorder \
@@ -76,7 +74,6 @@ INLINE= \
 	andor \
 	apply \
 	beam_block \
-	beam_bool \
 	beam_utils \
 	bif \
 	bs_bincomp \
diff --git a/lib/compiler/test/beam_bool_SUITE.erl b/lib/compiler/test/beam_bool_SUITE.erl
deleted file mode 100644
index e585eaedb5..0000000000
--- a/lib/compiler/test/beam_bool_SUITE.erl
+++ /dev/null
@@ -1,197 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2015-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
--module(beam_bool_SUITE).
-
--export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
-	 init_per_group/2,end_per_group/2,
-	 before_and_inside_if/1,
-	 scotland/1,y_registers/1,protected/1,
-	 maps/1]).
-
-suite() ->
-    [{ct_hooks,[ts_install_cth]}].
-
-all() ->
-    test_lib:recompile(?MODULE),
-    [{group,p}].
-
-groups() ->
-    [{p,[parallel],
-      [before_and_inside_if,
-       scotland,
-       y_registers,
-       protected,
-       maps
-      ]}].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-before_and_inside_if(_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}.
-
-
-%% beam_bool would remove the initialization of {y,0}.
-%% (Thanks to Thomas Arts and QuickCheck.)
-
-scotland(_Config) ->
-    million = do_scotland(placed),
-    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(false)),
-    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(true)),
-    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(echo)),
-    ok.
-
-do_scotland(Echo) ->
-  found(case Echo of
-	    Echo when true; Echo, Echo, Echo ->
-		Echo;
-	    echo ->
-		[]
-	end,
-	Echo = placed).
-
-found(_, _) -> million.
-
-
-%% ERL-143: beam_bool could not handle Y registers as a destination.
-y_registers(_Config) ->
-    {'EXIT',{badarith,[_|_]}} = (catch baker(valentine)),
-    {'EXIT',{badarith,[_|_]}} = (catch baker(clementine)),
-
-    {not_ok,true} = potter([]),
-    {ok,false} = potter([{encoding,any}]),
-
-    ok.
-
-%% Thanks to Quickcheck.
-baker(Baker) ->
-    (valentine == Baker) +
-	case Baker of
-	    Baker when Baker; Baker ->
-		Baker;
-	    Baker ->
-		[]
-	end.
-
-%% Thanks to Jose Valim.
-potter(Modes) ->
-    Raw = lists:keyfind(encoding, 1, Modes) == false,
-    Final = case Raw of
-		X when X == false; X == nil -> ok;
-		_ -> not_ok
-	    end,
-    {Final,Raw}.
-
-protected(_Config) ->
-    {'EXIT',{if_clause,_}} = (catch photographs({1, surprise, true}, opinions)),
-
-    {{true}} = welcome({perfect, true}),
-    {'EXIT',{if_clause,_}} = (catch welcome({perfect, false})),
-    ok.
-
-photographs({_Violation, surprise, Deep}, opinions) ->
-    {if
-	 0; "here", Deep ->
-	     Deep = Deep
-     end}.
-
-welcome({perfect, Profit}) ->
-    if
-	Profit, Profit, Profit; 0 ->
-	    {id({Profit})}
-    end.
-
-maps(_Config) ->
-    ok = evidence(#{0 => 42}).
-
-%% Cover handling of put_map in in split_block_label_used/2.
-evidence(#{0 := Charge}) when 0; #{[] => Charge} == #{[] => 42} ->
-    ok.
-
-
-%%%
-%%% Common utilities.
-%%%
-
-id(I) ->
-    I.
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 2953a901b5..d7e0b3498a 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -342,7 +342,6 @@ do_file_listings(DataDir, PrivDir, [File|Files]) ->
     do_listing(Simple, TargetDir, dblk, ".block"),
     do_listing(Simple, TargetDir, dexcept, ".except"),
     do_listing(Simple, TargetDir, dbs, ".bs"),
-    do_listing(Simple, TargetDir, dbool, ".bool"),
     do_listing(Simple, TargetDir, dtype, ".type"),
     do_listing(Simple, TargetDir, ddead, ".dead"),
     do_listing(Simple, TargetDir, djmp, ".jump"),
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index 11d4038b06..a662d85272 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -35,7 +35,7 @@
 	 basic_andalso_orelse/1,traverse_dcd/1,
 	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1,
 	 bad_constants/1,bad_guards/1,
-	 guard_in_catch/1]).
+	 guard_in_catch/1,beam_bool_SUITE/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -54,7 +54,7 @@ groups() ->
        rel_ops,rel_op_combinations,
        literal_type_tests,basic_andalso_orelse,traverse_dcd,
        check_qlc_hrl,andalso_semi,t_tuple_size,binary_part,
-       bad_constants,bad_guards,guard_in_catch]}].
+       bad_constants,bad_guards,guard_in_catch,beam_bool_SUITE]}].
 
 init_per_suite(Config) ->
     Config.
@@ -2050,6 +2050,155 @@ do_guard_in_catch_bin(From) ->
 		saint
 	end.
 
+%%%
+%%% The beam_bool pass has been eliminated. Here are the tests from
+%%% beam_bool_SUITE.
+%%%
+
+beam_bool_SUITE(_Config) ->
+    before_and_inside_if(),
+    scotland(),
+    y_registers(),
+    protected(),
+    maps(),
+    ok.
+
+before_and_inside_if() ->
+    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}.
+
+
+%% beam_bool would remove the initialization of {y,0}.
+%% (Thanks to Thomas Arts and QuickCheck.)
+
+scotland() ->
+    million = do_scotland(placed),
+    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(false)),
+    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(true)),
+    {'EXIT',{{badmatch,placed},_}} = (catch do_scotland(echo)),
+    ok.
+
+do_scotland(Echo) ->
+  found(case Echo of
+	    Echo when true; Echo, Echo, Echo ->
+		Echo;
+	    echo ->
+		[]
+	end,
+	Echo = placed).
+
+found(_, _) -> million.
+
+
+%% ERL-143: beam_bool could not handle Y registers as a destination.
+y_registers() ->
+    {'EXIT',{badarith,[_|_]}} = (catch baker(valentine)),
+    {'EXIT',{badarith,[_|_]}} = (catch baker(clementine)),
+
+    {not_ok,true} = potter([]),
+    {ok,false} = potter([{encoding,any}]),
+
+    ok.
+
+%% Thanks to Quickcheck.
+baker(Baker) ->
+    (valentine == Baker) +
+	case Baker of
+	    Baker when Baker; Baker ->
+		Baker;
+	    Baker ->
+		[]
+	end.
+
+%% Thanks to Jose Valim.
+potter(Modes) ->
+    Raw = lists:keyfind(encoding, 1, Modes) == false,
+    Final = case Raw of
+		X when X == false; X == nil -> ok;
+		_ -> not_ok
+	    end,
+    {Final,Raw}.
+
+protected() ->
+    {'EXIT',{if_clause,_}} = (catch photographs({1, surprise, true}, opinions)),
+
+    {{true}} = welcome({perfect, true}),
+    {'EXIT',{if_clause,_}} = (catch welcome({perfect, false})),
+    ok.
+
+photographs({_Violation, surprise, Deep}, opinions) ->
+    {if
+	 0; "here", Deep ->
+	     Deep = Deep
+     end}.
+
+welcome({perfect, Profit}) ->
+    if
+	Profit, Profit, Profit; 0 ->
+	    {id({Profit})}
+    end.
+
+maps() ->
+    ok = evidence(#{0 => 42}).
+
+%% Cover handling of put_map in in split_block_label_used/2.
+evidence(#{0 := Charge}) when 0; #{[] => Charge} == #{[] => 42} ->
+    ok.
+
+
 
 %% Call this function to turn off constant propagation.
 id(I) -> I.
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index f543f0d4de..621524114f 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -229,14 +229,6 @@ silly_coverage(Config) when is_list(Config) ->
 		      {label,2}|non_proper_list]}],99},
     expect_error(fun() -> beam_except:module(ExceptInput, []) end),
 
-    %% beam_bool
-    BoolInput = {?MODULE,[{foo,0}],[],
-		  [{function,foo,0,2,
-		    [{label,1},
-		     {func_info,{atom,?MODULE},{atom,foo},0},
-		     {label,2}|non_proper_list]}],99},
-    expect_error(fun() -> beam_bool:module(BoolInput, []) end),
-
     %% beam_dead. This is tricky. Our function must look OK to
     %% beam_utils:clean_labels/1, but must crash beam_dead.
     DeadInput = {?MODULE,[{foo,0}],[],