Merge branch 'bjorn/compiler/misc'

* bjorn/compiler/misc:
  beam_bool_SUITE: Cover one more line
  beam_utils_SUITE: Cover more lines in beam_utils
  beam_reorder: Don't confuse beam_validator
  beam_bool: Reject potentially unsafe optimization
  v3_core: Don't depend on sys_core_fold for cleaning up
  beam_type: Eliminate crash
  beam_type: Correct handling of setelement/3
  beam_validator: Handle cons literals better
  beam_validator: Keep better track of tuple literals

1 files changed, 34 insertions, 2 deletions

diff --git a/lib/compiler/test/beam_type_SUITE.erl b/lib/compiler/test/beam_type_SUITE.erl
index 8d5c0190ed..69e2f1838d 100644
--- a/lib/compiler/test/beam_type_SUITE.erl
+++ b/lib/compiler/test/beam_type_SUITE.erl
@@ -21,7 +21,8 @@
 
 -export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
-	 integers/1,coverage/1,booleans/1]).
+	 integers/1,coverage/1,booleans/1,setelement/1,cons/1,
+	 tuple/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -33,7 +34,10 @@ groups() ->
     [{p,[parallel],
       [integers,
        coverage,
-       booleans
+       booleans,
+       setelement,
+       cons,
+       tuple
       ]}].
 
 init_per_suite(Config) ->
@@ -55,6 +59,8 @@ integers(_Config) ->
     a = do_integers_2(<<0:1>>),
     {'EXIT',{{case_clause,-1},_}} = (catch do_integers_2(<<1:1>>)),
 
+    college = do_integers_3(),
+
     ok.
 
 do_integers_1(B0) ->
@@ -71,6 +77,12 @@ do_integers_2(Bin) ->
 	1 -> b
     end.
 
+do_integers_3() ->
+    case try 0 after [] end of
+	0 -> college;
+	1 -> 0
+    end.
+
 coverage(_Config) ->
     {'EXIT',{badarith,_}} = (catch id(1) bsl 0.5),
     {'EXIT',{badarith,_}} = (catch id(2.0) bsl 2),
@@ -94,5 +106,25 @@ do_booleans(B) ->
 	no -> no
     end.
 
+setelement(_Config) ->
+    T0 = id({a,42}),
+    {a,_} = T0,
+    {b,_} = setelement(1, T0, b),
+    ok.
+
+cons(_Config) ->
+    [did] = cons(assigned, did),
+    ok.
+
+cons(assigned, Instrument) ->
+    [Instrument] = [did].
+
+tuple(_Config) ->
+    {'EXIT',{{badmatch,{necessary}},_}} = (catch do_tuple()),
+    ok.
+
+do_tuple() ->
+    {0, _} = {necessary}.
+
 id(I) ->
     I.