Merge branch 'maint-20' into maint

* maint-20:
  Updated OTP version
  Update release notes
  Update version numbers
  erts: Fix bug in quick alloc
  Fix old length usage in string
  stdlib: Fix bug in proc_lib
  Support arbitrary crash report in proc_lib.

5 files changed, 78 insertions, 13 deletions

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 46454e9b80..bdd5b39cd3 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,38 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> A bug in <c>proc_lib:format()</c> introduced in
+	    Erlang/OTP 20.0 is corrected. </p>
+          <p>
+	    Own Id: OTP-14482 Aux Id: PR-1488 </p>
+        </item>
+        <item>
+          <p>
+	    Fix string:len/1 to be compatible with previous versions.</p>
+          <p>
+	    Own Id: OTP-14487 Aux Id: ERIERL-40 </p>
+        </item>
+        <item>
+          <p>
+	    In OTP-20.0, the behavior of c, make, and ct_make was
+	    changed so that in some cases the beam files by default
+	    would be written to the directory where the source files
+	    were found. This is now changed back to the old behavior
+	    so beam files are by default written to current
+	    directory.</p>
+          <p>
+	    Own Id: OTP-14489 Aux Id: ERL-438 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index 9ce8e7d60e..d4d1bdccec 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -779,11 +779,13 @@ format_link_report([Link|Reps], Indent, Extra) ->
     LinkIndent = ["  ",Indent],
     [Indent,"neighbour:\n",format_report(Rep, LinkIndent, Extra)|
      format_link_report(Reps, Indent, Extra)];
-format_link_report([], _, _) ->
-    [].
+format_link_report(Rep, Indent, Extra) ->
+    format_report(Rep, Indent, Extra).
 
 format_report(Rep, Indent, Extra) when is_list(Rep) ->
     format_rep(Rep, Indent, Extra);
+format_report(Rep, Indent, {Enc,unlimited}) ->
+    io_lib:format("~s~"++modifier(Enc)++"p~n", [Indent, Rep]);
 format_report(Rep, Indent, {Enc,Depth}) ->
     io_lib:format("~s~"++modifier(Enc)++"P~n", [Indent, Rep, Depth]).
 
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index 6f7009b5d9..4972da297d 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -384,7 +384,7 @@ to_float(String) ->
     end.
 
 to_number(String, Number, Rest, List, _Tail) when is_binary(String) ->
-    BSz = length(List)-length(Rest),
+    BSz = erlang:length(List)-erlang:length(Rest),
     <<_:BSz/binary, Cont/binary>> = String,
     {Number, Cont};
 to_number(_, Number, Rest, _, Tail) ->
@@ -1344,7 +1344,7 @@ bin_search_str(Bin0, Start, Cont, [CP|_]=SearchCPs) ->
       String :: string(),
       Length :: non_neg_integer().
 
-len(S) -> length(S).
+len(S) -> erlang:length(S).
 
 %% equal(String1, String2)
 %%  Test if 2 strings are equal.
@@ -1689,7 +1689,7 @@ left(String, Len) when is_integer(Len) -> left(String, Len, $\s).
       Character :: char().
 
 left(String, Len, Char) when is_integer(Char) ->
-    Slen = length(String),
+    Slen = erlang:length(String),
     if
 	Slen > Len -> substr(String, 1, Len);
 	Slen < Len -> l_pad(String, Len-Slen, Char);
@@ -1714,7 +1714,7 @@ right(String, Len) when is_integer(Len) -> right(String, Len, $\s).
       Character :: char().
 
 right(String, Len, Char) when is_integer(Char) ->
-    Slen = length(String),
+    Slen = erlang:length(String),
     if
 	Slen > Len -> substr(String, Slen-Len+1);
 	Slen < Len -> r_pad(String, Len-Slen, Char);
@@ -1741,7 +1741,7 @@ centre(String, Len) when is_integer(Len) -> centre(String, Len, $\s).
 centre(String, 0, Char) when is_list(String), is_integer(Char) ->
     [];                       % Strange cases to centre string
 centre(String, Len, Char) when is_integer(Char) ->
-    Slen = length(String),
+    Slen = erlang:length(String),
     if
 	Slen > Len -> substr(String, (Slen-Len) div 2 + 1, Len);
 	Slen < Len ->
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl
index 029e6286e4..c4fafe82a4 100644
--- a/lib/stdlib/test/proc_lib_SUITE.erl
+++ b/lib/stdlib/test/proc_lib_SUITE.erl
@@ -28,7 +28,7 @@
 	 init_per_group/2,end_per_group/2, 
 	 crash/1, stacktrace/1, sync_start_nolink/1, sync_start_link/1,
          spawn_opt/1, sp1/0, sp2/0, sp3/1, sp4/2, sp5/1, '\x{447}'/0,
-	 hibernate/1, stop/1, t_format/1]).
+	 hibernate/1, stop/1, t_format/1, t_format_arbitrary/1]).
 -export([ otp_6345/1, init_dont_hang/1]).
 
 -export([hib_loop/1, awaken/1]).
@@ -51,7 +51,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [crash, stacktrace, {group, sync_start}, spawn_opt, hibernate,
-     {group, tickets}, stop, t_format].
+     {group, tickets}, stop, t_format, t_format_arbitrary].
 
 groups() -> 
     [{tickets, [], [otp_6345, init_dont_hang]},
@@ -78,6 +78,14 @@ end_per_group(_GroupName, Config) ->
 %% synchronous, and we want to test that the crash report is ok.
 %%-----------------------------------------------------------------
 crash(Config) when is_list(Config) ->
+    ok = application:unset_env(kernel, error_logger_format_depth),
+    crash_1(Config),
+    ok = application:set_env(kernel, error_logger_format_depth, 30),
+    crash_1(Config),
+    ok = application:unset_env(kernel, error_logger_format_depth),
+    ok.
+
+crash_1(_Config) ->
     error_logger:add_report_handler(?MODULE, self()),
 
     %% Make sure that we don't get a crash report if a process
@@ -562,9 +570,32 @@ t_format() ->
 
     ok.
 
+t_format_arbitrary(_Config) ->
+    error_logger:tty(false),
+    try
+        t_format_arbitrary()
+    after
+        error_logger:tty(true)
+    end,
+    ok.
+
+t_format_arbitrary() ->
+    A = list_to_atom([1024]),
+    do_test_format([fake_report, A], unlimited),
+    do_test_format([fake_report, A], 20),
+
+    do_test_format([fake_report, foo], unlimited),
+    do_test_format([fake_report, foo], 20),
+    do_test_format([fake_report, []], unlimited),
+    do_test_format([fake_report, []], 20).
+
 do_test_format(Report, Depth) ->
-    io:format("*** Depth = ~p", [Depth]),
-    S0 = proc_lib:format(Report, latin1, Depth),
+    do_test_format(Report, latin1, Depth),
+    do_test_format(Report, unicode, Depth).
+
+do_test_format(Report, Encoding, Depth) ->
+    io:format("*** Depth = ~p, Encoding = ~p", [Depth, Encoding]),
+    S0 = proc_lib:format(Report, Encoding, Depth),
     S = lists:flatten(S0),
     io:put_chars(S),
     length(S).
@@ -584,7 +615,7 @@ init(Tester) ->
     {ok, Tester}.
 
 handle_event({error_report, _GL, {Pid, crash_report, Report}}, Tester) ->
-    io:format("~s\n", [proc_lib:format(Report)]),
+    io:format("~ts\n", [proc_lib:format(Report)]),
     Tester ! {crash_report, Pid, Report},
     {ok, Tester};
 handle_event(_Event, State) ->
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index f062c7fe6e..8a83cdec1e 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.4
+STDLIB_VSN = 3.4.1