Merge branch 'bjorn/remove-concat-binary/OTP-9421' into major

* bjorn/remove-concat-binary/OTP-9421:
  Update preloaded modules
  Remove deprecated concat_binary/1

9 files changed, 4 insertions, 64 deletions

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 7cfab0785d..b7d775541f 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -538,15 +538,6 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name name="concat_binary" arity="1"/>
-      <fsummary>Concatenate a list of binaries (deprecated)</fsummary>
-      <desc>
-        <p>Do not use; use
-          <seealso marker="#list_to_binary/1">list_to_binary/1</seealso>
-          instead.</p>
-      </desc>
-    </func>
-    <func>
       <name>erlang:crc32(Data) -> integer() >= 0</name>
       <fsummary>Compute crc32 (IEEE 802.3) checksum</fsummary>
       <type>
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 4e82381fba..459dc84565 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -33,7 +33,6 @@
 %%      erlang:external_size/1
 %%	size(Binary)
 %%      iolist_size/1
-%%	concat_binary/1
 %%	split_binary/2
 %%      hash(Binary, N)
 %%      phash(Binary, N)
@@ -47,7 +46,7 @@
 	 init_per_testcase/2, end_per_testcase/2,
 	 copy_terms/1, conversions/1, deep_lists/1, deep_bitstr_lists/1,
 	 bad_list_to_binary/1, bad_binary_to_list/1,
-	 t_split_binary/1, bad_split/1, t_concat_binary/1,
+	 t_split_binary/1, bad_split/1,
 	 terms/1, terms_float/1, external_size/1, t_iolist_size/1,
 	 t_hash/1,
 	 bad_size/1,
@@ -68,7 +67,7 @@ suite() -> [{ct_hooks,[ts_install_cth]},
 
 all() -> 
     [copy_terms, conversions, deep_lists, deep_bitstr_lists,
-     t_split_binary, bad_split, t_concat_binary,
+     t_split_binary, bad_split,
      bad_list_to_binary, bad_binary_to_list, terms,
      terms_float, external_size, t_iolist_size,
      bad_binary_to_term_2, safe_binary_to_term2,
@@ -93,7 +92,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Config.
 
@@ -381,41 +379,6 @@ bad_split(Config) when is_list(Config) ->
 bad_split(Bin, Pos) ->
     {'EXIT',{badarg,_}} = (catch split_binary(Bin, Pos)).
 
-%% Tests concat_binary/2 and size/1.
-
-t_concat_binary(suite) -> [];
-t_concat_binary(Config) when is_list(Config) ->
-    test_concat([]),
-
-    test_concat([[]]),
-    test_concat([[], []]),
-    test_concat([[], [], []]),
-
-    test_concat([[1], []]),
-    test_concat([[], [2]]),
-    test_concat([[], [3], []]),
-
-    test_concat([[1, 2, 3], [4, 5, 6, 7]]),
-    test_concat([[1, 2, 3], [4, 5, 6, 7], [9, 10]]),
-
-    test_concat([lists:seq(0, 255), lists:duplicate(1024, $@),
-		 lists:duplicate(2048, $a),
-		 lists:duplicate(4000, $b)]),
-    ok.
-
-test_concat(Lists) ->
-    test_concat(Lists, 0, [], []).
-
-test_concat([List|Rest], Size, Combined, Binaries) ->
-    ?line Bin = list_to_binary(List),
-    ?line test_concat(Rest, Size+length(List), Combined++List, [Bin|Binaries]);
-test_concat([], Size, Combined, Binaries0) ->
-    ?line Binaries = lists:reverse(Binaries0),
-    ?line Bin = concat_binary(Binaries),
-    ?line Size = size(Bin),
-    ?line Size = iolist_size(Bin),
-    ?line Combined = binary_to_list(Bin).
-
 t_hash(doc) -> "Test hash/2 with different type of binaries.";
 t_hash(Config) when is_list(Config) ->
     test_hash([]),
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index cd44e8232c..f704135ce8 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 5deb69edab..ff3633a3cc 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -35,14 +35,13 @@
 -export([delay_trap/2]).
 -export([set_cookie/2, get_cookie/0]).
 -export([nodes/0]).
--export([concat_binary/1]).
+
 -export([list_to_integer/2,integer_to_list/2]).
 -export([flush_monitor_message/2]).
 -export([set_cpu_topology/1, format_cpu_topology/1]).
 -export([await_proc_exit/3]).
 
 -deprecated([hash/2]).
--deprecated([concat_binary/1]).
 
 % Get rid of autoimports of spawn to avoid clashes with ourselves.
 -compile({no_auto_import,[spawn/1]}).
@@ -535,11 +534,6 @@ set_cookie(Node, C) when Node =/= nonode@nohost, is_atom(Node) ->
 get_cookie() ->
     auth:get_cookie().
 
--spec concat_binary(ListOfBinaries) -> binary() when
-      ListOfBinaries :: iolist().
-concat_binary(List) ->
-    list_to_binary(List).
-
 -spec integer_to_list(Integer, Base) -> string() when
       Integer :: integer(),
       Base :: 2..36.
diff --git a/lib/compiler/src/erl_bifs.erl b/lib/compiler/src/erl_bifs.erl
index f8128702dd..2514c06360 100644
--- a/lib/compiler/src/erl_bifs.erl
+++ b/lib/compiler/src/erl_bifs.erl
@@ -72,7 +72,6 @@ is_pure(erlang, binary_to_list, 1) -> true;
 is_pure(erlang, binary_to_list, 3) -> true;
 is_pure(erlang, bit_size, 1) -> true;
 is_pure(erlang, byte_size, 1) -> true;
-is_pure(erlang, concat_binary, 1) -> true;
 is_pure(erlang, element, 2) -> true;
 is_pure(erlang, float, 1) -> true;
 is_pure(erlang, float_to_list, 1) -> true;
diff --git a/lib/debugger/src/dbg_iload.erl b/lib/debugger/src/dbg_iload.erl
index 2ae0c333da..db5a17ad2e 100644
--- a/lib/debugger/src/dbg_iload.erl
+++ b/lib/debugger/src/dbg_iload.erl
@@ -635,7 +635,6 @@ bif_type(disconnect_node)    -> safe;
 bif_type(binary_to_list)     -> safe;
 bif_type(list_to_binary)     -> safe;
 bif_type(split_binary)       -> safe;
-bif_type(concat_binary)      -> safe;
 bif_type(term_to_atom)       -> safe;
 bif_type(hash)               -> safe;
 bif_type(pre_loaded)         -> safe;
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index f1be658054..64a695129b 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -675,8 +675,6 @@ type(erlang, cancel_timer, 1, Xs) ->
 type(erlang, check_process_code, 2, Xs) ->
   strict(arg_types(erlang, check_process_code, 2), Xs,
 	 fun (_) -> t_boolean() end);
-type(erlang, concat_binary, 1, Xs) ->
-  strict(arg_types(erlang, concat_binary, 1), Xs, fun (_) -> t_binary() end);
 type(erlang, crc32, 1, Xs) ->
   strict(arg_types(erlang, crc32, 1), Xs, fun (_) -> t_crc32() end);
 type(erlang, crc32, 2, Xs) ->
@@ -3397,8 +3395,6 @@ arg_types(erlang, cancel_timer, 1) ->
   [t_reference()];
 arg_types(erlang, check_process_code, 2) ->
   [t_pid(), t_atom()];
-arg_types(erlang, concat_binary, 1) ->
-  [t_list(t_binary())];
 arg_types(erlang, crc32, 1) ->
   [t_iodata()];
 arg_types(erlang, crc32, 2) ->
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index 478f05e792..0b9b8b8e17 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -263,7 +263,6 @@ bif(bit_size, 1) -> true;
 bif(bitstring_to_list, 1) -> true;
 bif(byte_size, 1) -> true;
 bif(check_process_code, 2) -> true;
-bif(concat_binary, 1) -> true;
 bif(date, 0) -> true;
 bif(delete_module, 1) -> true;
 bif(demonitor, 1) -> true;
@@ -405,7 +404,6 @@ old_bif(bit_size, 1) -> true;
 old_bif(bitstring_to_list, 1) -> true;
 old_bif(byte_size, 1) -> true;
 old_bif(check_process_code, 2) -> true;
-old_bif(concat_binary, 1) -> true;
 old_bif(date, 0) -> true;
 old_bif(delete_module, 1) -> true;
 old_bif(disconnect_node, 1) -> true;
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 39d017d430..bbc4301446 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -449,7 +449,7 @@ obsolete_1(ssl_pkix, decode_cert, A) when A =:= 1; A =:= 2 ->
 
 %% Added in R13B04.
 obsolete_1(erlang, concat_binary, 1) ->
-    {deprecated,{erlang,list_to_binary,1},"R15B"};
+    {removed,{erlang,list_to_binary,1},"R15B"};
 
 %% Added in R14A.
 obsolete_1(ssl, peercert, 2) ->