From a8f4038e7d087318671bdfb2b86592df31a4807f Mon Sep 17 00:00:00 2001
From: Emanuel Rietveld <e.j.rietveld@gmail.com>
Date: Sun, 2 Jan 2022 19:32:28 +0000
Subject: [PATCH] interp.FilterStack: don't sync up with callers only on runCfg

interpreter may be entered (for example) from genFunctionWrapper
---
 interp/interp.go | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/interp/interp.go b/interp/interp.go
index 74ce0663b..960a2f272 100644
--- a/interp/interp.go
+++ b/interp/interp.go
@@ -684,30 +684,30 @@ func (interp *Interpreter) FilterStackAndCallers(stack []byte, callers []uintptr
 			continue
 		}
 
+		// This is the first call into the interpreter, so try to sync callers
+		if callersIndex == notSyncedYet {
+			for j, call := range callers {
+				if call == 0 {
+					break
+				}
+				callName := runtime.FuncForPC(call).Name()
+				if callName == strings.Split(p[0], "(")[0] {
+					callersIndex = j
+				}
+			}
+			for j := len(callers) - 1; j > callersIndex; j-- {
+				if callers[j] != 0 {
+					newCallers = append(newCallers, callers[j])
+				}
+			}
+		}
+
 		var handle uintptr
 
 		// A runCfg call refers to an interpreter level call
 		// grab callHandle from the first parameter to it
 		if strings.HasPrefix(funcPath[1], "runCfg(") {
 			fmt.Sscanf(funcPath[1], "runCfg(%v,", &handle)
-			// if this is the oldest call to runCfg, sync up with callers array
-			if callersIndex == notSyncedYet {
-				for j, call := range callers {
-					if call == 0 {
-						break
-					}
-
-					callName := runtime.FuncForPC(call).Name()
-					if callName == selfPrefix+"/interp.runCfg" {
-						callersIndex = j
-					}
-				}
-				for j := len(callers) - 1; j > callersIndex; j-- {
-					if callers[j] != 0 {
-						newCallers = append(newCallers, callers[j])
-					}
-				}
-			}
 		}
 
 		// callBin is a call to a binPkg