Go: Use objectpath for object labels in extractor

go/extractor/go.mod

@@ -3,6 +3,8 @@ module github.com/github/codeql-go/extractor
 go 1.22.0
 
 require (
-	golang.org/x/mod v0.15.0
-	golang.org/x/tools v0.18.0
+	golang.org/x/mod v0.18.0
+	golang.org/x/tools v0.22.0
 )
+
+require golang.org/x/sync v0.7.0 // indirect

go/extractor/go.sum

@@ -1,6 +1,6 @@
-golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
-golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=

go/extractor/trap/labels.go

@@ -5,6 +5,7 @@ import (
 	"go/types"
 
 	"github.com/github/codeql-go/extractor/util"
+	"golang.org/x/tools/go/types/objectpath"
 )
 
 // Label represents a label
@@ -157,7 +158,15 @@ func (l *Labeler) ScopedObjectID(object types.Object, getTypeLabel func() Label)
 				// referenced from other files via their method
 				methlbl, _ := l.MethodID(meth, getTypeLabel())
 				label, _ = l.ReceiverObjectID(object, methlbl)
+			} else if path, err := objectpath.For(object); err == nil {
+				// If we can, use the object path as the label. This is needed
+				// for type parameters. Note that `objectpath` returns an error
+				// for non-exported objects.
+				label = l.GlobalID(fmt.Sprintf("%v,{%s};object", object.Pkg().Path(), path))
 			} else {
+				// Otherwise, construct a label based on the scope and the object's name.
+				// If the scope is not package scope then it will be given a fresh label,
+				// which will be different when it is referenced from different packages.
 				scopeLbl := l.ScopeID(scope, object.Pkg())
 				label = l.GlobalID(fmt.Sprintf("{%v},%s;object", scopeLbl, object.Name()))
 			}