From fc4ab33fc125239e95fdb12ef42bb38d208675c6 Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Wed, 29 Sep 2021 14:41:50 +0000
Subject: [PATCH] [ CLI ] Shutdown DartDev isolate properly when error
 condition encountered

Fixes https://github.com/dart-lang/sdk/issues/45771

TEST=CQ

Change-Id: Id0d706c9c28383fe0395eee5bbe8eeb06a8aed46
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/214343
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Ben Konyi <bkonyi@google.com>
---
 runtime/bin/dartdev_isolate.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/bin/dartdev_isolate.cc b/runtime/bin/dartdev_isolate.cc
index 62701b7e544..0f75c8e1b1a 100644
--- a/runtime/bin/dartdev_isolate.cc
+++ b/runtime/bin/dartdev_isolate.cc
@@ -26,7 +26,7 @@
       Dart_CloseNativePort(send_port_id);                                      \
     }                                                                          \
     Dart_ExitScope();                                                          \
-    Dart_ExitIsolate();                                                        \
+    Dart_ShutdownIsolate();                                                    \
     return;                                                                    \
   }
 
@@ -237,7 +237,7 @@ void DartDevIsolate::DartDevRunner::RunCallback(uword args) {
     ProcessError("Unable to find 'main' in root library 'dartdev'",
                  kErrorExitCode);
     Dart_ExitScope();
-    Dart_ExitIsolate();
+    Dart_ShutdownIsolate();
     return;
   }