From 777133fefb9704c957884216e44bf7ba25ca2fae Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 30 Jan 2013 01:37:13 +0000 Subject: libgo: Update Go library to master revision 15502/229081515358. From-SVN: r195569 --- libgo/runtime/runtime.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libgo/runtime/runtime.c') 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); -- cgit v1.1