From a9780d8dfd38ae0b11b093cabe5b8086f202c3cd Mon Sep 17 00:00:00 2001 From: Quim Muntal Date: Thu, 26 Jan 2023 07:48:04 +0000 Subject: Revert "runtime: use explicit NOFRAME on darwin/amd64" This reverts CL 460235. Reason for revert: This breaks darwin 10 and 11 Change-Id: I3c663ebe3b77eba45a006a3ebec5cabe667faa9e Reviewed-on: https://go-review.googlesource.com/c/go/+/463635 Auto-Submit: Quim Muntal Run-TryBot: Quim Muntal TryBot-Result: Gopher Robot Reviewed-by: Bryan Mills Reviewed-by: Cherry Mui --- src/cmd/internal/obj/x86/obj6.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cmd/internal') diff --git a/src/cmd/internal/obj/x86/obj6.go b/src/cmd/internal/obj/x86/obj6.go index 4a9b3b88ec..aa4cc225c6 100644 --- a/src/cmd/internal/obj/x86/obj6.go +++ b/src/cmd/internal/obj/x86/obj6.go @@ -614,14 +614,14 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym, newprog obj.ProgAlloc) { var bpsize int if ctxt.Arch.Family == sys.AMD64 && !p.From.Sym.NoFrame() && // (1) below - !(autoffset == 0 && p.From.Sym.NoSplit() && ctxt.Headtype != objabi.Hwindows && ctxt.Headtype != objabi.Hdarwin) && // (2) below + !(autoffset == 0 && p.From.Sym.NoSplit() && ctxt.Headtype != objabi.Hwindows) && // (2) below !(autoffset == 0 && !hasCall) { // (3) below // Make room to save a base pointer. // There are 2 cases we must avoid: // 1) If noframe is set (which we do for functions which tail call). // 2) Scary runtime internals which would be all messed up by frame pointers. // We detect these using a heuristic: frameless nosplit functions. - // Windows and Darwin do not use this heuristic anymore. + // Windows does not use this heuristic anymore. // TODO: Maybe someday we label them all with NOFRAME and get rid of this heuristic. // For performance, we also want to avoid: // 3) Frameless leaf functions -- cgit v1.3