diff options
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/compile/internal/noder/reader.go | 5 | ||||
| -rw-r--r-- | src/cmd/internal/objabi/pkgspecial.go | 1 |
2 files changed, 5 insertions, 1 deletions
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", |