diff options
| author | Björn Gustavsson <[email protected]> | 2011-03-30 10:41:34 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-03-30 10:41:34 +0200 |
| commit | ef204e43651715e55ae902176b29026914900cc2 (patch) | |
| tree | d47d39bcca05ff6dab9b27f85ba76761015340b5 /erts/emulator/test | |
| parent | 0bc5994c5aa4001e8a3b63548c7dd735064ecb4d (diff) | |
| parent | 9104dc674c265b82728a1b494194fdeea4ad6661 (diff) | |
| download | otp-ef204e43651715e55ae902176b29026914900cc2.tar.gz otp-ef204e43651715e55ae902176b29026914900cc2.tar.bz2 otp-ef204e43651715e55ae902176b29026914900cc2.zip | |
Merge branch 'bjorn/erts/fix-duplicate-stack-entry/OTP-9163' into dev
* bjorn/erts/fix-duplicate-stack-entry/OTP-9163:
Fix duplicate entries in stacktraces after calling certain BIFs
BEAM loader: Simplify handling of the func_info/3 instruction
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/exception_SUITE.erl | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/erts/emulator/test/exception_SUITE.erl b/erts/emulator/test/exception_SUITE.erl index d44dc117d2..9d6fc9521d 100644 --- a/erts/emulator/test/exception_SUITE.erl +++ b/erts/emulator/test/exception_SUITE.erl @@ -275,7 +275,16 @@ stacktrace(Conf) when is_list(Conf) -> ?line [{?MODULE,stacktrace_1,3}|_] = erase(stacktrace1), ?line St4 = erase(stacktrace2), ?line St4 = erlang:get_stacktrace(), - ok. + + try + ?line stacktrace_2() + catch + error:{badmatch,_} -> + [{?MODULE,stacktrace_2,0}, + {?MODULE,stacktrace,1}|_] = + erlang:get_stacktrace(), + ok + end. stacktrace_1(X, C1, Y) -> erase(stacktrace1), @@ -295,6 +304,9 @@ stacktrace_1(X, C1, Y) -> put(stacktrace2, erlang:get_stacktrace()) end. +stacktrace_2() -> + ok = erlang:process_info(self(), current_function), + ok. nested_stacktrace(Conf) when is_list(Conf) -> |