From 2cd2ff6f564dce5be0c4fb7f06338ff7af3fc9a9 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 8 Jun 2020 12:39:56 -0400 Subject: 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 Reviewed-by: Ian Lance Taylor --- src/runtime/cgo_sigaction.go | 10 +++++----- src/runtime/debugcall.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/runtime') diff --git a/src/runtime/cgo_sigaction.go b/src/runtime/cgo_sigaction.go index 967b8b9a0d..de634dc957 100644 --- a/src/runtime/cgo_sigaction.go +++ b/src/runtime/cgo_sigaction.go @@ -18,12 +18,12 @@ var _cgo_sigaction unsafe.Pointer //go:nosplit //go:nowritebarrierrec func sigaction(sig uint32, new, old *sigactiont) { - // The runtime package is explicitly blocklisted from sanitizer - // instrumentation in racewalk.go, but we might be calling into instrumented C - // functions here — so we need the pointer parameters to be properly marked. + // racewalk.go avoids adding sanitizing instrumentation to package runtime, + // but we might be calling into instrumented C functions here, + // so we need the pointer parameters to be properly marked. // - // Mark the input as having been written before the call and the output as - // read after. + // Mark the input as having been written before the call + // and the output as read after. if msanenabled && new != nil { msanwrite(unsafe.Pointer(new), unsafe.Sizeof(*new)) } diff --git a/src/runtime/debugcall.go b/src/runtime/debugcall.go index 496e6ce8cc..6c285ec829 100644 --- a/src/runtime/debugcall.go +++ b/src/runtime/debugcall.go @@ -61,7 +61,7 @@ func debugCallCheck(pc uintptr) string { "debugCall16384", "debugCall32768", "debugCall65536": - // These functions are allowlisted so that the debugger can initiate multiple function calls. + // These functions are allowed so that the debugger can initiate multiple function calls. // See: https://golang.org/cl/161137/ return } -- cgit v1.3