Working on resolver improvements

grantnelson-wf · grantnelson-wf · commit 6a4f2ca8077a · 2025-05-20T16:17:41.000-06:00
diff --git a/compiler/internal/typeparams/collect.go b/compiler/internal/typeparams/collect.go
@@ -15,6 +15,7 @@ import (
 type Resolver struct {
 	tParams *types.TypeParamList
 	tArgs   []types.Type
+	root    Instance // The root instance that this resolver is based on.
 
 	// subster is the substitution helper that will perform the actual
 	// substitutions. This maybe nil when there are no substitutions but
@@ -34,6 +35,7 @@ func NewResolver(tc *types.Context, root Instance) *Resolver {
 
 	switch typ := root.Object.Type().(type) {
 	case *types.Signature:
+		fn = root.Object.(*types.Func)
 		tParams = SignatureTypeParams(typ)
 
 	case *types.Named:
@@ -65,6 +67,7 @@ func NewResolver(tc *types.Context, root Instance) *Resolver {
 	return &Resolver{
 		tParams: tParams,
 		tArgs:   root.TArgs,
+		root:    root,
 		subster: subst.New(tc, fn, replacements),
 		selMemo: map[typesutil.Selection]typesutil.Selection{},
 	}
@@ -254,7 +257,11 @@ func (c *visitor) addInstance(obj types.Object, tArgList *types.TypeList, tNest
 			TArgs:  tArgs,
 			TNest:  tNest,
 		}.String()) // TODO(grantnelson-wf): REMOVE
-		fmt.Printf("\t%d: %s\n", obj.Pos(), c.resolver.String()) // TODO(grantnelson-wf): REMOVE
+		fmt.Printf("\tresolver: %s\n", c.resolver.String())  // TODO(grantnelson-wf): REMOVE
+		fmt.Printf("\troot: %s\n", c.resolver.root.String()) // TODO(grantnelson-wf): REMOVE
+		for i := 0; i < len(tArgs); i++ {
+			fmt.Printf("\t%d: (%T) %s => %s\n", i, tArgs[i], tArgs[i], tArgs[i].Underlying()) // TODO(grantnelson-wf): REMOVE
+		}
 
 		return
 	}
diff --git a/internal/govendor/subst/export.go b/internal/govendor/subst/export.go
@@ -22,13 +22,6 @@ func New(tc *types.Context, fn *types.Func, replacements map[*types.TypeParam]ty
 		return nil
 	}
 
-	if fn == nil {
-		// If `fn` is nil, we create a fake function to avoid nil pointer dereference.
-		// `fn` can be nil when we are substituting with a generic type at the package level.
-		sig := types.NewSignatureType(nil, nil, nil, nil, nil, false)
-		fn = types.NewFunc(0, nil, `*fakeFn*`, sig)
-	}
-
 	subst := makeSubster(tc, fn, nil, nil, false)
 	subst.replacements = replacements
 	return &Subster{impl: subst}
diff --git a/internal/govendor/subst/subst.go b/internal/govendor/subst/subst.go
@@ -63,10 +63,16 @@ type subster struct {
 func makeSubster(ctxt *types.Context, fn *types.Func, tparams *types.TypeParamList, targs []types.Type, debug bool) *subster {
 	assert(tparams.Len() == len(targs), "makeSubster argument count must match")
 
+	// GOPHERJS: Made `fn` optional so that we can use this on package level types too.
+	var origin *types.Func
+	if fn != nil {
+		origin = fn.Origin()
+	}
+
 	subst := &subster{
 		replacements: make(map[*types.TypeParam]types.Type, tparams.Len()),
 		cache:        make(map[types.Type]types.Type),
-		origin:       fn.Origin(),
+		origin:       origin,
 		ctxt:         ctxt,
 	}
 	for i := 0; i < tparams.Len(); i++ {
diff --git a/internal/govendor/subst/util.go b/internal/govendor/subst/util.go
@@ -28,6 +28,11 @@ func changeRecv(s *types.Signature, recv *types.Var) *types.Signature {
 // obj must not be a method or a field.
 // From https://cs.opensource.google/go/x/tools/+/refs/tags/v0.33.0:go/ssa/util.go;l=145
 func declaredWithin(obj types.Object, fn *types.Func) bool {
+	// GOPHERJS: Made `fn` optional so that we can use this on package level types too.
+	if fn == nil {
+		return false
+	}
+
 	if obj.Pos() != token.NoPos {
 		return fn.Scope().Contains(obj.Pos()) // trust the positions if they exist.
 	}
