mirror of
https://github.com/golang/go.git
synced 2025-10-19 11:03:18 +00:00
reflect: use runtime.AddCleanup instead of runtime.SetFinalizer
Replace a usage of runtime.SetFinalizer with runtime.AddCleanup in the TestCallReturnsEmpty test. There is an additional use of SetFinalizer in the reflect package which depends on object resurrection and needs further refactoring to replace. Updates #70907 Change-Id: I4c0e56c35745a225776bd611d026945efdaf96f5 Reviewed-on: https://go-review.googlesource.com/c/go/+/667595 Reviewed-by: Michael Knyszek <mknyszek@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
parent
afd6b0bc66
commit
b4e992b6e1
1 changed files with 6 additions and 6 deletions
|
@ -2240,18 +2240,18 @@ func TestCallReturnsEmpty(t *testing.T) {
|
|||
// Issue 21717: past-the-end pointer write in Call with
|
||||
// nonzero-sized frame and zero-sized return value.
|
||||
runtime.GC()
|
||||
var finalized uint32
|
||||
var cleanedUp atomic.Uint32
|
||||
f := func() (emptyStruct, *[2]int64) {
|
||||
i := new([2]int64) // big enough to not be tinyalloc'd, so finalizer always runs when i dies
|
||||
runtime.SetFinalizer(i, func(*[2]int64) { atomic.StoreUint32(&finalized, 1) })
|
||||
i := new([2]int64) // big enough to not be tinyalloc'd, so cleanup always runs when i dies
|
||||
runtime.AddCleanup(i, func(cu *atomic.Uint32) { cu.Store(uint32(1)) }, &cleanedUp)
|
||||
return emptyStruct{}, i
|
||||
}
|
||||
v := ValueOf(f).Call(nil)[0] // out[0] should not alias out[1]'s memory, so the finalizer should run.
|
||||
v := ValueOf(f).Call(nil)[0] // out[0] should not alias out[1]'s memory, so the cleanup should run.
|
||||
timeout := time.After(5 * time.Second)
|
||||
for atomic.LoadUint32(&finalized) == 0 {
|
||||
for cleanedUp.Load() == 0 {
|
||||
select {
|
||||
case <-timeout:
|
||||
t.Fatal("finalizer did not run")
|
||||
t.Fatal("cleanup did not run")
|
||||
default:
|
||||
}
|
||||
runtime.Gosched()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue