[vm] Fix gardening issues related to NativeCallable.listener fix

liamappelbe · Commit Queue · commit febbe8296a20 · 2025-08-20T16:52:26.000-07:00
Fixes: #61318 Fixes: #61316 Change-Id: I615e94e6d10fefd26a1431c5dd89f1075e893c22 TEST=CI Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/445420 Reviewed-by: Alexander Markov <alexmarkov@google.com> Commit-Queue: Liam Appelbe <liama@google.com> Auto-Submit: Liam Appelbe <liama@google.com>
diff --git a/runtime/vm/ffi_callback_metadata.cc b/runtime/vm/ffi_callback_metadata.cc
@@ -305,7 +305,7 @@ void FfiCallbackMetadata::DeleteCallbackLocked(MetadataEntry* entry) {
 }
 
 void FfiCallbackMetadata::DeleteAllCallbacks(MetadataEntry** list_head) {
-  SafepointMutexLocker locker(&lock_);
+  MutexLocker locker(&lock_);
   for (MetadataEntry* entry = *list_head; entry != nullptr;) {
     MetadataEntry* next = entry->list_next();
     DeleteCallbackLocked(entry);
diff --git a/tests/ffi/ffi.status b/tests/ffi/ffi.status
@@ -114,3 +114,4 @@ data_not_asan_test: SkipByDesign # This test tries to allocate too much memory o
 
 [ $hot_reload || $hot_reload_rollback ]
 isolate_group_bound_callback_test: SkipSlow # shared_slow_path_triggers_gc in combination with reload makes this test very slow
+many_listener_callbacks_test/*: Skip # Starts many background threads that are leaked by hot reloading

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ void FfiCallbackMetadata::DeleteCallbackLocked(MetadataEntry* entry) {`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`void FfiCallbackMetadata::DeleteAllCallbacks(MetadataEntry** list_head) {`
`308`		`- SafepointMutexLocker locker(&lock_);`
	`308`	`+ MutexLocker locker(&lock_);`
`309`	`309`	`for (MetadataEntry* entry = *list_head; entry != nullptr;) {`
`310`	`310`	`MetadataEntry* next = entry->list_next();`
`311`	`311`	`DeleteCallbackLocked(entry);`
Original file line number	Diff line number	Diff line change
`@@ -114,3 +114,4 @@ data_not_asan_test: SkipByDesign # This test tries to allocate too much memory o`
`114`	`114`
`115`	`115`	`[ $hot_reload \|\| $hot_reload_rollback ]`
`116`	`116`	`isolate_group_bound_callback_test: SkipSlow # shared_slow_path_triggers_gc in combination with reload makes this test very slow`
	`117`	`+many_listener_callbacks_test/*: Skip # Starts many background threads that are leaked by hot reloading`