Merge branch 'bjorn/compiler/dup-bug-fix/OTP-12453'

* bjorn/compiler/dup-bug-fix/OTP-12453:
  Teach case_opt/3 to avoid unnecessary building
  sys_core_fold: Optimize let statements more aggressively
  Suppress warnings for expressions that are assigned to '_'
  trace_bif_SUITE: Ensure that a call to time/0 is not removed

1 files changed, 42 insertions, 2 deletions

diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index 1358e002e2..40a5ba2b17 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -23,7 +23,8 @@
 	 t_element/1,setelement/1,t_length/1,append/1,t_apply/1,bifs/1,
 	 eq/1,nested_call_in_case/1,guard_try_catch/1,coverage/1,
 	 unused_multiple_values_error/1,unused_multiple_values/1,
-	 multiple_aliases/1,redundant_boolean_clauses/1,mixed_matching_clauses/1]).
+	 multiple_aliases/1,redundant_boolean_clauses/1,
+	 mixed_matching_clauses/1,unnecessary_building/1]).
 
 -export([foo/0,foo/1,foo/2,foo/3]).
 
@@ -40,7 +41,8 @@ groups() ->
       [t_element,setelement,t_length,append,t_apply,bifs,
        eq,nested_call_in_case,guard_try_catch,coverage,
        unused_multiple_values_error,unused_multiple_values,
-       multiple_aliases,redundant_boolean_clauses,mixed_matching_clauses]}].
+       multiple_aliases,redundant_boolean_clauses,
+       mixed_matching_clauses,unnecessary_building]}].
 
 
 init_per_suite(Config) ->
@@ -252,6 +254,8 @@ do_guard_try_catch(K, V) ->
 	    false
     end.
 
+-record(cover_opt_guard_try, {list=[]}).
+
 coverage(Config) when is_list(Config) ->
     ?line {'EXIT',{{case_clause,{a,b,c}},_}} =
 	(catch cover_will_match_list_type({a,b,c})),
@@ -261,6 +265,9 @@ coverage(Config) when is_list(Config) ->
     ?line error = cover_will_match_lit_list(),
     {ok,[a]} = cover_is_safe_bool_expr(a),
 
+    ok = cover_opt_guard_try(#cover_opt_guard_try{list=[a]}),
+    error = cover_opt_guard_try(#cover_opt_guard_try{list=[]}),
+
     %% Make sure that we don't attempt to make literals
     %% out of pids. (Putting a pid into a #c_literal{}
     %% would crash later compiler passes.)
@@ -314,6 +321,14 @@ cover_is_safe_bool_expr(X) ->
 	    false
     end.
 
+cover_opt_guard_try(Msg) ->
+    if
+	length(Msg#cover_opt_guard_try.list) =/= 1 ->
+	    error;
+	true ->
+	    ok
+    end.
+
 bsm_an_inlined(<<_:8>>, _) -> ok;
 bsm_an_inlined(_, _) -> error.
 
@@ -400,4 +415,29 @@ mixed_matching_clauses(Config) when is_list(Config) ->
       end,
   ok.
 
+unnecessary_building(Config) when is_list(Config) ->
+    Term1 = do_unnecessary_building_1(test_lib:id(a)),
+    [{a,a},{a,a}] = Term1,
+    7 = erts_debug:size(Term1),
+
+    %% The Input term should not be rebuilt (thus, it should
+    %% only be counted once in the size of the combined term).
+    Input = test_lib:id({a,b,c}),
+    Term2 = test_lib:id(do_unnecessary_building_2(Input)),
+    {b,[{a,b,c},none],x} = Term2,
+    4+4+4+2 = erts_debug:size([Term2|Input]),
+
+    ok.
+
+do_unnecessary_building_1(S) ->
+    %% The tuple must only be built once.
+    F0 = F1 = {S,S},
+    [F0,F1].
+
+do_unnecessary_building_2({a,_,_}=T) ->
+    %% The T term should not be rebuilt.
+    {b,
+     [_,_] = [T,none],
+     x}.
+
 id(I) -> I.