From ff2070d9398aff1c44691a90761eb35ea3cd4601 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 17 May 2024 12:07:15 -0400 Subject: runtime: move exit hooks into internal/runtime/exithook This removes a //go:linkname usage in the coverage implementation. For #67401. Change-Id: I0602172c7e372a84465160dbf46d9fa371582fff Reviewed-on: https://go-review.googlesource.com/c/go/+/586259 Auto-Submit: Russ Cox Reviewed-by: Than McIntosh LUCI-TryBot-Result: Go LUCI Reviewed-by: Cherry Mui --- src/cmd/compile/internal/noder/reader.go | 5 ++++- src/cmd/internal/objabi/pkgspecial.go | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/cmd') diff --git a/src/cmd/compile/internal/noder/reader.go b/src/cmd/compile/internal/noder/reader.go index 042d81bbcd..97865bbfb1 100644 --- a/src/cmd/compile/internal/noder/reader.go +++ b/src/cmd/compile/internal/noder/reader.go @@ -3720,10 +3720,13 @@ func (r *reader) needWrapper(typ *types.Type) { return } + // Special case: runtime must define error even if imported packages mention it (#29304). + forceNeed := typ == types.ErrorType && base.Ctxt.Pkgpath == "runtime" + // If a type was found in an imported package, then we can assume // that package (or one of its transitive dependencies) already // generated method wrappers for it. - if r.importedDef() { + if r.importedDef() && !forceNeed { haveWrapperTypes = append(haveWrapperTypes, typ) } else { needWrapperTypes = append(needWrapperTypes, typ) diff --git a/src/cmd/internal/objabi/pkgspecial.go b/src/cmd/internal/objabi/pkgspecial.go index 2925896bd8..3e99ce9224 100644 --- a/src/cmd/internal/objabi/pkgspecial.go +++ b/src/cmd/internal/objabi/pkgspecial.go @@ -44,6 +44,7 @@ var runtimePkgs = []string{ "runtime", "internal/runtime/atomic", + "internal/runtime/exithook", "runtime/internal/math", "runtime/internal/sys", "internal/runtime/syscall", -- cgit v1.3-5-g9baa