From d9503428fa2aafdfdcfcda12f370a1b3cf79e637 Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Mon, 10 Feb 2025 14:36:31 -0800 Subject: [PATCH] [vm, reload] Restore assertion that the reload context is gone before shutdown. TEST=ci Bug: https://github.com/dart-lang/sdk/issues/32796 Change-Id: Idae5f2240af6069bf5bb4f1bb5868b2f39cead3d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/408202 Commit-Queue: Ryan Macnak Reviewed-by: Alexander Markov --- runtime/vm/isolate.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc index b9e6c292646..7f85035d3d6 100644 --- a/runtime/vm/isolate.cc +++ b/runtime/vm/isolate.cc @@ -415,6 +415,11 @@ IsolateGroup::IsolateGroup(std::shared_ptr source, } IsolateGroup::~IsolateGroup() { +#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME) + RELEASE_ASSERT(group_reload_context_ == nullptr); + RELEASE_ASSERT(program_reload_context_ == nullptr); +#endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME) + // Ensure we destroy the heap before the other members. heap_ = nullptr; ASSERT(old_marking_stack_ == nullptr); @@ -1829,11 +1834,6 @@ Isolate::Isolate(IsolateGroup* isolate_group, #undef REUSABLE_HANDLE_INITIALIZERS Isolate::~Isolate() { -#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME) - // TODO(32796): Re-enable assertion. - // RELEASE_ASSERT(program_reload_context_ == nullptr); -#endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME) - #if !defined(PRODUCT) delete debugger_; debugger_ = nullptr;