Index: runtime/vm/raw_object_snapshot.cc |
diff --git a/runtime/vm/raw_object_snapshot.cc b/runtime/vm/raw_object_snapshot.cc |
index 13791de86ce08e556787214d9f9775b80492b2a0..f9c71333be68a0bddd928a28d7d56f7cd053400d 100644 |
--- a/runtime/vm/raw_object_snapshot.cc |
+++ b/runtime/vm/raw_object_snapshot.cc |
@@ -681,7 +681,7 @@ void RawFunction::WriteTo(SnapshotWriter* writer, |
// Write out all the non object fields. |
writer->Write<int32_t>(ptr()->token_pos_); |
writer->Write<int32_t>(ptr()->end_token_pos_); |
- if (Code::IsOptimized(ptr()->instructions_->ptr()->code_)) { |
+ if (Code::IsOptimized(ptr()->code_)) { |
writer->Write<int32_t>(FLAG_optimization_counter_threshold); |
} else { |
writer->Write<int32_t>(0); |
@@ -1151,8 +1151,6 @@ RawCode* Code::ReadFrom(SnapshotReader* reader, |
result.set_compile_timestamp(reader->Read<int64_t>()); |
result.set_state_bits(reader->Read<int32_t>()); |
- result.set_entry_patch_pc_offset(reader->Read<int32_t>()); |
- result.set_patch_code_pc_offset(reader->Read<int32_t>()); |
result.set_lazy_deopt_pc_offset(reader->Read<int32_t>()); |
// Set all the object fields. |
@@ -1189,8 +1187,6 @@ void RawCode::WriteTo(SnapshotWriter* writer, |
// Write out all the non object fields. |
writer->Write<int64_t>(ptr()->compile_timestamp_); |
writer->Write<int32_t>(ptr()->state_bits_); |
- writer->Write<int32_t>(ptr()->entry_patch_pc_offset_); |
- writer->Write<int32_t>(ptr()->patch_code_pc_offset_); |
writer->Write<int32_t>(ptr()->lazy_deopt_pc_offset_); |
// Write out all the object pointer fields. |
@@ -1247,12 +1243,6 @@ void RawInstructions::WriteTo(SnapshotWriter* writer, |
ptr()->tags_ = object_tags; |
writer->Write<int32_t>(writer->GetInstructionsId(this)); |
ptr()->tags_ = snapshot_tags; |
- |
- { |
- // TODO(rmacnak): Drop after calling convention change. |
- writer->WriteObjectImpl(ptr()->code_, kAsReference); |
- writer->WriteObjectImpl(ptr()->object_pool_, kAsReference); |
- } |
} |