diff --git a/src/cmd/compile/internal/inline/inlheur/analyze_func_params.go b/src/cmd/compile/internal/inline/inlheur/analyze_func_params.go
index f6bd84c3f5..abfcb3ab32 100644
--- a/src/cmd/compile/internal/inline/inlheur/analyze_func_params.go
+++ b/src/cmd/compile/internal/inline/inlheur/analyze_func_params.go
@@ -122,9 +122,9 @@ func (pa *paramsAnalyzer) findParamIdx(n *ir.Name) int {
 
 type testfType func(x ir.Node, param *ir.Name, idx int) (bool, bool)
 
-// paramsAnalyzer invokes function 'testf' on the specified expression
-// 'x' for each parameter, and if the result is TRUE, or's 'flag' into
-// the flags for that param.
+// checkParams invokes function 'testf' on the specified expression 'x'
+// for each parameter. If the result is TRUE, it OR's either 'flag' or 'mayflag'
+// into the flags for that param, depending on whether we are in a conditional context.
 func (pa *paramsAnalyzer) checkParams(x ir.Node, flag ParamPropBits, mayflag ParamPropBits, testf testfType) {
 	for idx, p := range pa.params {
 		if !pa.top[idx] && pa.values[idx] == ParamNoInfo {
diff --git a/src/cmd/compile/internal/test/testdata/arith_test.go b/src/cmd/compile/internal/test/testdata/arith_test.go
index 34ac73c068..6f53618b59 100644
--- a/src/cmd/compile/internal/test/testdata/arith_test.go
+++ b/src/cmd/compile/internal/test/testdata/arith_test.go
@@ -223,7 +223,7 @@ func testArithConstShift(t *testing.T) {
 	}
 }
 
-// overflowConstShift_ssa verifies that constant folding for shift
+// overflowConstShift64_ssa verifies that constant folding for shift
 // doesn't wrap (i.e. x << MAX_INT << 1 doesn't get folded to x << 0).
 //
 //go:noinline
@@ -1408,7 +1408,7 @@ var (
 	// These have to be global to avoid getting constant-folded in the function body:
 	// as locals, prove can see that they are actually constants.
 	sixU, nineteenU uint64 = 6, 19
-	sixS, nineteenS int64 = 6, 19
+	sixS, nineteenS int64  = 6, 19
 )
 
 // testDivisibility confirms that rewrite rules x%c ==0 for c constant are correct.
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index f8d19ac34c..aae16c1637 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -1236,7 +1236,7 @@ func (t *tester) externalLinkPIE() bool {
 	return t.internalLinkPIE() && t.extLink()
 }
 
-// supportedBuildMode reports whether the given build mode is supported.
+// supportedBuildmode reports whether the given build mode is supported.
 func (t *tester) supportedBuildmode(mode string) bool {
 	switch mode {
 	case "c-archive", "c-shared", "shared", "plugin", "pie":
diff --git a/src/cmd/go/internal/doc/pkg.go b/src/cmd/go/internal/doc/pkg.go
index 7b5e00365d..8020807d4a 100644
--- a/src/cmd/go/internal/doc/pkg.go
+++ b/src/cmd/go/internal/doc/pkg.go
@@ -526,7 +526,7 @@ func (pkg *Package) funcsDoc() {
 	}
 }
 
-// funcsDoc prints all type documentation, if any, including a header.
+// typesDoc prints all type documentation, if any, including a header.
 func (pkg *Package) typesDoc() {
 	var header bool
 	for _, typ := range pkg.doc.Types {
diff --git a/src/cmd/go/internal/generate/generate_test.go b/src/cmd/go/internal/generate/generate_test.go
index 2eef917e7e..b11ed50545 100644
--- a/src/cmd/go/internal/generate/generate_test.go
+++ b/src/cmd/go/internal/generate/generate_test.go
@@ -79,7 +79,7 @@ var defEnvMap = map[string]string{
 	"_X":      "Y",
 }
 
-// TestGenerateCommandShortHand - similar to TestGenerateCommandParse,
+// TestGenerateCommandShorthand - similar to TestGenerateCommandParse,
 // except:
 //  1. if the result starts with -command, record that shorthand
 //     before moving on to the next test.
diff --git a/src/cmd/link/internal/ld/fips140.go b/src/cmd/link/internal/ld/fips140.go
index c1887ee50a..8ab6f39910 100644
--- a/src/cmd/link/internal/ld/fips140.go
+++ b/src/cmd/link/internal/ld/fips140.go
@@ -398,7 +398,7 @@ func machofips(ctxt *Link, exe, fipso string) error {
 	return f.Close()
 }
 
-// machofips updates go:fipsinfo after external linking
+// elffips updates go:fipsinfo after external linking
 // on systems using ELF (most Unix systems).
 func elffips(ctxt *Link, exe, fipso string) error {
 	// Open executable both for reading ELF and for the fipsObj.
diff --git a/src/cmd/link/internal/loader/loader_test.go b/src/cmd/link/internal/loader/loader_test.go
index 541f42b7d1..7f7a75d9f4 100644
--- a/src/cmd/link/internal/loader/loader_test.go
+++ b/src/cmd/link/internal/loader/loader_test.go
@@ -14,7 +14,7 @@ import (
 	"testing"
 )
 
-// dummyAddSym adds the named symbol to the loader as if it had been
+// addDummyObjSym adds the named symbol to the loader as if it had been
 // read from a Go object file. Note that it allocates a global
 // index without creating an associated object reader, so one can't
 // do anything interesting with this symbol (such as look at its