| Index: runtime/vm/isolate.cc
|
| diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
|
| index b18b50c6017f12a4be4c65707deb0e8112b1ee64..b5bbdf602bc597f9ac2c12847bf59f2696da2b40 100644
|
| --- a/runtime/vm/isolate.cc
|
| +++ b/runtime/vm/isolate.cc
|
| @@ -1658,6 +1658,9 @@ void Isolate::Shutdown() {
|
| }
|
| #endif // DEBUG
|
|
|
| + // Wait until all background compilation has finished.
|
| + BackgroundCompiler::Stop(background_compiler_);
|
| +
|
| Thread* thread = Thread::Current();
|
|
|
| // First, perform higher-level cleanup that may need to allocate.
|
| @@ -1706,8 +1709,6 @@ void Isolate::Shutdown() {
|
| }
|
| #endif
|
|
|
| - BackgroundCompiler::Stop(background_compiler_);
|
| -
|
| // TODO(5411455): For now just make sure there are no current isolates
|
| // as we are shutting down the isolate.
|
| Thread::ExitIsolate();
|
|
|