diff options
| author | Damien Neil <dneil@google.com> | 2025-05-21 13:02:59 -0700 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2025-05-27 14:47:09 -0700 |
| commit | b78e38065efd5f4079564b9e8e3529950ba0dd52 (patch) | |
| tree | 4c64ecccbcf759c5e07d3cb59be97c888803d29c /src/runtime | |
| parent | 961818e0131aaa7468616a90ce9ebf00111ccdaa (diff) | |
| download | go-b78e38065efd5f4079564b9e8e3529950ba0dd52.tar.xz | |
runtime: define lock ranking between weak pointers and synctest
Fixes #73817
Change-Id: I0101bdc797237b4c7eb58b414c71b009b0b44447
Reviewed-on: https://go-review.googlesource.com/c/go/+/675176
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Auto-Submit: Damien Neil <dneil@google.com>
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/lockrank.go | 2 | ||||
| -rw-r--r-- | src/runtime/mklockrank.go | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/runtime/lockrank.go b/src/runtime/lockrank.go index 456f2b75e6..7f32e6397b 100644 --- a/src/runtime/lockrank.go +++ b/src/runtime/lockrank.go @@ -204,7 +204,7 @@ var lockPartialOrder [][]lockRank = [][]lockRank{ lockRankRoot: {}, lockRankItab: {}, lockRankReflectOffs: {lockRankItab}, - lockRankSynctest: {lockRankSysmon, lockRankScavenge, lockRankSweep, lockRankTestR, lockRankTimerSend, lockRankPollDesc, lockRankWakeableSleep, lockRankHchan, lockRankNotifyList, lockRankTimers, lockRankTimer, lockRankRoot, lockRankItab, lockRankReflectOffs}, + lockRankSynctest: {lockRankSysmon, lockRankScavenge, lockRankSweepWaiters, lockRankStrongFromWeakQueue, lockRankSweep, lockRankTestR, lockRankTimerSend, lockRankPollDesc, lockRankWakeableSleep, lockRankHchan, lockRankNotifyList, lockRankTimers, lockRankTimer, lockRankRoot, lockRankItab, lockRankReflectOffs}, lockRankUserArenaState: {}, lockRankTraceBuf: {lockRankSysmon, lockRankScavenge}, lockRankTraceStrings: {lockRankSysmon, lockRankScavenge, lockRankTraceBuf}, diff --git a/src/runtime/mklockrank.go b/src/runtime/mklockrank.go index 6cccece9b5..2e3375331a 100644 --- a/src/runtime/mklockrank.go +++ b/src/runtime/mklockrank.go @@ -99,7 +99,15 @@ NONE < reflectOffs; # Synctest -hchan, root, timers, timer, notifyList, reflectOffs < synctest; +hchan, + notifyList, + reflectOffs, + root, + strongFromWeakQueue, + sweepWaiters, + timer, + timers +< synctest; # User arena state NONE < userArenaState; |