Fixing the funclit pointer problem

gopherjs · grantnelson-wf · Feb 27, 2025 · Feb 27, 2025 · Feb 27, 2025 · Feb 27, 2025
commit ae7afcd044690aab24f93ef233d30fee6334c77a
diff --git a/compiler/internal/analysis/info.go b/compiler/internal/analysis/info.go
@@ -1,10 +1,8 @@
 package analysis
 
 import (
-	"bytes"
 	"fmt"
 	"go/ast"
-	"go/printer"
 	"go/token"
 	"go/types"
 	"strings"
@@ -100,13 +98,6 @@ func (info *Info) newFuncInfo(n ast.Node, obj types.Object, typeArgs typesutil.T
 
 	case *ast.FuncLit:
 		info.funcLitInfos[n] = append(info.funcLitInfos[n], funcInfo)
-
-		// TODO(grantnelson-wf): Remove below
-		buf := &bytes.Buffer{}
-		fSet := token.NewFileSet()
-		printer.Fprint(buf, fSet, n)
-		fmt.Printf(">>|<< Adding %q with [%v] in package %s\n", buf.String(), typeArgs, info.Pkg.Path())
-		fmt.Printf(">>|<< \tHad: %v\n", info.funcLitInfos[n])
 	}
 
 	// And add it to the list of all functions.
@@ -175,15 +166,7 @@ func (info *Info) FuncLitInfo(fun *ast.FuncLit, typeArgs typesutil.TypeList) *Fu
 			return fi
 		}
 	}
-
-	// TODO(grantnelson-wf): Remove below
-	buf := &bytes.Buffer{}
-	fSet := token.NewFileSet()
-	printer.Fprint(buf, fSet, fun)
-	fmt.Printf(">>|<< Failed to find %q (%p) with [%v] in package %s\n", buf.String(), fun, typeArgs, info.Pkg.Path())
-	fmt.Printf(">>|<< \tHad: %v\n\n", lits)
-	panic("BOOM!")
-	//return nil
+	return nil
 }
 
 // VarsWithInitializers returns a set of package-level variables that have
@@ -273,11 +256,6 @@ func (info *Info) propagateFunctionBlocking() bool {
 			}
 		}
 	}
-
-	// TODO(grantnelson-wf): Remove below
-	fmt.Printf(">>|<< propagateFunctionBlocking package %s\n", info.Pkg.Path())
-	fmt.Printf(">>|<< \tHad: %v\n", info.funcLitInfos)
-
 	return done
 }
 

diff --git a/compiler/package.go b/compiler/package.go
@@ -162,11 +162,6 @@ func PrepareAllSources(root *sources.Sources, allSources map[string]*sources.Sou
 		allInfo = append(allInfo, src.TypeInfo)
 	}
 	analysis.PropagateAnalysis(allInfo)
-
-	// Simplify the source files.
-	for _, srcs := range allSources {
-		srcs.Simplify()
-	}
 	return nil
 }
 

diff --git a/compiler/sources/sources.go b/compiler/sources/sources.go
@@ -91,12 +91,20 @@ func (s *Sources) Prepare(importer Importer, sizes types.Sizes, tContext *types.
 		}
 	}
 
+	// Extract all go:linkname compiler directives from the package source.
+	err = s.parseGoLinknames()
+	if err != nil {
+		return err
+	}
+
+	// Simply the source files.
+	s.simplify(typesInfo)
+
 	// Analyze the package to determine type parameters instances, blocking,
 	// and other type information. This will not populate the information.
 	s.analyze(typesInfo, importer, tContext)
 
-	// Extract all go:linkname compiler directives from the package source.
-	return s.parseGoLinknames()
+	return nil
 }
 
 // sort the Go files slice by the original source name to ensure consistent order
@@ -112,17 +120,20 @@ func (s *Sources) sort() {
 // simplify processed each Files entry with astrewrite.Simplify.
 //
 // Note this function mutates the original Files slice.
-// This must be called after TypeCheck.
-func (s *Sources) Simplify() {
+// This must be called after TypeCheck and before analyze since
+// this will change the pointers in the AST, for example the pointers
+// to function literals will change making it impossible to find them
+// in the type information if analyze is called first.
+func (s *Sources) simplify(typesInfo *types.Info) {
 	for i, file := range s.Files {
-		s.Files[i] = astrewrite.Simplify(file, s.TypeInfo.Info, false)
+		s.Files[i] = astrewrite.Simplify(file, typesInfo, false)
 	}
 }
 
 // typeCheck the sources. Returns information about declared package types and
 // type information for the supplied AST.
 //
-// This must be called prior to Simplify.
+// This must be called prior to simplify.
 func (s *Sources) typeCheck(importer Importer, sizes types.Sizes, tContext *types.Context) (*types.Info, error) {
 	const errLimit = 10 // Max number of type checking errors to return.
 
@@ -174,7 +185,7 @@ func (s *Sources) typeCheck(importer Importer, sizes types.Sizes, tContext *type
 // analyze will determine the type parameters instances, blocking,
 // and other type information for the package.
 //
-// This must be called prior to Simplify.
+// This must be called after to simplify.
 // Note that at the end of this call the analysis information
 // has NOT been propagated across packages yet.
 func (s *Sources) analyze(typesInfo *types.Info, importer Importer, tContext *types.Context) {
@@ -201,7 +212,7 @@ func (s *Sources) analyze(typesInfo *types.Info, importer Importer, tContext *ty
 // parseGoLinknames extracts all //go:linkname compiler directive from the sources.
 //
 // This will set the GoLinknames field on the Sources struct.
-// This must be called prior to Simplify.
+// This must be called prior to simplify.
 func (s *Sources) parseGoLinknames() error {
 	goLinknames := []linkname.GoLinkname{}
 	var errs errorList.ErrorList