Index: runtime/vm/dart.cc |
diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc |
index 47b4221fda26c4d284c1c24613288ef790e5c383..696d735334134d143d8c2ff14ecdc15b20718ffd 100644 |
--- a/runtime/vm/dart.cc |
+++ b/runtime/vm/dart.cc |
@@ -215,7 +215,7 @@ char* Dart::InitOnce(const uint8_t* vm_isolate_snapshot, |
vm_snapshot_kind_ = snapshot->kind(); |
if (Snapshot::IncludesCode(vm_snapshot_kind_)) { |
- if (vm_snapshot_kind_ == Snapshot::kAppAOT) { |
+ if (vm_snapshot_kind_ == Snapshot::kFullAOT) { |
#if defined(DART_PRECOMPILED_RUNTIME) |
vm_isolate_->set_compilation_allowed(false); |
if (!FLAG_precompiled_runtime) { |
@@ -510,7 +510,7 @@ Isolate* Dart::CreateIsolate(const char* name_prefix, |
static bool IsSnapshotCompatible(Snapshot::Kind vm_kind, |
Snapshot::Kind isolate_kind) { |
if (vm_kind == isolate_kind) return true; |
- if (vm_kind == Snapshot::kCore && isolate_kind == Snapshot::kAppJIT) |
+ if (vm_kind == Snapshot::kFull && isolate_kind == Snapshot::kFullJIT) |
return true; |
return Snapshot::IsFull(isolate_kind); |
} |
@@ -674,7 +674,16 @@ const char* Dart::FeaturesString(Isolate* isolate, Snapshot::Kind kind) { |
const bool name = (isolate != NULL) ? isolate->name() : flag; \ |
buffer.AddString(name ? (" " #name) : (" no-" #name)); \ |
} while (0); |
- ISOLATE_FLAG_LIST(ADD_FLAG); |
+ ADD_FLAG(type_checks, enable_type_checks, FLAG_enable_type_checks); |
+ ADD_FLAG(asserts, enable_asserts, FLAG_enable_asserts); |
+ ADD_FLAG(error_on_bad_type, enable_error_on_bad_type, |
+ FLAG_error_on_bad_type); |
+ ADD_FLAG(error_on_bad_override, enable_error_on_bad_override, |
+ FLAG_error_on_bad_override); |
+ if (kind == Snapshot::kFullJIT) { |
+ ADD_FLAG(use_field_guards, use_field_guards, FLAG_use_field_guards); |
+ ADD_FLAG(use_osr, use_osr, FLAG_use_osr); |
+ } |
#undef ADD_FLAG |
// Generated code must match the host architecture and ABI. |