diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2021-07-22 12:50:30 -0700 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2021-07-22 12:50:31 -0700 |
| commit | a27e325c59691fba23c094ab07fd5735737ac8ba (patch) | |
| tree | 2dc7632b501359c291d95d7d15cd37f347727cd8 /src/runtime/runtime2.go | |
| parent | 5cb84f0604797df436d8fde548d4f797b3a6c245 (diff) | |
| parent | 798ec73519a7226d6d436e42498a54aed23b8468 (diff) | |
| download | go-a27e325c59691fba23c094ab07fd5735737ac8ba.tar.gz go-a27e325c59691fba23c094ab07fd5735737ac8ba.zip | |
[dev.typeparams] all: merge master (798ec73) into dev.typeparams
Merge List:
+ 2021-07-22 798ec73519 runtime: don't clear timerModifiedEarliest if adjustTimers is 0
+ 2021-07-22 fdb45acd1f runtime: move mem profile sampling into m-acquired section
+ 2021-07-21 3e48c0381f reflect: add missing copyright header
+ 2021-07-21 48c88f1b1b reflect: add Value.CanConvert
+ 2021-07-20 9e26569293 cmd/go: don't add C compiler ID to hash for standard library
+ 2021-07-20 d568e6e075 runtime/debug: skip TestPanicOnFault on netbsd/arm
Change-Id: I87e1cd4614bb3b00807f18dfdd02664dcaecaebd
Diffstat (limited to 'src/runtime/runtime2.go')
| -rw-r--r-- | src/runtime/runtime2.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/runtime2.go b/src/runtime/runtime2.go index d557ee8a3e..83d7d50b19 100644 --- a/src/runtime/runtime2.go +++ b/src/runtime/runtime2.go @@ -681,7 +681,7 @@ type p struct { // timerModifiedEarlier status. Because the timer may have been // modified again, there need not be any timer with this value. // This is updated using atomic functions. - // This is 0 if the value is unknown. + // This is 0 if there are no timerModifiedEarlier timers. timerModifiedEarliest uint64 // Per-P GC state |