Merge branch 'bjorn/cuddle-with-tests'

* bjorn/cuddle-with-tests:
  Improve coverage of beam_ssa_bool
  beam_SUITE: Run the fconv/1 test case

erts/emulator/test/beam_SUITE.erl

@@ -36,7 +36,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [packed_registers, apply_last, apply_last_bif,
-     heap_sizes, big_lists,
+     heap_sizes, big_lists, fconv,
      select_val, select_tuple_arity,
      swap_temp_apply, beam_init_yregs].
 
@@ -284,7 +284,10 @@ do_fconv(atom, Float) when is_float(Float) ->
 do_fconv(nil, Float) when is_float(Float) ->
     Float + [];
 do_fconv(tuple_literal, Float) when is_float(Float) ->
-    Float + {a,b}.
+    Float + {a,b};
+do_fconv(A, B) when is_float(A), is_float(B) ->
+    A + B.
+
 
 select_val(Config) when is_list(Config) ->
     Mod = ?FUNCTION_NAME,

lib/compiler/test/guard_SUITE.erl

@@ -3140,6 +3140,9 @@ beam_ssa_bool_coverage() ->
     error = beam_ssa_bool_coverage_2(false),
     error = beam_ssa_bool_coverage_2(42),
 
+    error = beam_ssa_bool_coverage_3(42),
+    error = beam_ssa_bool_coverage_3(a),
+
     ok.
 
 collect_modifiers([H | T], Buffer)
@@ -3159,6 +3162,11 @@ beam_ssa_bool_coverage_2(A) when is_pid(A) andalso true; A ->
 beam_ssa_bool_coverage_2(_) ->
     error.
 
+beam_ssa_bool_coverage_3(A) when ok; ((ok =< A + 1) or false) and true orelse ok ->
+    ok;
+beam_ssa_bool_coverage_3(_) ->
+    error.
+
 gh_6164() ->
     true = do_gh_6164(id([])),
     {'EXIT',{{case_clause,42},_}} = catch do_gh_6164(id(0)),