From 9cadd05e3ef7ee93d409b7e4ddb7c0b83b84bce0 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Mon, 5 Feb 2018 12:36:41 +0100
Subject: debugger: Do not call erlang:get_stacktrace()

---
 lib/debugger/src/dbg_debugged.erl | 5 ++---
 lib/debugger/src/dbg_ieval.erl    | 3 +--
 lib/debugger/src/dbg_wx_mon.erl   | 4 ++--
 lib/debugger/src/dbg_wx_trace.erl | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/debugger/src/dbg_debugged.erl b/lib/debugger/src/dbg_debugged.erl
index 0e1de33310..8b64a60a9c 100644
--- a/lib/debugger/src/dbg_debugged.erl
+++ b/lib/debugger/src/dbg_debugged.erl
@@ -84,9 +84,8 @@ msg_loop(Meta, Mref) ->
 handle_command(Command) ->
     try
 	reply(Command)
-    catch Class:Reason ->
-	    Stacktrace = stacktrace_f(erlang:get_stacktrace()),
-	    {exception,{Class,Reason,Stacktrace}}
+    catch Class:Reason:Stacktrace ->
+	    {exception,{Class,Reason,stacktrace_f(Stacktrace)}}
     end.
 
 reply({apply,M,F,As}) ->
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index 8009d62629..b0db8228e5 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -924,8 +924,7 @@ expr({dbg,Line,raise,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
 	trace(return, {Le,Error}),
 	{value,Error,Bs}
     catch
-	_:_ ->
-	    Stk = erlang:get_stacktrace(),	%Possibly truncated.
+	_:_:Stk ->                              %Possibly truncated.
 	    StkFun = fun(_) -> Stk end,
 	    do_exception(Class, Reason, StkFun, Bs, Ieval)
     end;
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index a32a6894b8..00aee62a87 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -119,9 +119,9 @@ init(CallingPid, Mode, SFile) ->
 		init2(CallingPid, Mode, SFile, GS)
 	    catch 
 		exit:stop -> stop;
-		Error:Reason ->
+		Error:Reason:Stacktrace ->
 		    io:format("~p: Crashed {~p,~p} in~n  ~p",
-			      [?MODULE, Error, Reason, erlang:get_stacktrace()])
+			      [?MODULE, Error, Reason, Stacktrace])
 	    end
     end.
 
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index b1e0e03b4c..505d53005f 100644
--- a/lib/debugger/src/dbg_wx_trace.erl
+++ b/lib/debugger/src/dbg_wx_trace.erl
@@ -95,9 +95,9 @@ start(Pid, Env, Parent, TraceWin, BackTrace, Strings) ->
 	    catch 
 		_:stop ->
 		    exit(stop);
-		E:R ->
+		E:R:S ->
 		    io:format("TraceWin Crashed ~p~n",[E]),
-		    io:format(" ~p in ~p~n",[R, erlang:get_stacktrace()]),
+		    io:format(" ~p in ~p~n",[R, S]),
 		    exit(R)
 	    end;
 	error ->
-- 
cgit v1.2.3