diff options
| author | Hans Bolinder <[email protected]> | 2018-02-07 16:20:18 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-02-07 16:20:18 +0100 |
| commit | cd9b6371a13c37f8f82586fcd82f212d306d8fad (patch) | |
| tree | e5108365606b25ccff0d977a9c82783af6e4aef7 /lib/kernel/src/file.erl | |
| parent | 3003f6150317cee3e2c6859a82829e1b2ff4f12e (diff) | |
| parent | e2848c09db25b356fdddc4f5f9dd4da6e6cfb6ec (diff) | |
| download | otp-cd9b6371a13c37f8f82586fcd82f212d306d8fad.tar.gz otp-cd9b6371a13c37f8f82586fcd82f212d306d8fad.tar.bz2 otp-cd9b6371a13c37f8f82586fcd82f212d306d8fad.zip | |
Merge branch 'hasse/no_get_stacktrace/OTP-14861'
* hasse/no_get_stacktrace/OTP-14861:
erts: Update abstract format doc with stacktrace variable
wx: Do not call erlang:get_stacktrace()
tools: Do not call erlang:get_stacktrace()
stdlib: Do not call erlang:get_stacktrace()
sasl: Do not call erlang:get_stacktrace()
runtime_tools: Do not call erlang:get_stacktrace()
reltool: Do not call erlang:get_stacktrace()
parsetools: Do not call erlang:get_stacktrace()
observer: Do not call erlang:get_stacktrace()
mnesia: Do not call erlang:get_stacktrace() (cont)
mnesia: Do not call erlang:get_stacktrace()
kernel: Do not call erlang:get_stacktrace()
inets: Do not call erlang:get_stacktrace()
eunit: Do not call erlang:get_stacktrace()
et: Do not call erlang:get_stacktrace()
dialyzer: Do not call erlang:get_stacktrace()
debugger: Do not call erlang:get_stacktrace()
debugger: Do not try to restore stacktrace
common_test: Do not call erlang:get_stacktrace()
Diffstat (limited to 'lib/kernel/src/file.erl')
| -rw-r--r-- | lib/kernel/src/file.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl index d05199897f..c2df1ee288 100644 --- a/lib/kernel/src/file.erl +++ b/lib/kernel/src/file.erl @@ -1382,8 +1382,8 @@ eval_stream2({ok,Form,EndLine}, Fd, H, Last, E, Bs0) -> try erl_eval:exprs(Form, Bs0) of {value,V,Bs} -> eval_stream(Fd, H, EndLine, {V}, E, Bs) - catch Class:Reason -> - Error = {EndLine,?MODULE,{Class,Reason,erlang:get_stacktrace()}}, + catch Class:Reason:StackTrace -> + Error = {EndLine,?MODULE,{Class,Reason,StackTrace}}, eval_stream(Fd, H, EndLine, Last, [Error|E], Bs0) end; eval_stream2({error,What,EndLine}, Fd, H, Last, E, Bs) -> |