Merge tag 'OTP-18.3.1'

=== OTP-18.3.1 ===

Changed Applications:
- erts-7.3.1
- inets-6.2.1
- mnesia-4.13.4

Unchanged Applications:
- asn1-4.0.2
- common_test-1.12
- compiler-6.0.3
- cosEvent-2.2
- cosEventDomain-1.2
- cosFileTransfer-1.2
- cosNotification-1.2.1
- cosProperty-1.2
- cosTime-1.2.1
- cosTransactions-1.3.1
- crypto-3.6.3
- debugger-4.1.2
- dialyzer-2.9
- diameter-1.11.2
- edoc-0.7.18
- eldap-1.2.1
- erl_docgen-0.4.2
- erl_interface-3.8.2
- et-1.5.1
- eunit-2.2.13
- gs-1.6
- hipe-3.15
- ic-4.4
- jinterface-1.6.1
- kernel-4.2
- megaco-3.18
- observer-2.1.2
- odbc-2.11.1
- orber-3.8.1
- os_mon-2.4
- ose-1.1
- otp_mibs-1.1
- parsetools-2.1.1
- percept-0.8.11
- public_key-1.1.1
- reltool-0.7
- runtime_tools-1.9.3
- sasl-2.7
- snmp-5.2.2
- ssh-4.2.2
- ssl-7.3
- stdlib-2.8
- syntax_tools-1.7
- test_server-3.10
- tools-2.8.3
- typer-0.9.10
- webtool-0.9.1
- wx-1.6.1
- xmerl-1.3.10

Conflicts:
	OTP_VERSION
	erts/emulator/test/save_calls_SUITE.erl
	erts/vsn.mk

1 files changed, 13 insertions, 2 deletions

diff --git a/erts/emulator/test/save_calls_SUITE.erl b/erts/emulator/test/save_calls_SUITE.erl
index bbdc2e6688..3199fe9ca1 100644
--- a/erts/emulator/test/save_calls_SUITE.erl
+++ b/erts/emulator/test/save_calls_SUITE.erl
@@ -114,7 +114,7 @@ save_calls_1(Config) when is_list(Config) ->
 save_calls_1() ->
     erlang:process_flag(self(), save_calls, 0),
     {last_calls, false} = process_info(self(), last_calls),
-
+    
     erlang:process_flag(self(), save_calls, 10),
     {last_calls, _L1} = process_info(self(), last_calls),
     ?MODULE:do_bipp(),
@@ -132,11 +132,22 @@ save_calls_1() ->
         X ->
             ct:fail({l21, X})
     end,
-
+    
     erlang:process_flag(self(), save_calls, 10),
     {last_calls, L3} = process_info(self(), last_calls),
+    true = (L3 /= false),
     L31 = lists:filter(fun is_local_function/1, L3),
     [] = L31,
+    erlang:process_flag(self(), save_calls, 0),
+
+    %% Also check that it works on another process ...
+    Pid = spawn(fun () -> receive after infinity -> ok end end),
+    erlang:process_flag(Pid, save_calls, 10),
+    {last_calls, L4} = process_info(Pid, last_calls),
+    true = (L4 /= false),
+    L41 = lists:filter(fun is_local_function/1, L4),
+    [] = L41,
+    exit(Pid,kill),
     ok.
 
 do_bipp() ->