Skip to content

Commit

Permalink
Fix Dart 2 reload when running from a snapshot instead of platform.di…
Browse files Browse the repository at this point in the history
…ll. (#5792)

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 committed Jul 18, 2018
1 parent 16da471 commit 624cf7e
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions runtime/dart_isolate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,16 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair(
);
}

// 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;
}
flags->use_dart_frontend = true;

// 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 624cf7e

Please sign in to comment.