Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(713)

Unified Diff: runtime/vm/raw_object_snapshot.cc

Issue 1842853002: VM: Fix --no-use-field-guards. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/jit_optimizer.cc ('k') | tests/corelib/double_parse_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « runtime/vm/jit_optimizer.cc ('k') | tests/corelib/double_parse_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698