| Index: runtime/vm/dart.cc
|
| diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc
|
| index 0bd87305473461b7073aafd2b39fd238851b100f..9c4ac8359bb3345f2eb84014bafdd81865a20486 100644
|
| --- a/runtime/vm/dart.cc
|
| +++ b/runtime/vm/dart.cc
|
| @@ -669,6 +669,8 @@ const char* Dart::FeaturesString(Snapshot::Kind kind) {
|
| void Dart::RunShutdownCallback() {
|
| Isolate* isolate = Isolate::Current();
|
| void* callback_data = isolate->init_callback_data();
|
| + // Clear the data from the isolate so future accesses will see NULL.
|
| + isolate->set_init_callback_data(NULL);
|
| Dart_IsolateShutdownCallback callback = Isolate::ShutdownCallback();
|
| if (callback != NULL) {
|
| (callback)(callback_data);
|
|
|