3 files changed, 27 insertions, 2 deletions
diff --git a/tools/nogo/analyzers.go b/tools/nogo/analyzers.go
index 6705fc905..db8bbdb8a 100644
--- a/tools/nogo/analyzers.go
+++ b/tools/nogo/analyzers.go
@@ -117,11 +117,11 @@ func register(all []*analysis.Analyzer) {
 func init() {
 	// Add all staticcheck analyzers.
 	for _, a := range staticcheck.Analyzers {
-		AllAnalyzers = append(AllAnalyzers, a)
+		AllAnalyzers = append(AllAnalyzers, a.Analyzer)
 	}
 	// Add all stylecheck analyzers.
 	for _, a := range stylecheck.Analyzers {
-		AllAnalyzers = append(AllAnalyzers, a)
+		AllAnalyzers = append(AllAnalyzers, a.Analyzer)
 	}
 
 	// Register lists.
diff --git a/tools/nogo/defs.bzl b/tools/nogo/defs.bzl
index 80182ff6c..dc9a8b24e 100644
--- a/tools/nogo/defs.bzl
+++ b/tools/nogo/defs.bzl
@@ -160,6 +160,11 @@ def _nogo_stdlib_impl(ctx):
     return [NogoStdlibInfo(
         facts = facts,
         raw_findings = raw_findings,
+    ), DefaultInfo(
+        # Declare the facts and findings as default outputs. This is not
+        # strictly required, but ensures that the target still perform analysis
+        # when built directly rather than just indirectly via a nogo_test.
+        files = depset([facts, raw_findings]),
     )]
 
 nogo_stdlib = go_rule(
diff --git a/tools/nogo/nogo.go b/tools/nogo/nogo.go
index d95d7652f..2f88f84db 100644
--- a/tools/nogo/nogo.go
+++ b/tools/nogo/nogo.go
@@ -293,6 +293,19 @@ func CheckStdlib(config *StdlibConfig, analyzers []*analysis.Analyzer) (allFindi
 		break
 	}
 
+	// Go standard library packages using Go 1.18 type parameter features.
+	//
+	// As of writing, analysis tooling is not updated to support type
+	// parameters and will choke on these packages. We skip these packages
+	// entirely for now.
+	//
+	// TODO(b/201686256): remove once tooling can handle type parameters.
+	usesTypeParams := map[string]struct{}{
+		"constraints": struct{}{}, // golang.org/issue/45458
+		"maps":        struct{}{}, // golang.org/issue/47649
+		"slices":      struct{}{}, // golang.org/issue/45955
+	}
+
 	// Aggregate all files by directory.
 	packages := make(map[string]*PackageConfig)
 	for _, file := range config.Srcs {
@@ -306,10 +319,17 @@ func CheckStdlib(config *StdlibConfig, analyzers []*analysis.Analyzer) (allFindi
 			continue // Not a file.
 		}
 		pkg := d[len(rootSrcPrefix):]
+
 		// Skip cmd packages and obvious test files: see above.
 		if strings.HasPrefix(pkg, "cmd/") || strings.HasSuffix(file, "_test.go") {
 			continue
 		}
+
+		if _, ok := usesTypeParams[pkg]; ok {
+			log.Printf("WARNING: Skipping package %q: type param analysis not yet supported", pkg)
+			continue
+		}
+
 		c, ok := packages[pkg]
 		if !ok {
 			c = &PackageConfig{