diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2013-01-30 01:37:13 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2013-01-30 01:37:13 +0000 |
| commit | 777133fefb9704c957884216e44bf7ba25ca2fae (patch) | |
| tree | ac10866a1e77c784cb9d48b872fd8013ba124fd0 /libgo/runtime/runtime.c | |
| parent | 900f0840363c7a110723b18024b361f22b8892b9 (diff) | |
| download | gcc-777133fefb9704c957884216e44bf7ba25ca2fae.zip gcc-777133fefb9704c957884216e44bf7ba25ca2fae.tar.gz gcc-777133fefb9704c957884216e44bf7ba25ca2fae.tar.bz2 | |
libgo: Update Go library to master revision 15502/229081515358.
From-SVN: r195569
Diffstat (limited to 'libgo/runtime/runtime.c')
| -rw-r--r-- | libgo/runtime/runtime.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libgo/runtime/runtime.c b/libgo/runtime/runtime.c index b090169..48ece55 100644 --- a/libgo/runtime/runtime.c +++ b/libgo/runtime/runtime.c @@ -132,10 +132,12 @@ runtime_cputicks(void) } bool -runtime_showframe(String s) +runtime_showframe(String s, bool current) { static int32 traceback = -1; - + + if(current && runtime_m()->throwing > 0) + return 1; if(traceback < 0) traceback = runtime_gotraceback(); return traceback > 1 || (__builtin_memchr(s.str, '.', s.len) != nil && __builtin_memcmp(s.str, "runtime.", 7) != 0); |