Merge branch 'pan/otp_8579_autoimport_override' into dev

* origin/pan/otp_8579_autoimport_override:
  Update preloaded modules
  Update primary bootstrap
  Remove outcommented code from erl_lint
  Make port_command/3 auto-imported
  Remove (harmless) warnings about min/max in core applications
  Autoimport min/2 and max/2
  Improve coverage of erl_int in testcases
  Change warning to error for nowarn_bif_clash compiler directive
  Add -compile({no_auto_import,[F/A]}) doc to compiler.xml
  Add some testcases to compiler to verify that overriding really happens
  Return nowarn_bif_clash functionality but with warning
  Teach erl_lint to better override BIFs with local functions and imports
  Teach compiler to override autoimport with import
  First prototype for local functions overriding autoimported

OTP-8579  Local functions should override auto-imported

Local and imported functions now override the autoimported
BIFs when the names clash. The pre R14 behaviour was that
autoimported BIFs would override local functions. To avoid
that old programs change behaviour, the following will
generate an error:

Doing a call without explicit module name to a local function
having a name clashing with the name of an autoimported BIF
that was present (and autoimported) before OTP R14A
Explicitly importing a function having a name clashing with
the name of an autoimported BIF that was present (and
autoimported) before OTP R14A Using any form of the old
compiler directive nowarn_bif_clash

If the BIF was added or autoimported in OTP R14A or later,
overriding it with an import or a local function will only
result in a warning,

To resolve clashes, you can either use the explicit module
name erlang to call the BIF, or you can remove the autoimport
of that specific BIF by using the new compiler directive
-compile({no_auto_import,[F/A]})., which makes all calls to
the local or imported function without explicit module name
pass without warnings or errors.

The change makes it possible to add autoimported BIFs without
breaking or silently changing old code in the future. However
some current code ingeniously utilizing the old behaviour or
the nowarn_bif_clash compiler directive, might need changing
to be accepted by the compiler.

4 files changed, 215 insertions, 14 deletions

diff --git a/lib/compiler/test/error_SUITE.erl b/lib/compiler/test/error_SUITE.erl
index 4530313bb0..0874225a62 100644
--- a/lib/compiler/test/error_SUITE.erl
+++ b/lib/compiler/test/error_SUITE.erl
@@ -21,11 +21,133 @@
 -include("test_server.hrl").
 
 -export([all/1,
-	 head_mismatch_line/1,warnings_as_errors/1]).
+	 head_mismatch_line/1,warnings_as_errors/1, bif_clashes/1]).
 
 all(suite) ->
     test_lib:recompile(?MODULE),
-    [head_mismatch_line,warnings_as_errors].
+    [head_mismatch_line,warnings_as_errors,bif_clashes].
+
+
+bif_clashes(Config) when is_list(Config) ->
+    Ts = [{bif_clashes1,
+           <<"
+              -export([t/0]).
+              t() ->
+                 length([a,b,c]).
+
+              length(X) ->
+               erlang:length(X).
+             ">>,
+           [return_warnings],
+	   {error,
+	    [{4, erl_lint,{call_to_redefined_old_bif,{length,1}}}], []} }],
+    ?line [] = run(Config, Ts),
+    Ts1 = [{bif_clashes2,
+           <<"
+              -export([t/0]).
+              -import(x,[length/1]).
+              t() ->
+                 length([a,b,c]).
+             ">>,
+           [return_warnings],
+	    {error,
+	     [{3, erl_lint,{redefine_old_bif_import,{length,1}}}], []} }],
+    ?line [] = run(Config, Ts1),
+    Ts00 = [{bif_clashes3,
+           <<"
+              -export([t/0]).
+              -compile({no_auto_import,[length/1]}).
+              t() ->
+                 length([a,b,c]).
+
+              length(X) ->
+               erlang:length(X).
+             ">>,
+           [return_warnings],
+	   []}],
+    ?line [] = run(Config, Ts00),
+    Ts11 = [{bif_clashes4,
+           <<"
+              -export([t/0]).
+              -compile({no_auto_import,[length/1]}).
+              -import(x,[length/1]).
+              t() ->
+                 length([a,b,c]).
+             ">>,
+           [return_warnings],
+	    []}],
+    ?line [] = run(Config, Ts11),
+    Ts000 = [{bif_clashes5,
+           <<"
+              -export([t/0]).
+              t() ->
+                 binary_part(<<1,2,3,4>>,1,2).
+
+              binary_part(X,Y,Z) ->
+               erlang:binary_part(X,Y,Z).
+             ">>,
+           [return_warnings],
+	   {warning,
+	    [{4, erl_lint,{call_to_redefined_bif,{binary_part,3}}}]} }],
+    ?line [] = run(Config, Ts000),
+    Ts111 = [{bif_clashes6,
+           <<"
+              -export([t/0]).
+              -import(x,[binary_part/3]).
+              t() ->
+                  binary_part(<<1,2,3,4>>,1,2).
+             ">>,
+           [return_warnings],
+	    {warning,
+	     [{3, erl_lint,{redefine_bif_import,{binary_part,3}}}]} }],
+    ?line [] = run(Config, Ts111),
+    Ts2 = [{bif_clashes7,
+           <<"
+              -export([t/0]).
+              -compile({no_auto_import,[length/1]}).
+              -import(x,[length/1]).
+              t() ->
+                 length([a,b,c]).
+              length(X) ->
+                 erlang:length(X).
+             ">>,
+           [],
+          {error,
+           [{7,erl_lint,{define_import,{length,1}}}],
+           []} }],
+    ?line [] = run2(Config, Ts2),
+    Ts3 = [{bif_clashes8,
+           <<"
+              -export([t/1]).
+              -compile({no_auto_import,[length/1]}).
+              t(X) when length(X) > 3 ->
+                 length([a,b,c]).
+              length(X) ->
+                 erlang:length(X).
+             ">>,
+           [],
+          {error,
+           [{4,erl_lint,illegal_guard_expr}],
+           []} }],
+    ?line [] = run2(Config, Ts3),
+    Ts4 = [{bif_clashes9,
+           <<"
+              -export([t/1]).
+              -compile({no_auto_import,[length/1]}).
+              -import(x,[length/1]).
+              t(X) when length(X) > 3 ->
+                 length([a,b,c]).
+             ">>,
+           [],
+          {error,
+           [{5,erl_lint,illegal_guard_expr}],
+           []} }],
+    ?line [] = run2(Config, Ts4),
+
+    ok.
+
+
+
 
 %% Tests that a head mismatch is reported on the correct line (OTP-2125).
 head_mismatch_line(Config) when is_list(Config) ->
@@ -49,7 +171,7 @@ warnings_as_errors(Config) when is_list(Config) ->
                  A = unused,
                  ok.
              ">>,
-           [warnings_as_errors],
+           [export_all,warnings_as_errors],
           {error,
            [],
            [{3,erl_lint,{unused_var,'A'}}]} }],
@@ -70,6 +192,24 @@ run(Config, Tests) ->
         end,
     lists:foldl(F, [], Tests).
 
+run2(Config, Tests) ->
+    F = fun({N,P,Ws,E}, BadL) ->
+                case catch filter(run_test(Config, P, Ws)) of
+                    E ->
+                        BadL;
+                    Bad ->
+                        ?t:format("~nTest ~p failed. Expected~n  ~p~n"
+                                  "but got~n  ~p~n", [N, E, Bad]),
+			fail()
+                end
+        end,
+    lists:foldl(F, [], Tests).
+
+filter({error,Es,_Ws}) ->
+    {error,Es,[]};
+filter(X) ->
+    X.
+
 
 %% Compiles a test module and returns the list of errors and warnings.
 
@@ -78,17 +218,29 @@ run_test(Conf, Test0, Warnings) ->
     ?line DataDir = ?config(priv_dir, Conf),
     ?line Test = ["-module(errors_test). ", Test0],
     ?line File = filename:join(DataDir, Filename),
-    ?line Opts = [binary,export_all,return|Warnings],
+    ?line Opts = [binary,return_errors|Warnings],
     ?line ok = file:write_file(File, Test),
 
     %% Compile once just to print all errors and warnings.
-    ?line compile:file(File, [binary,export_all,report|Warnings]),
+    ?line compile:file(File, [binary,report|Warnings]),
 
     %% Test result of compilation.
     ?line Res = case compile:file(File, Opts) of
-		    {error,[{_File,Es}],Ws} ->
+		    {ok,errors_test,_,[{_File,Ws}]} ->
+			%io:format("compile:file(~s,~p) ->~n~p~n",
+			%	  [File,Opts,Ws]),
+			{warning,Ws};
+		    {ok,errors_test,_,[]} ->
+			%io:format("compile:file(~s,~p) ->~n~p~n",
+			%	  [File,Opts,Ws]),
+			[];
+		    {error,[{XFile,Es}],Ws} = _ZZ when is_list(XFile) ->
+			%io:format("compile:file(~s,~p) ->~n~p~n",
+			%	  [File,Opts,_ZZ]),
 			{error,Es,Ws};
-		    {error,Es,[{_File,Ws}]} ->
+		    {error,Es,[{_File,Ws}]} = _ZZ->
+			%io:format("compile:file(~s,~p) ->~n~p~n",
+			%	  [File,Opts,_ZZ]),
 			{error,Es,Ws}
 		end,
     file:delete(File),
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index aa1b3b16dc..8f23bd2e5a 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -31,7 +31,7 @@
 	 t_is_boolean/1,is_function_2/1,
 	 tricky/1,rel_ops/1,literal_type_tests/1,
 	 basic_andalso_orelse/1,traverse_dcd/1,
-	 check_qlc_hrl/1,andalso_semi/1,tuple_size/1,binary_part/1]).
+	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1]).
 
 all(suite) ->
     test_lib:recompile(?MODULE),
@@ -43,7 +43,7 @@ all(suite) ->
      build_in_guard,old_guard_tests,gbif,
      t_is_boolean,is_function_2,tricky,rel_ops,literal_type_tests,
      basic_andalso_orelse,traverse_dcd,check_qlc_hrl,andalso_semi,
-     tuple_size,binary_part].
+     t_tuple_size,binary_part].
 
 misc(Config) when is_list(Config) ->
     ?line 42 = case id(42) of
@@ -1330,7 +1330,7 @@ andalso_semi_bar(Bar) when is_list(Bar) andalso length(Bar) =:= 3; Bar =:= 1 ->
    ok.
 
 
-tuple_size(Config) when is_list(Config) ->
+t_tuple_size(Config) when is_list(Config) ->
     ?line 10 = do_tuple_size({1,2,3,4}),
     ?line fc(catch do_tuple_size({1,2,3})),
     ?line fc(catch do_tuple_size(42)),
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index 126a679724..450a4e279d 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -20,10 +20,23 @@
 
 -export([all/1,init_per_testcase/2,fin_per_testcase/2,
 	 tobias/1,empty_string/1,md5/1,silly_coverage/1,
-	 confused_literals/1,integer_encoding/1]).
+	 confused_literals/1,integer_encoding/1,override_bif/1]).
 	 
 -include("test_server.hrl").
 
+%% For the override_bif testcase.
+%% NB, no other testcases in this testsuite can use these without erlang:prefix!
+-compile({no_auto_import,[abs/1]}).
+-compile({no_auto_import,[binary_part/3]}).
+-compile({no_auto_import,[binary_part/2]}).
+-import(test_lib,[binary_part/2]).
+
+%% This should do no harm (except for fun byte_size/1 which does not, by design, work with import
+-compile({no_auto_import,[byte_size/1]}).
+-import(erlang,[byte_size/1]).
+
+
+
 %% Include an opaque declaration to cover the stripping of
 %% opaque types from attributes in v3_kernel.
 -opaque misc_SUITE_test_cases() :: [atom()].
@@ -42,7 +55,39 @@ fin_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
 all(suite) ->
     test_lib:recompile(?MODULE),
     [tobias,empty_string,md5,silly_coverage,confused_literals,
-     integer_encoding].
+     integer_encoding, override_bif].
+
+
+%%
+%% Functions that override new and old bif's
+%%
+abs(_N) ->
+    dummy_abs.
+
+binary_part(_,_,_) ->
+    dummy_bp.
+
+% Make sure that auto-imported BIF's are overridden correctly
+
+override_bif(suite) ->
+    [];
+override_bif(doc) ->
+    ["Test dat local functions and imports override auto-imported BIFs."];
+override_bif(Config) when is_list(Config) ->
+    ?line dummy_abs = abs(1),
+    ?line dummy_bp = binary_part(<<"hello">>,1,1),
+    ?line dummy = binary_part(<<"hello">>,{1,1}),
+    ?line 1 = erlang:abs(1),
+    ?line <<"e">> = erlang:binary_part(<<"hello">>,1,1),
+    ?line <<"e">> = erlang:binary_part(<<"hello">>,{1,1}),
+    F = fun(X) when byte_size(X) =:= 4 ->
+		four;
+	   (X) ->
+		byte_size(X)
+	end,
+    ?line four = F(<<1,2,3,4>>),
+    ?line 5 = F(<<1,2,3,4,5>>),
+    ok.
 
 %% A bug reported by Tobias Lindahl for a development version of R11B.
 
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index 05236ee010..d8799952a9 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -19,8 +19,8 @@
 -module(test_lib).
 
 -include("test_server.hrl").
-
--export([recompile/1,opt_opts/1,get_data_dir/1,smoke_disasm/1,p_run/2]).
+-compile({no_auto_import,[binary_part/2]}).
+-export([recompile/1,opt_opts/1,get_data_dir/1,smoke_disasm/1,p_run/2,binary_part/2]).
 
 recompile(Mod) when is_atom(Mod) ->
     case whereis(cover_server) of
@@ -104,3 +104,7 @@ p_run_loop(Test, List, N, Refs0, Errors0, Ws0) ->
 	    Refs = Refs0 -- [Ref],
 	    p_run_loop(Test, List, N, Refs, Errors, Ws)
     end.
+
+%% This is for the misc_SUITE:override_bif testcase
+binary_part(_A,_B) ->
+    dummy.