2 files changed, 133 insertions, 3 deletions
diff --git a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
index 997ee6e17d..c9ac6931e2 100644
--- a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
+++ b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -117,7 +117,7 @@ more_nocatch(Fun) ->
 %% External calls.
 
 external_call_test(Data) ->
-    {'EXIT',{undef,[{?MODULE,not_exported,[42,Data]}|_]}} =
+    {'EXIT',{undef,[{?MODULE,not_exported,[42,Data],_}|_]}} =
 	(catch ?MODULE:not_exported(42, Data)),
     {yes,Data} = i_am_exported(Data),
     {yes,Data} = ?MODULE:i_am_exported(Data),
@@ -127,7 +127,7 @@ external_call_test(Data) ->
     {ok,Data,[a,b]} = not_exported(Data, [a,b]),
     {yes,Data} = i_am_exported(Data),
     {ok,Data,[a,b]} = not_exported(Data, [a,b]),
-    {'EXIT',{undef,[{?MODULE,not_exported,[7,Data]}|_]}} =
+    {'EXIT',{undef,[{?MODULE,not_exported,[7,Data],_}|_]}} =
 	(catch ?MODULE:not_exported(7, Data)),
     {yes,Data} = ?MODULE:i_am_exported(Data),
     ok.
diff --git a/lib/debugger/test/int_eval_SUITE_data/stacktrace.erl b/lib/debugger/test/int_eval_SUITE_data/stacktrace.erl
new file mode 100644
index 0000000000..3380178fdc
--- /dev/null
+++ b/lib/debugger/test/int_eval_SUITE_data/stacktrace.erl
@@ -0,0 +1,130 @@
+-module(stacktrace).
+-export([?MODULE/0]).
+
+?MODULE() ->
+    OldDepth = erlang:system_flag(backtrace_depth, 32),
+    done = (catch do_try()),
+    Stk = trim(erlang:get_stacktrace()),
+    erlang:system_flag(backtrace_depth, OldDepth),
+    {done,Stk}.
+
+trim([{int_eval_SUITE,_,_,_}|_]) ->
+    [];
+trim([H|T]) ->
+    [H|trim(T)];
+trim([]) -> [].
+
+do_try() ->
+    try
+	0 = id(42)
+    catch
+	error:{badmatch,42} ->
+	    do_try2()				%Tail-recursive
+    end.
+
+do_try2() ->
+    try
+	0 = id(42)
+    catch
+	error:{badmatch,42} ->
+	    do_try3()				%Not tail-recursive
+    end,
+    ?LINE.
+
+do_try3() ->
+    try id(42) of
+	42 -> do_try4()				%Tail-recursive
+    catch
+	error:ignore ->				%Should never catch
+	    ?LINE
+    end.
+
+do_try4() ->
+    try
+	do_recv()				%Not tail-recursive
+    catch
+	error:ignore ->				%Should never catch
+	    ?LINE
+    end.
+
+do_recv() ->
+    self() ! x,
+    receive
+	x -> do_recv2()				%Not tail-recursive
+    end,
+    ?LINE.
+
+do_recv2() ->
+    self() ! y,
+    receive
+	y -> do_recv3()				%Tail-recursive
+    end.
+
+do_recv3() ->
+    receive
+	after 0 -> do_recv4()			%Tail-recursive
+    end.
+
+do_recv4() ->
+    receive
+	after 0 -> do_if(true)			%Not tail-recursive
+    end,
+    ?LINE.
+
+do_if(Bool) ->
+    if
+	Bool -> do_if2(Bool)			%Tail-recursive
+    end.
+
+do_if2(Bool) ->
+    if
+	Bool -> do_case(Bool)			%Not tail-recursive
+    end,
+    ?LINE.
+
+
+do_case(Bool) ->
+    case Bool of
+	true -> do_case2(Bool)			%Tail-recursive
+    end.
+
+do_case2(Bool) ->
+    case Bool of
+	true -> do_fun(Bool)			%Not tail-recursive
+    end,
+    ?LINE.
+
+do_fun(Bool) ->
+    F = fun(true) ->
+		do_fun2(Bool)			%Tail-recursive
+	end,
+    F(Bool).					%Tail-recursive
+
+do_fun2(Bool) ->
+    F = fun(true) ->
+		cons(Bool)			%Tail-recursive
+	end,
+    F(Bool),					%Not tail-recursive
+    ?LINE.
+
+cons(Bool) ->
+    [Bool|tuple()].
+
+tuple() ->
+    {ok,op()}.
+
+op() ->
+    1 + lc().
+
+lc() ->
+    [done() || true].
+
+done() ->
+    tail(100),
+    throw(done).
+
+tail(0) -> ok;
+tail(N) -> tail(N-1).
+
+id(I) ->
+    I.