Skip to content

Commit d950342

Browse files
rmacnak-googleCommit Queue
authored andcommitted
[vm, reload] Restore assertion that the reload context is gone before shutdown.
TEST=ci Bug: #32796 Change-Id: Idae5f2240af6069bf5bb4f1bb5868b2f39cead3d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/408202 Commit-Queue: Ryan Macnak <[email protected]> Reviewed-by: Alexander Markov <[email protected]>
1 parent 4d1b785 commit d950342

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

runtime/vm/isolate.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,11 @@ IsolateGroup::IsolateGroup(std::shared_ptr<IsolateGroupSource> source,
415415
}
416416

417417
IsolateGroup::~IsolateGroup() {
418+
#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
419+
RELEASE_ASSERT(group_reload_context_ == nullptr);
420+
RELEASE_ASSERT(program_reload_context_ == nullptr);
421+
#endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
422+
418423
// Ensure we destroy the heap before the other members.
419424
heap_ = nullptr;
420425
ASSERT(old_marking_stack_ == nullptr);
@@ -1829,11 +1834,6 @@ Isolate::Isolate(IsolateGroup* isolate_group,
18291834
#undef REUSABLE_HANDLE_INITIALIZERS
18301835

18311836
Isolate::~Isolate() {
1832-
#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
1833-
// TODO(32796): Re-enable assertion.
1834-
// RELEASE_ASSERT(program_reload_context_ == nullptr);
1835-
#endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
1836-
18371837
#if !defined(PRODUCT)
18381838
delete debugger_;
18391839
debugger_ = nullptr;

0 commit comments

Comments
 (0)