Index: runtime/vm/dart.cc |
diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc |
index 83b1055b308621580006287e09e58a33d60212dd..7b1be662e0f0b399c4837556c4bc0fcbede894a8 100644 |
--- a/runtime/vm/dart.cc |
+++ b/runtime/vm/dart.cc |
@@ -653,7 +653,7 @@ RawError* Dart::InitializeIsolate(const uint8_t* snapshot_data, |
} |
-const char* Dart::FeaturesString(Snapshot::Kind kind) { |
+const char* Dart::FeaturesString(Isolate* isolate, Snapshot::Kind kind) { |
TextBuffer buffer(64); |
// Different fields are included for DEBUG/RELEASE/PRODUCT. |
@@ -667,9 +667,12 @@ const char* Dart::FeaturesString(Snapshot::Kind kind) { |
if (Snapshot::IncludesCode(kind)) { |
// Checked mode affects deopt ids. |
- buffer.AddString(FLAG_enable_asserts ? " asserts" : " no-asserts"); |
- buffer.AddString(FLAG_enable_type_checks ? " type-checks" |
- : " no-type-checks"); |
+ const bool asserts = |
+ (isolate != NULL) ? isolate->asserts() : FLAG_enable_asserts; |
+ const bool type_checks = |
+ (isolate != NULL) ? isolate->type_checks() : FLAG_enable_type_checks; |
+ buffer.AddString(asserts ? " asserts" : " no-asserts"); |
+ buffer.AddString(type_checks ? " type-checks" : " no-type-checks"); |
// Generated code must match the host architecture and ABI. |
#if defined(TARGET_ARCH_ARM) |