Merge pull request github#17358 from github/mbg/go/1.23-transparent-aliases

Go: Support 1.23 (Transparent aliases)

Author: mbg

MODULE.bazel

@@ -153,7 +153,7 @@ use_repo(
 )
 
 go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
-go_sdk.download(version = "1.22.2")
+go_sdk.download(version = "1.23.1")
 
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//go/extractor:go.mod")

go/actions/test/action.yml

@@ -4,7 +4,7 @@ inputs:
   go-test-version:
     description: Which Go version to use for running the tests
     required: false
-    default: ~1.22.0
+    default: "~1.23.1"
   run-code-checks:
     description: Whether to run formatting, code and qhelp generation checks
     required: false

go/extractor/autobuilder/build-environment.go

@@ -12,7 +12,7 @@ import (
 )
 
 var minGoVersion = util.NewSemVer("1.11")
-var maxGoVersion = util.NewSemVer("1.22")
+var maxGoVersion = util.NewSemVer("1.23")
 
 type versionInfo struct {
 	goModVersion util.SemVer // The version of Go found in the go directive in the `go.mod` file.

go/extractor/extractor.go

@@ -1507,9 +1507,24 @@ func extractSpec(tw *trap.Writer, spec ast.Spec, parent trap.Label, idx int) {
 	extractNodeLocation(tw, spec, lbl)
 }
 
+// Determines whether the given type is an alias.
+func isAlias(tp types.Type) bool {
+	_, ok := tp.(*types.Alias)
+	return ok
+}
+
+// If the given type is a type alias, this function resolves it to its underlying type.
+func resolveTypeAlias(tp types.Type) types.Type {
+	if isAlias(tp) {
+		return types.Unalias(tp) // tp.Underlying()
+	}
+	return tp
+}
+
 // extractType extracts type information for `tp` and returns its associated label;
 // types are only extracted once, so the second time `extractType` is invoked it simply returns the label
 func extractType(tw *trap.Writer, tp types.Type) trap.Label {
+	tp = resolveTypeAlias(tp)
 	lbl, exists := getTypeLabel(tw, tp)
 	if !exists {
 		var kind int
@@ -1666,6 +1681,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 // is constructed from their globally unique ID. This prevents cyclic type keys
 // since type recursion in Go always goes through named types.
 func getTypeLabel(tw *trap.Writer, tp types.Type) (trap.Label, bool) {
+	tp = resolveTypeAlias(tp)
 	lbl, exists := tw.Labeler.TypeLabels[tp]
 	if !exists {
 		switch tp := tp.(type) {

go/extractor/go.mod

@@ -1,6 +1,8 @@
 module github.com/github/codeql-go/extractor
 
-go 1.22.0
+go 1.23
+
+toolchain go1.23.1
 
 // when updating this, run
 //    bazel run @rules_go//go -- mod tidy

go/ql/test/extractor-tests/diagnostics/CONSISTENCY/UnexpectedFrontendErrors.expected

@@ -1,4 +1,4 @@
-| -:0:0:0:0 | package ; expected main |
+| -:0:0:0:0 | package ; expected package main |
 | broken2/test1.go:4:2:4:2 | undefined: fmt |
 | broken2/test1.go:5:2:5:2 | undefined: fmt |
 | broken2/test1.go:5:14:5:14 | undefined: a |

go/ql/test/library-tests/semmle/go/Files/CONSISTENCY/UnexpectedFrontendErrors.expected

@@ -1,4 +1,4 @@
-| -:0:0:0:0 | package ; expected nonexistent |
+| -:0:0:0:0 | package ; expected package nonexistent |
 | vendor/github.com/github/nonexistent/bad.go:1:57:1:57 | expected ';', found 'EOF' |
 | vendor/github.com/github/nonexistent/bad.go:1:57:1:57 | expected 'IDENT', found 'EOF' |
 | vendor/github.com/github/nonexistent/bad.go:1:57:1:57 | expected 'package', found 'EOF' |

go/ql/test/library-tests/semmle/go/Function/TypeParamType.expected

@@ -1,12 +1,15 @@
 | E | Ordered |
 | E | comparable |
 | E | interface { } |
+| E | interface { ~uint16 \| ~uint32 } |
 | E1 | interface { } |
 | E2 | interface { } |
 | Edge | EdgeConstraint |
 | Edge | interface { } |
 | F | floaty |
 | K | comparable |
+| K | interface { } |
+| N | interface { int64 \| uint64 } |
 | Node | NodeConstraint |
 | Node | interface { } |
 | S | interface { } |
@@ -15,6 +18,7 @@
 | S2 | interface { ~[]E2 } |
 | SF2 | interface { } |
 | SG2 | interface { } |
+| Slice | interface { ~[]E } |
 | T | Ordered |
 | T | comparable |
 | T | interface { string \| []uint8 } |
@@ -27,4 +31,5 @@
 | TG2 | interface { } |
 | U | interface { } |
 | V | interface { int64 \| float64 } |
+| V | interface { } |
 | bytes | interface { []uint8 \| string } |

go/ql/test/library-tests/semmle/go/Types/Aliases.expected

@@ -0,0 +1,20 @@
+entities
+| aliases.go | aliases.go:3:6:3:13 | aliasesX | 1 | file://:0:0:0:0 | int |
+| aliases.go | aliases.go:4:6:4:13 | aliasesY | 1 | file://:0:0:0:0 | int |
+| aliases.go | aliases.go:6:6:6:14 | aliasesS1 | 1 | file://:0:0:0:0 | struct type |
+| aliases.go | aliases.go:6:26:6:26 | x | 3 | file://:0:0:0:0 | int |
+| aliases.go | aliases.go:8:6:8:14 | aliasesS2 | 1 | file://:0:0:0:0 | struct type |
+| aliases.go | aliases.go:8:26:8:26 | x | 3 | file://:0:0:0:0 | int |
+| aliases.go | aliases.go:10:6:10:6 | F | 1 | file://:0:0:0:0 | signature type |
+| aliases.go | aliases.go:10:8:10:11 | Afs1 | 1 | file://:0:0:0:0 | struct type |
+| aliases.go | aliases.go:14:6:14:6 | G | 1 | file://:0:0:0:0 | signature type |
+| aliases.go | aliases.go:14:8:14:11 | Afs2 | 1 | file://:0:0:0:0 | struct type |
+| aliases.go | aliases.go:19:6:19:7 | S3 | 1 | aliases.go:19:6:19:7 | S3 |
+| aliases.go | aliases.go:19:17:19:17 | x | 3 | file://:0:0:0:0 | int |
+| aliases.go | aliases.go:22:6:22:6 | T | 1 | aliases.go:19:6:19:7 | S3 |
+| aliases.go | aliases.go:25:6:25:6 | H | 1 | file://:0:0:0:0 | signature type |
+| aliases.go | aliases.go:25:8:25:11 | Afs3 | 1 | aliases.go:19:6:19:7 | S3 |
+#select
+| F | func(struct { x int }) int |
+| G | func(struct { x int }) int |
+| H | func(S3) int |

go/ql/test/library-tests/semmle/go/Types/Aliases.ql

@@ -0,0 +1,21 @@
+import go
+
+int countDecls(Entity e) { result = count(Ident decl | decl = e.getDeclaration()) }
+
+query predicate entities(string fp, Entity e, int c, Type ty) {
+  c = countDecls(e) and
+  ty = e.getType() and
+  exists(DbLocation loc |
+    loc = e.getDeclaration().getLocation() and
+    fp = loc.getFile().getBaseName() and
+    fp = "aliases.go"
+  )
+}
+
+from string fp, FuncDecl decl, SignatureType sig
+where
+  decl.hasLocationInfo(fp, _, _, _, _) and
+  decl.getName() = ["F", "G", "H"] and
+  sig = decl.getType() and
+  fp.matches("%aliases.go%")
+select decl.getName(), sig.pp()