cmd/compile/internal/inline: refactor fixpoint algorithm

This CL refactors the interleaved fixpoint algorithm so that calls can
be inlined in any order. This has no immediate effect, but it will
allow a subsequent CL to prioritize calls by inlheur score.

Change-Id: I11a84d228e9c94732ee75f0d3c99bc90d83fea09
Reviewed-on: https://go-review.googlesource.com/c/go/+/567695
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>

src/cmd/compile/internal/inline/interleaved/interleaved.go

@@ -83,39 +83,108 @@ func DevirtualizeAndInlineFunc(fn *ir.Func, profile *pgo.Profile) {
 			fmt.Printf("%v: function %v considered 'big'; reducing max cost of inlinees\n", ir.Line(fn), fn)
 		}
 
-		// Walk fn's body and apply devirtualization and inlining.
+		match := func(n ir.Node) bool {
-		var inlCalls []*ir.InlinedCallExpr
-		var edit func(ir.Node) ir.Node
-		edit = func(n ir.Node) ir.Node {
 			switch n := n.(type) {
+			case *ir.CallExpr:
+				return true
 			case *ir.TailCallStmt:
 				n.Call.NoInline = true // can't inline yet
 			}
+			return false
+		}
 
-			ir.EditChildren(n, edit)
+		edit := func(n ir.Node) ir.Node {
-
+			call, ok := n.(*ir.CallExpr)
-			if call, ok := n.(*ir.CallExpr); ok {
+			if !ok { // previously inlined
-				devirtualize.StaticCall(call)
+				return nil
-
-				if inlCall := inline.TryInlineCall(fn, call, bigCaller, profile); inlCall != nil {
-					inlCalls = append(inlCalls, inlCall)
-					n = inlCall
-				}
 			}
 
-			return n
+			devirtualize.StaticCall(call)
+			if inlCall := inline.TryInlineCall(fn, call, bigCaller, profile); inlCall != nil {
+				return inlCall
+			}
+			return nil
 		}
-		ir.EditChildren(fn, edit)
 
-		// If we inlined any calls, we want to recursively visit their
+		fixpoint(fn, match, edit)
-		// bodies for further devirtualization and inlining. However, we
-		// need to wait until *after* the original function body has been
-		// expanded, or else inlCallee can have false positives (e.g.,
-		// #54632).
-		for len(inlCalls) > 0 {
-			call := inlCalls[0]
-			inlCalls = inlCalls[1:]
-			ir.EditChildren(call, edit)
-		}
 	})
 }
+
+// fixpoint repeatedly edits a function until it stabilizes.
+//
+// First, fixpoint applies match to every node n within fn. Then it
+// iteratively applies edit to each node satisfying match(n).
+//
+// If edit(n) returns nil, no change is made. Otherwise, the result
+// replaces n in fn's body, and fixpoint iterates at least once more.
+//
+// After an iteration where all edit calls return nil, fixpoint
+// returns.
+func fixpoint(fn *ir.Func, match func(ir.Node) bool, edit func(ir.Node) ir.Node) {
+	// Consider the expression "f(g())". We want to be able to replace
+	// "g()" in-place with its inlined representation. But if we first
+	// replace "f(...)" with its inlined representation, then "g()" will
+	// instead appear somewhere within this new AST.
+	//
+	// To mitigate this, each matched node n is wrapped in a ParenExpr,
+	// so we can reliably replace n in-place by assigning ParenExpr.X.
+	// It's safe to use ParenExpr here, because typecheck already
+	// removed them all.
+
+	var parens []*ir.ParenExpr
+	var mark func(ir.Node) ir.Node
+	mark = func(n ir.Node) ir.Node {
+		if _, ok := n.(*ir.ParenExpr); ok {
+			return n // already visited n.X before wrapping
+		}
+
+		ok := match(n)
+
+		ir.EditChildren(n, mark)
+
+		if ok {
+			paren := ir.NewParenExpr(n.Pos(), n)
+			paren.SetType(n.Type())
+			paren.SetTypecheck(n.Typecheck())
+
+			parens = append(parens, paren)
+			n = paren
+		}
+
+		return n
+	}
+	ir.EditChildren(fn, mark)
+
+	// Edit until stable.
+	for {
+		done := true
+
+		for i := 0; i < len(parens); i++ { // can't use "range parens" here
+			paren := parens[i]
+			if new := edit(paren.X); new != nil {
+				// Update AST and recursively mark nodes.
+				paren.X = new
+				ir.EditChildren(new, mark) // mark may append to parens
+				done = false
+			}
+		}
+
+		if done {
+			break
+		}
+	}
+
+	// Finally, remove any parens we inserted.
+	if len(parens) == 0 {
+		return // short circuit
+	}
+	var unparen func(ir.Node) ir.Node
+	unparen = func(n ir.Node) ir.Node {
+		if paren, ok := n.(*ir.ParenExpr); ok {
+			n = paren.X
+		}
+		ir.EditChildren(n, unparen)
+		return n
+	}
+	ir.EditChildren(fn, unparen)
+}

src/cmd/compile/internal/ir/expr.go

@@ -856,13 +856,19 @@ func IsAddressable(n Node) bool {
 // "g()" expression.
 func StaticValue(n Node) Node {
 	for {
-		if n.Op() == OCONVNOP {
+		switch n1 := n.(type) {
-			n = n.(*ConvExpr).X
+		case *ConvExpr:
-			continue
+			if n1.Op() == OCONVNOP {
-		}
+				n = n1.X
-
+				continue
-		if n.Op() == OINLCALL {
+			}
-			n = n.(*InlinedCallExpr).SingleResult()
+		case *InlinedCallExpr:
+			if n1.Op() == OINLCALL {
+				n = n1.SingleResult()
+				continue
+			}
+		case *ParenExpr:
+			n = n1.X
 			continue
 		}