diff options
| author | Russ Cox <rsc@golang.org> | 2020-06-08 12:39:56 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2020-06-08 21:36:04 +0000 |
| commit | 2cd2ff6f564dce5be0c4fb7f06338ff7af3fc9a9 (patch) | |
| tree | dd814923cd9b140f8868340a112501f2bda4f1b1 /src/cmd/link/internal/loader/loader.go | |
| parent | bddf75d88859b8454f67de32510d8488329d0f2b (diff) | |
| download | go-2cd2ff6f564dce5be0c4fb7f06338ff7af3fc9a9.tar.gz go-2cd2ff6f564dce5be0c4fb7f06338ff7af3fc9a9.zip | |
all: avoid awkward wording from CL 236857
CL 236857 removed all uses of whitelist/blacklist, which is great.
But it substituted awkward phrasing using allowlist/blocklist,
especially as verbs or participles. This CL uses more standard English,
like "allow the function" or "blocked functions" instead of
"allowlist the function" or "blocklisted functions".
Change-Id: I9106a2fdbd62751c4cbda3a77181358a8a6d0f13
Reviewed-on: https://go-review.googlesource.com/c/go/+/236917
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/cmd/link/internal/loader/loader.go')
| -rw-r--r-- | src/cmd/link/internal/loader/loader.go | 6 |
1 files changed, 3 insertions, 3 deletions
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++ } } |