aboutsummaryrefslogtreecommitdiff
path: root/src/cmd
diff options
context:
space:
mode:
authorsunnymilk <shaojunyang@google.com>2024-09-10 12:27:55 -0400
committerGo LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>2024-11-11 21:52:00 +0000
commitfe2da30cb54aadeab243f3fc7bd3e14dd4da2892 (patch)
tree17d7160c87cba9071034c34196c2c8271618a2ae /src/cmd
parent73ac82f99046a8b0b0b76f767f4b2e25ef6989ca (diff)
downloadgo-fe2da30cb54aadeab243f3fc7bd3e14dd4da2892.tar.xz
cmd/compile: keep variables alive in testing.B.Loop loops
For the loop body guarded by testing.B.Loop, we disable function inlining and devirtualization inside. The only legal form to be matched is `for b.Loop() {...}`. For #61515 Change-Id: I2e226f08cb4614667cbded498a7821dffe3f72d8 Reviewed-on: https://go-review.googlesource.com/c/go/+/612043 Reviewed-by: Michael Pratt <mpratt@google.com> TryBot-Bypass: Junyang Shao <shaojunyang@google.com> Commit-Queue: Junyang Shao <shaojunyang@google.com> Reviewed-by: Cherry Mui <cherryyz@google.com>
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/compile/internal/inline/interleaved/interleaved.go34
1 files changed, 34 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/inline/interleaved/interleaved.go b/src/cmd/compile/internal/inline/interleaved/interleaved.go
index dc5c3b8969..a91ab23daa 100644
--- a/src/cmd/compile/internal/inline/interleaved/interleaved.go
+++ b/src/cmd/compile/internal/inline/interleaved/interleaved.go
@@ -105,6 +105,32 @@ func DevirtualizeAndInlineFunc(fn *ir.Func, profile *pgoir.Profile) {
})
}
+// isTestingBLoop returns true if it matches the node as a
+// testing.(*B).Loop. See issue #61515.
+func isTestingBLoop(t ir.Node) bool {
+ if t.Op() != ir.OFOR {
+ return false
+ }
+ nFor, ok := t.(*ir.ForStmt)
+ if !ok || nFor.Cond == nil || nFor.Cond.Op() != ir.OCALLFUNC {
+ return false
+ }
+ n, ok := nFor.Cond.(*ir.CallExpr)
+ if !ok || n.Fun == nil || n.Fun.Op() != ir.OMETHEXPR {
+ return false
+ }
+ name := ir.MethodExprName(n.Fun)
+ if name == nil {
+ return false
+ }
+ if fSym := name.Sym(); fSym != nil && name.Class == ir.PFUNC && fSym.Pkg != nil &&
+ fSym.Name == "(*B).Loop" && fSym.Pkg.Path == "testing" {
+ // Attempting to match a function call to testing.(*B).Loop
+ return true
+ }
+ return false
+}
+
// fixpoint repeatedly edits a function until it stabilizes.
//
// First, fixpoint applies match to every node n within fn. Then it
@@ -133,6 +159,14 @@ func fixpoint(fn *ir.Func, match func(ir.Node) bool, edit func(ir.Node) ir.Node)
return n // already visited n.X before wrapping
}
+ if isTestingBLoop(n) {
+ // No inlining nor devirtualization performed on b.Loop body
+ if base.Flag.LowerM > 1 {
+ fmt.Printf("%v: skip inlining within testing.B.loop for %v\n", ir.Line(n), n)
+ }
+ return n
+ }
+
ok := match(n)
// can't wrap TailCall's child into ParenExpr