Break splitBlocksOn into a new hook (#280)

Similar to #279, this PR breaks the logic that splits the CFG block upon seeing a trusted function into a separate strongly-typed hook for better maintainability and slightly better performance (due to fewer lookups in hook points). It introduces no functionality changes. --------- Co-authored-by: Sonal Mahajan <[email protected]>
uber-go · Oct 4, 2024 · 3c8ea06 · 3c8ea06
1 parent 45bee80
commit 3c8ea06
Show file tree

Hide file tree

Showing 3 changed files with 377 additions and 362 deletions.
diff --git a/assertion/function/preprocess/cfg.go b/assertion/function/preprocess/cfg.go
@@ -120,23 +120,17 @@ func copyGraph(graph *cfg.CFG) *cfg.CFG {
 }
 
 func (p *Preprocessor) splitBlockOnTrustedFuncs(graph *cfg.CFG, thisBlock, failureBlock *cfg.Block) {
-	var expr *ast.ExprStmt
-	var call *ast.CallExpr
-	var retExpr any
-	var trustedCond ast.Expr
-	var ok bool
-
 	for i, node := range thisBlock.Nodes {
-		if expr, ok = node.(*ast.ExprStmt); !ok {
-			continue
-		}
-		if call, ok = expr.X.(*ast.CallExpr); !ok {
+		expr, ok := node.(*ast.ExprStmt)
+		if !ok {
 			continue
 		}
-		if retExpr, ok = hook.As(call, p.pass); !ok {
+		call, ok := expr.X.(*ast.CallExpr)
+		if !ok {
 			continue
 		}
-		if trustedCond, ok = retExpr.(ast.Expr); !ok {
+		trustedCond := hook.SplitBlockOn(p.pass, call)
+		if trustedCond == nil {
 			continue
 		}