aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2018-01-17 12:12:28 +0100
committerHans Bolinder <[email protected]>2018-01-17 12:12:28 +0100
commitb5f2a0703882d919e15a0ca2e24616aa97033a77 (patch)
treecfeed43a2b5273a35a3ad8900f952ee7fdc0670a
parenta2f97956b21acdb345a188b174a4108959a1c1cd (diff)
parentff772a50d2be3770a480ccf6348935a5e389c626 (diff)
downloadotp-b5f2a0703882d919e15a0ca2e24616aa97033a77.tar.gz
otp-b5f2a0703882d919e15a0ca2e24616aa97033a77.tar.bz2
otp-b5f2a0703882d919e15a0ca2e24616aa97033a77.zip
Merge branch 'hasse/stdlib/fix_shell_evaluator' into maint
* hasse/stdlib/fix_shell_evaluator: stdlib: Garbage the shell's evaluator process more often
-rw-r--r--lib/stdlib/src/shell.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index 212b143b1d..ad4984b64c 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -701,7 +701,9 @@ exprs([E0|Es], Bs1, RT, Lf, Ef, Bs0, W) ->
{W,V0};
true -> case result_will_be_saved() of
true -> V0;
- false -> ignored
+ false ->
+ erlang:garbage_collect(),
+ ignored
end
end,
{{value,V,Bs,get()},Bs};