Index: runtime/vm/raw_object_snapshot.cc |
diff --git a/runtime/vm/raw_object_snapshot.cc b/runtime/vm/raw_object_snapshot.cc |
index 194317f1ed6e52fd1ce29df2617368f7ee50f933..b12e12df0782aeb51c9ea42d2dca03657b145b85 100644 |
--- a/runtime/vm/raw_object_snapshot.cc |
+++ b/runtime/vm/raw_object_snapshot.cc |
@@ -855,8 +855,6 @@ RawField* Field::ReadFrom(SnapshotReader* reader, |
if (reader->snapshot_code()) { |
field.set_token_pos(TokenPosition::kNoSource); |
ASSERT(!FLAG_use_field_guards); |
- field.set_guarded_cid(kDynamicCid); |
- field.set_is_nullable(true); |
} else { |
field.set_token_pos( |
TokenPosition::SnapshotDecode(reader->Read<int32_t>())); |
@@ -873,8 +871,9 @@ RawField* Field::ReadFrom(SnapshotReader* reader, |
field.raw()->from(), toobj, |
kAsReference); |
- if (reader->snapshot_code()) { |
- ASSERT(!FLAG_use_field_guards); |
+ if (!FLAG_use_field_guards) { |
+ field.set_guarded_cid(kDynamicCid); |
+ field.set_is_nullable(true); |
field.set_guarded_list_length(Field::kNoFixedLength); |
field.set_guarded_list_length_in_object_offset(Field::kUnknownLengthOffset); |
} else { |