diff options
| author | Rob Findley <rfindley@google.com> | 2020-09-11 14:23:34 -0400 |
|---|---|---|
| committer | Rob Findley <rfindley@google.com> | 2020-09-11 14:23:34 -0400 |
| commit | f8b1c17aced24a1618c6984794be9770c5d260be (patch) | |
| tree | 45af8d39b5c3d9f43d439ebec0a2ba42b49efe70 /src/runtime/traceback.go | |
| parent | e5d91ab096a9ff9673311f1a7f3f860a7f9c2062 (diff) | |
| parent | 07c1788357cfe6a4ee5f6f6a54d4fe9f579fa844 (diff) | |
| download | go-f8b1c17aced24a1618c6984794be9770c5d260be.tar.gz go-f8b1c17aced24a1618c6984794be9770c5d260be.zip | |
[dev.types] all: merge master into dev.typesdev.types
Change-Id: Ia6964cb4e09153c15cc9c5b441373d1b3cb8f757
Diffstat (limited to 'src/runtime/traceback.go')
| -rw-r--r-- | src/runtime/traceback.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime/traceback.go b/src/runtime/traceback.go index 7850eceafa..94f4a44976 100644 --- a/src/runtime/traceback.go +++ b/src/runtime/traceback.go @@ -269,9 +269,9 @@ func gentraceback(pc0, sp0, lr0 uintptr, gp *g, skip int, pcbuf *uintptr, max in frame.varp -= sys.RegSize } - // If framepointer_enabled and there's a frame, then - // there's a saved bp here. - if frame.varp > frame.sp && (framepointer_enabled && GOARCH == "amd64" || GOARCH == "arm64") { + // For architectures with frame pointers, if there's + // a frame, then there's a saved frame pointer here. + if frame.varp > frame.sp && (GOARCH == "amd64" || GOARCH == "arm64") { frame.varp -= sys.RegSize } |