diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go index f9ccf84f72..8637d725ad 100644 --- a/src/cmd/compile/internal/gc/ssa.go +++ b/src/cmd/compile/internal/gc/ssa.go @@ -3658,9 +3658,6 @@ func init() { // findIntrinsic returns a function which builds the SSA equivalent of the // function identified by the symbol sym. If sym is not an intrinsic call, returns nil. func findIntrinsic(sym *types.Sym) intrinsicBuilder { - if ssa.IntrinsicsDisable { - return nil - } if sym == nil || sym.Pkg == nil { return nil } @@ -3680,6 +3677,13 @@ func findIntrinsic(sym *types.Sym) intrinsicBuilder { } fn := sym.Name + if ssa.IntrinsicsDisable { + if pkg == "runtime" && (fn == "getcallerpc" || fn == "getcallersp" || fn == "getclosureptr") { + // These runtime functions don't have definitions, must be intrinsics. + } else { + return nil + } + } return intrinsics[intrinsicKey{thearch.LinkArch.Arch, pkg, fn}] }