testing: update helperNames just before checking it

qingyunha · qingyunha · commit 44b90b2e2eec · 2021-03-18T08:08:03.000+08:00
parent's helperNames has not been set when frameSkip called, moving helperNames initilazing to frameSkip. Fixes #44887
diff --git a/src/testing/testing.go b/src/testing/testing.go
@@ -509,6 +509,7 @@ func (c *common) frameSkip(skip int) runtime.Frame {
 			}
 			return prevFrame
 		}
+		// If more helper PCs have been added since we last did the conversion
 		if c.helperNames == nil {
 			c.helperNames = make(map[string]struct{})
 			for pc := range c.helperPCs {

Original file line number	Diff line number	Diff line change
`@@ -509,6 +509,7 @@ func (c *common) frameSkip(skip int) runtime.Frame {`
`509`	`509`	`}`
`510`	`510`	`return prevFrame`
`511`	`511`	`}`
	`512`	`+ // If more helper PCs have been added since we last did the conversion`
`512`	`513`	`if c.helperNames == nil {`
`513`	`514`	`c.helperNames = make(map[string]struct{})`
`514`	`515`	`for pc := range c.helperPCs {`