Skip to content

Commit

Permalink
Reapply "Fix Dart 2 reload when running from a snapshot instead of pl…
Browse files Browse the repository at this point in the history
…atform.dill." (flutter#5830)

Without this flag, the VM will attempt to interpret a kernel file as source code.

Affects Fuchsia (FL-71) and code-push.
  • Loading branch information
rmacnak-google authored Jul 23, 2018
1 parent 0bad812 commit 244ebd6
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions runtime/dart_isolate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,20 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair(
(*raw_embedder_isolate)->child_isolate_preparer_));
}

// TODO(rmacnak): This flag setting business preserves a side effect of using
// Dart_CreateIsolateFromKernel. It should be removed when some of the
// internal logic in reload no longer uses this flag.
Dart_IsolateFlags nonnull_flags;
if (flags == nullptr) {
Dart_IsolateFlagsInitialize(&nonnull_flags);
flags = &nonnull_flags;
}
bool dart2 = (vm->GetPlatformKernel().GetSize() > 0) ||
Dart_IsDart2Snapshot(embedder_isolate->GetIsolateSnapshot()
->GetData()
->GetSnapshotPointer());
flags->use_dart_frontend = dart2;

// Create the Dart VM isolate and give it the embedder object as the baton.
Dart_Isolate isolate =
(vm->GetPlatformKernel().GetSize() > 0)
Expand Down

0 comments on commit 244ebd6

Please sign in to comment.