diff options
| author | Austin Clements <austin@google.com> | 2023-07-07 16:16:30 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2023-08-22 19:18:21 +0000 |
| commit | 596120fdc6075c5789eae3a5caaf57639e7d18a3 (patch) | |
| tree | 3873662c42a2ddec79cc06df58dbb22b29c48864 /src/cmd/compile/internal/noder | |
| parent | 9f9bb26880388c5bead158e9eca3be4b3a9bd2af (diff) | |
| download | go-596120fdc6075c5789eae3a5caaf57639e7d18a3.tar.xz | |
cmd/compile: redo IsRuntimePkg/IsReflectPkg predicate
Currently, the types package has IsRuntimePkg and IsReflectPkg
predicates for testing if a Pkg is the runtime or reflect packages.
IsRuntimePkg returns "true" for any "CompilingRuntime" package, which
includes all of the packages imported by the runtime. This isn't
inherently wrong, except that all but one use of it is of the form "is
this Sym a specific runtime.X symbol?" for which we clearly only want
the package "runtime" itself. IsRuntimePkg was introduced (as
isRuntime) in CL 37538 as part of separating the real runtime package
from the compiler built-in fake runtime package. As of that CL, the
"runtime" package couldn't import any other packages, so this was
adequate at the time.
We could fix this by just changing the implementation of IsRuntimePkg,
but the meaning of this API is clearly somewhat ambiguous. Instead, we
replace it with a new RuntimeSymName function that returns the name of
a symbol if it's in package "runtime", or "" if not. This is what
every call site (except one) actually wants, which lets us simplify
the callers, and also more clearly addresses the ambiguity between
package "runtime" and the general concept of a runtime package.
IsReflectPkg doesn't have the same issue of ambiguity, but it
parallels IsRuntimePkg and is used in the same way, so we replace it
with a new ReflectSymName for consistency.
Change-Id: If3a81d7d11732a9ab2cac9488d17508415cfb597
Reviewed-on: https://go-review.googlesource.com/c/go/+/521696
Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/cmd/compile/internal/noder')
| -rw-r--r-- | src/cmd/compile/internal/noder/unified.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/noder/unified.go b/src/cmd/compile/internal/noder/unified.go index 58d4e02937..e534f0b725 100644 --- a/src/cmd/compile/internal/noder/unified.go +++ b/src/cmd/compile/internal/noder/unified.go @@ -109,7 +109,7 @@ func unified(m posMap, noders []*noder) { // For functions originally came from package runtime, // mark as norace to prevent instrumenting, see issue #60439. for _, fn := range target.Funcs { - if !base.Flag.CompilingRuntime && types.IsRuntimePkg(fn.Sym().Pkg) { + if !base.Flag.CompilingRuntime && types.RuntimeSymName(fn.Sym()) != "" { fn.Pragma |= ir.Norace } } |
