diff options
| author | Mauri de Souza Meneguzzo <mauri870@gmail.com> | 2023-08-13 14:04:53 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-08-17 21:19:23 +0000 |
| commit | 31c5a236bc473756535ae163bb68242926b5eed7 (patch) | |
| tree | 98a2308314c33895557c25a83866ba44cba610f1 | |
| parent | 25ec110e5164d43ae8a971928d576a94fb61862f (diff) | |
| download | go-31c5a236bc473756535ae163bb68242926b5eed7.tar.gz go-31c5a236bc473756535ae163bb68242926b5eed7.zip | |
[release-branch.go1.21] runtime: mark traceEnabled and traceShuttingDown as no:split
This fixes a regression from CL 494181.
The traceEnabled function splits the stack and is being
called by reentersyscall that shouldn't call anything
that splits the stack. Same with traceShuttingDown.
For #61975
Fixes #61987
Change-Id: I5eca0ba74cfa6acb0259e8400b03c2093cd59dd1
GitHub-Last-Rev: 9e55ae9d7cc700de9757d32a7905127a349d973a
GitHub-Pull-Request: golang/go#61981
Reviewed-on: https://go-review.googlesource.com/c/go/+/519055
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Dmitri Shuralyov <dmitshur@google.com>
(cherry picked from commit aa5d483f25e89f3bf399362ccc9a5b146cae5c79)
Reviewed-on: https://go-review.googlesource.com/c/go/+/519495
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Auto-Submit: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Austin Clements <austin@google.com>
Run-TryBot: Michael Knyszek <mknyszek@google.com>
| -rw-r--r-- | src/runtime/trace.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/runtime/trace.go b/src/runtime/trace.go index a4d50d77a0..7d7987c90c 100644 --- a/src/runtime/trace.go +++ b/src/runtime/trace.go @@ -257,11 +257,15 @@ func traceBufPtrOf(b *traceBuf) traceBufPtr { } // traceEnabled returns true if the trace is currently enabled. +// +//go:nosplit func traceEnabled() bool { return trace.enabled } // traceShuttingDown returns true if the trace is currently shutting down. +// +//go:nosplit func traceShuttingDown() bool { return trace.shutdown } |