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

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

5 files changed, 1 insertions, 9 deletions

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) ->