From 7ebe663e98c59128f4d94944bf91b55f514fbc4b Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 2 Feb 2013 15:11:48 +0000 Subject: [PATCH] runtime: Correct handling of runtime.Callers skip parameter. From-SVN: r195685 --- libgo/runtime/go-callers.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libgo/runtime/go-callers.c b/libgo/runtime/go-callers.c index 9afba62cc99..dd1cf7909b6 100644 --- a/libgo/runtime/go-callers.c +++ b/libgo/runtime/go-callers.c @@ -115,8 +115,9 @@ Callers (int skip, struct __go_open_array pc) /* In the Go 1 release runtime.Callers has an off-by-one error, which we can not correct because it would break backward - compatibility. Adjust SKIP here to be compatible. */ - ret = runtime_callers (skip - 1, locbuf, pc.__count); + compatibility. Normally we would add 1 to SKIP here, but we + don't so that we are compatible. */ + ret = runtime_callers (skip, locbuf, pc.__count); for (i = 0; i < ret; i++) ((uintptr *) pc.__values)[i] = locbuf[i].pc;