diff options
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/compile/fmt_test.go | 15 | ||||
| -rw-r--r-- | src/cmd/go/internal/work/gc.go | 2 | ||||
| -rw-r--r-- | src/cmd/link/internal/loader/loader.go | 6 | ||||
| -rw-r--r-- | src/cmd/oldlink/internal/objfile/objfile.go | 6 |
4 files changed, 14 insertions, 15 deletions
diff --git a/src/cmd/compile/fmt_test.go b/src/cmd/compile/fmt_test.go index 768ca7fc89..e372259c78 100644 --- a/src/cmd/compile/fmt_test.go +++ b/src/cmd/compile/fmt_test.go @@ -96,7 +96,7 @@ func TestFormats(t *testing.T) { } importPath := filepath.Join("cmd/compile", path) - if blocklistedPackages[filepath.ToSlash(importPath)] { + if ignoredPackages[filepath.ToSlash(importPath)] { return filepath.SkipDir } @@ -344,8 +344,7 @@ func collectPkgFormats(t *testing.T, pkg *build.Package) { for index, file := range files { ast.Inspect(file, func(n ast.Node) bool { if call, ok := n.(*ast.CallExpr); ok { - // ignore blocklisted functions - if blocklistedFunctions[nodeString(call.Fun)] { + if ignoredFunctions[nodeString(call.Fun)] { return true } // look for an arguments that might be a format string @@ -354,7 +353,7 @@ func collectPkgFormats(t *testing.T, pkg *build.Package) { // make sure we have enough arguments n := numFormatArgs(s) if i+1+n > len(call.Args) { - t.Errorf("%s: not enough format args (blocklist %s?)", posString(call), nodeString(call.Fun)) + t.Errorf("%s: not enough format args (ignore %s?)", posString(call), nodeString(call.Fun)) break // ignore this call } // assume last n arguments are to be formatted; @@ -549,14 +548,14 @@ func formatReplace(in string, f func(i int, s string) string) string { return string(append(buf, in[i0:]...)) } -// blocklistedPackages is the set of packages which can +// ignoredPackages is the set of packages which can // be ignored. -var blocklistedPackages = map[string]bool{} +var ignoredPackages = map[string]bool{} -// blocklistedFunctions is the set of functions which may have +// ignoredFunctions is the set of functions which may have // format-like arguments but which don't do any formatting and // thus may be ignored. -var blocklistedFunctions = map[string]bool{} +var ignoredFunctions = map[string]bool{} func init() { // verify that knownFormats entries are correctly formatted diff --git a/src/cmd/go/internal/work/gc.go b/src/cmd/go/internal/work/gc.go index 9a4fdcda5f..f1d08e0268 100644 --- a/src/cmd/go/internal/work/gc.go +++ b/src/cmd/go/internal/work/gc.go @@ -168,7 +168,7 @@ func gcBackendConcurrency(gcflags []string) int { CheckFlags: for _, flag := range gcflags { // Concurrent compilation is presumed incompatible with any gcflags, - // except for a small allowlist of commonly used flags. + // except for known commonly used flags. // If the user knows better, they can manually add their own -c to the gcflags. switch flag { case "-N", "-l", "-S", "-B", "-C", "-I": diff --git a/src/cmd/link/internal/loader/loader.go b/src/cmd/link/internal/loader/loader.go index b871f664ea..32c342e545 100644 --- a/src/cmd/link/internal/loader/loader.go +++ b/src/cmd/link/internal/loader/loader.go @@ -634,15 +634,15 @@ func (l *Loader) checkdup(name string, r *oReader, li int, dup Sym) { } fmt.Fprintf(os.Stderr, "cmd/link: while reading object for '%v': duplicate symbol '%s', previous def at '%v', with mismatched payload: %s\n", r.unit.Lib, name, rdup.unit.Lib, reason) - // For the moment, allowlist DWARF subprogram DIEs for + // For the moment, allow DWARF subprogram DIEs for // auto-generated wrapper functions. What seems to happen // here is that we get different line numbers on formal // params; I am guessing that the pos is being inherited // from the spot where the wrapper is needed. - allowlist := strings.HasPrefix(name, "go.info.go.interface") || + allowed := strings.HasPrefix(name, "go.info.go.interface") || strings.HasPrefix(name, "go.info.go.builtin") || strings.HasPrefix(name, "go.debuglines") - if !allowlist { + if !allowed { l.strictDupMsgs++ } } diff --git a/src/cmd/oldlink/internal/objfile/objfile.go b/src/cmd/oldlink/internal/objfile/objfile.go index ae28e9673a..fbd7eb740b 100644 --- a/src/cmd/oldlink/internal/objfile/objfile.go +++ b/src/cmd/oldlink/internal/objfile/objfile.go @@ -411,16 +411,16 @@ overwrite: } fmt.Fprintf(os.Stderr, "cmd/link: while reading object for '%v': duplicate symbol '%s', previous def at '%v', with mismatched payload: %s\n", r.lib, dup, dup.Unit.Lib, reason) - // For the moment, allowlist DWARF subprogram DIEs for + // For the moment, allow DWARF subprogram DIEs for // auto-generated wrapper functions. What seems to happen // here is that we get different line numbers on formal // params; I am guessing that the pos is being inherited // from the spot where the wrapper is needed. - allowlist := (strings.HasPrefix(dup.Name, "go.info.go.interface") || + allowed := (strings.HasPrefix(dup.Name, "go.info.go.interface") || strings.HasPrefix(dup.Name, "go.info.go.builtin") || strings.HasPrefix(dup.Name, "go.isstmt.go.builtin") || strings.HasPrefix(dup.Name, "go.debuglines")) - if !allowlist { + if !allowed { r.strictDupMsgs++ } } |