aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-06-23 13:45:36 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-06-23 13:45:36 +0000
commit54357b3b84538e0f26b6501fd91bb98170995ff5 (patch)
treeeea40c0f194dee2f158ed71d9fca0420fd4b4204 /gcc/go
parentfb68f296283941d15505fcf610099281562fa9e0 (diff)
downloadgcc-54357b3b84538e0f26b6501fd91bb98170995ff5.zip
gcc-54357b3b84538e0f26b6501fd91bb98170995ff5.tar.gz
gcc-54357b3b84538e0f26b6501fd91bb98170995ff5.tar.bz2
runtime: improve handling of panic during deferred function
When a panic occurs while processing a deferred function that recovered an earlier panic, we shouldn't report the recovered panic in the panic stack trace. Stop doing so by keeping track of the panic that triggered a defer, marking it as aborted if we see the defer again, and discarding aborted panics when a panic is recovered. This is what the gc runtime does. The test for this is TestRecursivePanic in runtime/crash_test.go. We don't run that test yet, but we will soon. Reviewed-on: https://go-review.googlesource.com/46461 From-SVN: r249590
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index b6037a6..d82e012 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-385efb8947af70b8425c833a1ab68ba5f357dfae
+c4adba240f9d5af8ab0534316d6b05bd988c432c
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.