From 7af190f113aecdbed44c6406ccefb81681580021 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 9 Oct 2013 00:02:14 +0000
Subject: [PATCH] runtime: Do not report thunks and recover functions in
 backtrace.

From-SVN: r203294
---
 libgo/runtime/go-callers.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/libgo/runtime/go-callers.c b/libgo/runtime/go-callers.c
index dd1cf7909b6..291dfd0d666 100644
--- a/libgo/runtime/go-callers.c
+++ b/libgo/runtime/go-callers.c
@@ -53,6 +53,21 @@ callback (void *data, uintptr_t pc, const char *filename, int lineno,
 	return 0;
     }
 
+  /* Skip thunks and recover functions.  There is no equivalent to
+     these functions in the gc toolchain, so returning them here means
+     significantly different results for runtime.Caller(N).  */
+  if (function != NULL)
+    {
+      const char *p;
+
+      p = __builtin_strchr (function, '.');
+      if (p != NULL && __builtin_strncmp (p + 1, "$thunk", 6) == 0)
+	return 0;
+      p = __builtin_strrchr (function, '$');
+      if (p != NULL && __builtin_strcmp(p, "$recover") == 0)
+	return 0;
+    }
+
   if (arg->skip > 0)
     {
       --arg->skip;