Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 355 insertions, 68 deletions

diff --git a/lib/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl
index f00bfe663b..f884e6e7d6 100644
--- a/lib/compiler/test/warnings_SUITE.erl
+++ b/lib/compiler/test/warnings_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% 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
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     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%
 %%
@@ -26,9 +27,9 @@
 -define(privdir, "warnings_SUITE_priv").
 -define(t, test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
--define(datadir, ?config(data_dir, Conf)).
--define(privdir, ?config(priv_dir, Conf)).
+-include_lib("common_test/include/ct.hrl").
+-define(datadir, proplists:get_value(data_dir, Conf)).
+-define(privdir, proplists:get_value(priv_dir, Conf)).
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -37,21 +38,21 @@
 
 -export([pattern/1,pattern2/1,pattern3/1,pattern4/1,
 	 guard/1,bad_arith/1,bool_cases/1,bad_apply/1,
-         files/1,effect/1,bin_opt_info/1,bin_construction/1]).
-
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(2)).
+         files/1,effect/1,bin_opt_info/1,bin_construction/1,
+	 comprehensions/1,maps/1,maps_bin_opt_info/1,
+         redundant_boolean_clauses/1,
+	 latin1_fallback/1,underscore/1,no_warnings/1,
+	 bit_syntax/1]).
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     test_lib:recompile(?MODULE),
@@ -61,7 +62,10 @@ groups() ->
     [{p,test_lib:parallel(),
       [pattern,pattern2,pattern3,pattern4,guard,
        bad_arith,bool_cases,bad_apply,files,effect,
-       bin_opt_info,bin_construction]}].
+       bin_opt_info,bin_construction,comprehensions,maps,
+       maps_bin_opt_info,
+       redundant_boolean_clauses,latin1_fallback,
+       underscore,no_warnings,bit_syntax]}].
 
 init_per_suite(Config) ->
     Config.
@@ -96,7 +100,7 @@ pattern(Config) when is_list(Config) ->
 	    [{2,v3_core,nomatch},
 	     {6,v3_core,nomatch},
 	     {11,v3_core,nomatch} ] }}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 pattern2(Config) when is_list(Config) ->
@@ -117,9 +121,10 @@ pattern2(Config) when is_list(Config) ->
 	   Source,
 	   [nowarn_unused_vars],
 	   {warnings,[{2,sys_core_fold,{nomatch_shadow,1}},
+		      {4,sys_core_fold,no_clause_match},
 		      {5,sys_core_fold,nomatch_clause_type},
 		      {6,sys_core_fold,nomatch_clause_type}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     %% Disable Core Erlang optimizations. v3_kernel should produce
     %% a warning for the clause that didn't match.
@@ -128,7 +133,7 @@ pattern2(Config) when is_list(Config) ->
 	    [nowarn_unused_vars,no_copt],
 	    {warnings,
 	     [{2,v3_kernel,{nomatch_shadow,1}}]}}],
-    ?line [] = run(Config, Ts2),
+    [] = run(Config, Ts2),
     ok.
 
 pattern3(Config) when is_list(Config) ->
@@ -144,7 +149,7 @@ pattern3(Config) when is_list(Config) ->
 	   [nowarn_unused_vars],
 	   {warnings,
 	    [{4,v3_kernel,{nomatch_shadow,2}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     ok.
 
@@ -199,11 +204,13 @@ pattern4(Config) when is_list(Config) ->
 	   [nowarn_unused_vars],
 	   {warnings,
 	    [{9,sys_core_fold,no_clause_match},
+             {11,sys_core_fold,nomatch_shadow},
+             {15,sys_core_fold,nomatch_shadow},
 	     {18,sys_core_fold,no_clause_match},
 	     {23,sys_core_fold,no_clause_match},
 	     {33,sys_core_fold,no_clause_match}
 	    ]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     ok.
 
@@ -246,7 +253,7 @@ guard(Config) when is_list(Config) ->
 	     {11,sys_core_fold,nomatch_guard},
 	     {11,sys_core_fold,{eval_failure,badarg}}
 	    ]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     ok.
 
@@ -274,11 +281,12 @@ bad_arith(Config) when is_list(Config) ->
 	     {3,sys_core_fold,{eval_failure,badarith}},
 	     {9,sys_core_fold,nomatch_guard},
 	     {9,sys_core_fold,{eval_failure,badarith}},
+	     {9,sys_core_fold,{no_effect,{erlang,is_integer,1}}},
 	     {10,sys_core_fold,nomatch_guard},
 	     {10,sys_core_fold,{eval_failure,badarith}},
 	     {15,sys_core_fold,{eval_failure,badarith}}
 	    ] }}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 bool_cases(Config) when is_list(Config) ->
@@ -310,7 +318,7 @@ bool_cases(Config) when is_list(Config) ->
 	    [{6,sys_core_fold,nomatch_shadow},
 	     {13,sys_core_fold,nomatch_shadow},
 	     {18,sys_core_fold,nomatch_clause_type} ]} }],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 bad_apply(Config) when is_list(Config) ->
@@ -329,11 +337,11 @@ bad_apply(Config) when is_list(Config) ->
 	     {4,v3_kernel,bad_call},
 	     {5,v3_kernel,bad_call},
 	     {6,v3_kernel,bad_call}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     %% Also verify that the generated code generates the correct error.
-    ?line try erlang:42() of
-	      _ -> ?line ?t:fail()
+    try erlang:42() of
+	      _ -> ct:fail(should_fail)
 	  catch
 	      error:badarg -> ok
 	  end,
@@ -357,12 +365,12 @@ files(Config) when is_list(Config) ->
             [{"file1",[{17,sys_core_fold,{eval_failure,badarith}}]},
              {"file2",[{10,sys_core_fold,{eval_failure,badarith}}]}]}}],
 
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 %% Test warnings for term construction and BIF calls in effect context.
 effect(Config) when is_list(Config) ->
-    Ts = [{lc,
+    Ts = [{effect,
 	   <<"
              t(X) ->
                case X of
@@ -389,6 +397,10 @@ effect(Config) when is_list(Config) ->
               	    <<X:8>>;
               	unused_fun ->
               	    fun() -> {ok,X} end;
+		unused_named_fun ->
+		    fun F(0) -> 1;
+                        F(N) -> N*F(N-1)
+                    end;
               	unused_atom ->
               	    ignore;				%no warning
               	unused_nil ->
@@ -464,6 +476,19 @@ effect(Config) when is_list(Config) ->
              m9(Bs) ->
                 [{B,ok} = {B,foo:bar(B)} || B <- Bs],
                 ok.
+
+             m10(ConfigTableSize) ->
+               case ConfigTableSize of
+                 apa ->
+                   CurrentConfig = {id(camel_phase3),id(sms)},
+                   case CurrentConfig of
+                     {apa, bepa} -> ok;
+		     _ -> ok
+	           end
+               end,
+               ok.
+
+             id(I) -> I.
              ">>,
 	   [],
 	   {warnings,[{5,sys_core_fold,{no_effect,{erlang,is_integer,1}}},
@@ -483,9 +508,10 @@ effect(Config) when is_list(Config) ->
 		      {22,sys_core_fold,{no_effect,{erlang,is_integer,1}}},
 		      {24,sys_core_fold,useless_building},
 		      {26,sys_core_fold,useless_building},
-		      {32,sys_core_fold,{no_effect,{erlang,'=:=',2}}},
-		      {34,sys_core_fold,{no_effect,{erlang,get_cookie,0}}}]}}],
-    ?line [] = run(Config, Ts),
+		      {28,sys_core_fold,useless_building},
+		      {36,sys_core_fold,{no_effect,{erlang,'=:=',2}}},
+		      {38,sys_core_fold,{no_effect,{erlang,get_cookie,0}}}]}}],
+    [] = run(Config, Ts),
     ok.
 
 bin_opt_info(Config) when is_list(Config) ->
@@ -508,14 +534,14 @@ bin_opt_info(Config) when is_list(Config) ->
 	      {5,beam_bsm,{no_bin_opt,{{t1,1},no_suitable_bs_start_match}}},
 	      {9,beam_bsm,{no_bin_opt,
 			   {binary_used_in,{extfunc,erlang,split_binary,2}}}} ]}}],
-    ?line [] = run(Config, Ts1),
+    [] = run(Config, Ts1),
 
     %% For coverage: don't give the bin_opt_info option.
     Ts2 = [{bsm2,
 	    Code,
 	    [],
 	    []}],
-    ?line [] = run(Config, Ts2),
+    [] = run(Config, Ts2),
     ok.
 
 bin_construction(Config) when is_list(Config) ->
@@ -532,10 +558,272 @@ bin_construction(Config) when is_list(Config) ->
 	   [],
 	   {warnings,[{4,sys_core_fold,embedded_binary_size},
 		      {8,sys_core_fold,{embedded_unit,8,28}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     
     ok.
 
+comprehensions(Config) when is_list(Config) ->
+    Ts = [{tautologic_guards,
+           <<"
+             f() -> [ true || true ].
+             g() -> << <<1>> || true >>.
+           ">>,
+           [], []}],
+    run(Config, Ts),
+    ok.
+
+maps(Config) when is_list(Config) ->
+    Ts = [{bad_map,
+           <<"
+             t() ->
+                 case maybe_map of
+                     #{} -> ok;
+                     not_map -> error
+                 end.
+             x() ->
+                 case true of
+                     #{}  -> error;
+                     true -> ok
+                 end.
+           ">>,
+           [],
+           {warnings,[{3,sys_core_fold,no_clause_match},
+                      {9,sys_core_fold,nomatch_clause_type}]}},
+	   {bad_map_src1,
+           <<"
+             t() ->
+		 M = {a,[]},
+		 {'EXIT',{badarg,_}} = (catch(M#{ a => 1 })),
+		 ok.
+           ">>,
+           [],
+	   {warnings,[{4,sys_core_fold,{eval_failure,badmap}}]}},
+	   {bad_map_src2,
+           <<"
+             t() ->
+		 M = id({a,[]}),
+		 {'EXIT',{badarg,_}} = (catch(M#{ a => 1})),
+		 ok.
+	     id(I) -> I.
+           ">>,
+	   [inline],
+	    []},
+	   {bad_map_src3,
+           <<"
+             t() ->
+		 {'EXIT',{badarg,_}} = (catch <<>>#{ a := 1}),
+		 ok.
+           ">>,
+           [],
+	   {warnings,[{3,v3_core,badmap}]}},
+	   {ok_map_literal_key,
+           <<"
+             t() ->
+		 V = id(1),
+		 M = id(#{ <<$h,$i>> => V }),
+		 V = case M of
+		    #{ <<0:257>> := Val } -> Val;
+		    #{ <<$h,$i>> := Val } -> Val
+		 end,
+		 ok.
+	     id(I) -> I.
+           ">>,
+           [],
+	   []}],
+    run(Config, Ts),
+    ok.
+
+maps_bin_opt_info(Config) when is_list(Config) ->
+    Ts = [{map_bsm,
+           <<"
+             t1(<<0:8,7:8,T/binary>>,#{val := I}=M) ->
+                 t1(T, M#{val := I+1});
+             t1(<<_:8>>,M) ->
+                 M.
+           ">>,
+           [bin_opt_info],
+           {warnings,[{2,beam_bsm,bin_opt}]}}],
+    [] = run(Config, Ts),
+    ok.
+
+redundant_boolean_clauses(Config) when is_list(Config) ->
+    Ts = [{redundant_boolean_clauses,
+           <<"
+             t(X) ->
+                 case X == 0 of
+                     false -> no;
+                     false -> no;
+                     true -> yes
+                 end.
+           ">>,
+           [],
+           {warnings,[{5,sys_core_fold,nomatch_shadow}]}}],
+    run(Config, Ts),
+    ok.
+
+latin1_fallback(Conf) when is_list(Conf) ->
+    DataDir = ?privdir,
+    IncFile = filename:join(DataDir, "include_me.hrl"),
+    file:write_file(IncFile, <<"%% ",246," in include file\n">>),
+    Ts1 = [{latin1_fallback1,
+	    %% Test that the compiler fall backs to latin-1 with
+	    %% a warning if a file has no encoding and does not
+	    %% contain correct UTF-8 sequences.
+	    <<"%% Bj",246,"rn
+              t(_) -> \"",246,"\";
+              t(x) -> ok.
+              ">>,
+	    [],
+	    {warnings,[{1,compile,reparsing_invalid_unicode},
+		       {3,sys_core_fold,{nomatch_shadow,2}}]}}],
+    [] = run(Conf, Ts1),
+
+    Ts2 = [{latin1_fallback2,
+	    %% Test that the compiler fall backs to latin-1 with
+	    %% a warning if a file has no encoding and does not
+	    %% contain correct UTF-8 sequences.
+	    <<"
+
+	      -include(\"include_me.hrl\").
+              ">>,
+	    [],
+	    {warnings,[{1,compile,reparsing_invalid_unicode}]}
+	   }],
+    [] = run(Conf, Ts2),
+
+    Ts3 = [{latin1_fallback3,
+	    %% Test that the compiler fall backs to latin-1 with
+	    %% a warning if a file has no encoding and does not
+	    %% contain correct UTF-8 sequences.
+	    <<"-ifdef(NOTDEFINED).
+              t(_) -> \"",246,"\";
+              t(x) -> ok.
+              -endif.
+              ">>,
+	    [],
+	    {warnings,[{2,compile,reparsing_invalid_unicode}]}}],
+    [] = run(Conf, Ts3),
+
+    ok.
+
+underscore(Config) when is_list(Config) ->
+    S0 = <<"f(A) ->
+              _VAR1 = <<A>>,
+              _VAR2 = {ok,A},
+              _VAR3 = [A],
+              ok.
+	    g(A) ->
+              _VAR1 = A/0,
+              _VAR2 = date(),
+	      ok.
+            h() ->
+               _VAR1 = fun() -> ok end,
+	      ok.
+            i(A) ->
+               _VAR1 = #{A=>42},
+	      ok.
+	 ">>,
+    Ts0 = [{underscore0,
+	    S0,
+	    [],
+	    {warnings,[{2,sys_core_fold,useless_building},
+		       {3,sys_core_fold,useless_building},
+		       {4,sys_core_fold,useless_building},
+		       {7,sys_core_fold,result_ignored},
+		       {8,sys_core_fold,{no_effect,{erlang,date,0}}},
+		       {11,sys_core_fold,useless_building},
+		       {14,sys_core_fold,useless_building}
+		      ]}}],
+    [] = run(Config, Ts0),
+
+    %% Replace all "_VAR<digit>" variables with a plain underscore.
+    %% Now there should be no warnings.
+    S1 = re:replace(S0, "_VAR\\d+", "_", [global]),
+    io:format("~s\n", [S1]),
+    Ts1 = [{underscore1,S1,[],[]}],
+    [] = run(Config, Ts1),
+
+    ok.
+
+no_warnings(Config) when is_list(Config) ->
+    Ts = [{no_warnings,
+           <<"-record(r, {s=ordsets:new(),a,b}).
+
+              a() ->
+                R = #r{},			%No warning expected.
+                {R#r.a,R#r.b}.
+
+              b(X) ->
+                T = true,
+                Var = [X],			%No warning expected.
+                case T of
+	          false -> Var;
+                  true -> []
+                end.
+
+              c() ->
+                R0 = {r,\"abc\",undefined,os:timestamp()}, %No warning.
+                case R0 of
+	          {r,V1,_V2,V3} -> {r,V1,\"def\",V3}
+                end.
+
+              d(In0, Bool) ->
+                {In1,Int} = case id(Bool) of
+                              false -> {In0,0}
+                            end,
+                [In1,Int].
+
+              id(I) -> I.
+           ">>,
+           [],
+           []}],
+    run(Config, Ts),
+    ok.
+
+bit_syntax(Config) ->
+    Ts = [{?FUNCTION_NAME,
+	   <<"a(<<-1>>) -> ok;
+              a(<<1023>>) -> ok;
+              a(<<777/signed>>) -> ok;
+              a(<<a/binary>>) -> ok;
+              a(<<a/integer>>) -> ok;
+              a(<<a/float>>) -> ok;
+              a(<<a/utf8>>) -> ok;
+              a(<<a/utf16>>) -> ok;
+              a(<<a/utf32>>) -> ok;
+              a(<<a/utf32>>) -> ok.
+              b(Bin) -> Sz = bad, <<42:Sz>> = Bin.
+              c(Sz, Bin) ->
+                case Bin of
+                  <<-42:Sz/unsigned>> -> ok;
+                  <<42:Sz/float>> -> ok;
+                  <<42:Sz/binary>> -> ok
+                end.
+             ">>,
+	   [],
+	   {warnings,[{1,sys_core_fold,no_clause_match},
+		      {1,sys_core_fold,{nomatch_bit_syntax_unsigned,-1}},
+		      {2,sys_core_fold,{nomatch_bit_syntax_truncated,
+					unsigned,1023,8}},
+		      {3,sys_core_fold,{nomatch_bit_syntax_truncated,
+					signed,777,8}},
+		      {4,sys_core_fold,{nomatch_bit_syntax_type,a,binary}},
+		      {5,sys_core_fold,{nomatch_bit_syntax_type,a,integer}},
+		      {6,sys_core_fold,{nomatch_bit_syntax_type,a,float}},
+		      {7,sys_core_fold,{nomatch_bit_syntax_type,a,utf8}},
+		      {8,sys_core_fold,{nomatch_bit_syntax_type,a,utf16}},
+		      {9,sys_core_fold,{nomatch_bit_syntax_type,a,utf32}},
+		      {10,sys_core_fold,{nomatch_bit_syntax_type,a,utf32}},
+		      {11,sys_core_fold,no_clause_match},
+		      {11,sys_core_fold,{nomatch_bit_syntax_size,bad}},
+		      {14,sys_core_fold,{nomatch_bit_syntax_unsigned,-42}},
+		      {16,sys_core_fold,{nomatch_bit_syntax_type,42,binary}}
+		     ]}
+	  }],
+    run(Config, Ts),
+    ok.
+
+
 %%%
 %%% End of test cases.
 %%%
@@ -546,7 +834,7 @@ run(Config, Tests) ->
                     E -> 
                         BadL;
                     Bad -> 
-                        ?t:format("~nTest ~p failed. Expected~n  ~p~n"
+                        io:format("~nTest ~p failed. Expected~n  ~p~n"
                                   "but got~n  ~p~n", [N, E, Bad]),
 			fail()
                 end
@@ -557,35 +845,34 @@ run(Config, Tests) ->
 %% Compiles a test module and returns the list of errors and warnings.
 
 run_test(Conf, Test0, Warnings) ->
-    Mod = "warnings_"++test_lib:uniq(),
-    Filename = Mod ++ ".erl",
-    ?line DataDir = ?privdir,
-    Test = ["-module(", Mod, "). ", Test0],
-    ?line File = filename:join(DataDir, Filename),
-    ?line Opts = [binary,export_all,return|Warnings],
-    ?line ok = file:write_file(File, Test),
+    Module = "warnings_"++test_lib:uniq(),
+    Filename = Module ++ ".erl",
+    DataDir = ?privdir,
+    Test = ["-module(", Module, "). ", Test0],
+    File = filename:join(DataDir, Filename),
+    Opts = [binary,export_all,return|Warnings],
+    ok = file:write_file(File, Test),
 
     %% Compile once just to print all warnings.
-    ?line compile:file(File, [binary,export_all,report|Warnings]),
+    compile:file(File, [binary,export_all,report|Warnings]),
 
     %% Test result of compilation.
-    ?line Res = case compile:file(File, Opts) of
-		    {ok, _M, Bin, []} when is_binary(Bin) ->
-			[];
-		    {ok, _M, Bin, Ws0} when is_binary(Bin) ->
-			%% We are not interested in warnings from
-			%% erl_lint here.
-			WsL = [{F,[W || {_,Mod,_}=W <- Ws, 
-					Mod =/= erl_lint]} ||
-				  {F,Ws} <- Ws0],
-                        case WsL of 
-                            [{_File,Ws}] -> {warnings, Ws};
-                            _ -> list_to_tuple([warnings, WsL])
-                        end
-		end,
+    Res = case compile:file(File, Opts) of
+	      {ok, _M, Bin, []} when is_binary(Bin) ->
+		  [];
+	      {ok, _M, Bin, Ws0} when is_binary(Bin) ->
+		  %% We are not interested in warnings from
+		  %% erl_lint here.
+		  WsL = [{F,[W || {_,Mod,_}=W <- Ws,
+				  Mod =/= erl_lint]} ||
+			    {F,Ws} <- Ws0],
+		  case WsL of
+		      [{_File,Ws}] -> {warnings, Ws};
+		      _ -> list_to_tuple([warnings, WsL])
+		  end
+	  end,
     file:delete(File),
     Res.
 
 fail() ->
-    io:format("failed~n"),
-    ?t:fail().
+    ct:fail(failed).