[kernel] Make snapshotting work.

runtime/vm/clustered_snapshot.cc

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/clustered_snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
@@ skipping 533 matching lines @@
       } else if (s->kind() == Snapshot::kFullJIT) {
         NOT_IN_PRECOMPILED(s->WriteRef(func->ptr()->unoptimized_code_));
         s->WriteRef(func->ptr()->code_);
         s->WriteRef(func->ptr()->ic_data_array_);
       }
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
       if (kind != Snapshot::kFullAOT) {
         s->WriteTokenPosition(func->ptr()->token_pos_);
         s->WriteTokenPosition(func->ptr()->end_token_pos_);
+        s->Write<int32_t>(func->ptr()->kernel_offset_);
       }
 #endif
       s->Write<int16_t>(func->ptr()->num_fixed_parameters_);
       s->Write<int16_t>(func->ptr()->num_optional_parameters_);
       s->Write<uint32_t>(func->ptr()->kind_tag_);
       if (kind == Snapshot::kFullAOT) {
         // Omit fields used to support de/reoptimization.
       } else if (!Snapshot::IncludesCode(kind)) {
 #if !defined(DART_PRECOMPILED_RUNTIME)
         bool is_optimized = Code::IsOptimized(func->ptr()->code_);
@@ skipping 54 matching lines @@
       }
 
 #if defined(DEBUG)
       func->ptr()->entry_point_ = 0;
 #endif
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
       if (kind != Snapshot::kFullAOT) {
         func->ptr()->token_pos_ = d->ReadTokenPosition();
         func->ptr()->end_token_pos_ = d->ReadTokenPosition();
+        func->ptr()->kernel_offset_ = d->Read<int32_t>();
       }
 #endif
       func->ptr()->num_fixed_parameters_ = d->Read<int16_t>();
       func->ptr()->num_optional_parameters_ = d->Read<int16_t>();
       func->ptr()->kind_tag_ = d->Read<uint32_t>();
       if (kind == Snapshot::kFullAOT) {
         // Omit fields used to support de/reoptimization.
       } else {
 #if !defined(DART_PRECOMPILED_RUNTIME)
         if (Snapshot::IncludesCode(kind)) {
@@ skipping 378 matching lines @@
         s->WriteRef(field->ptr()->guarded_list_length_);
       }
       if (kind == Snapshot::kFullJIT) {
         s->WriteRef(field->ptr()->dependent_code_);
       }
 
       if (kind != Snapshot::kFullAOT) {
         s->WriteTokenPosition(field->ptr()->token_pos_);
         s->WriteCid(field->ptr()->guarded_cid_);
         s->WriteCid(field->ptr()->is_nullable_);
+#if !defined(DART_PRECOMPILED_RUNTIME)
+        s->Write<int32_t>(field->ptr()->kernel_offset_);
+#endif
       }
       s->Write<uint8_t>(field->ptr()->kind_bits_);
     }
   }
 
  private:
   GrowableArray<RawField*> objects_;
 };
 #endif  // !DART_PRECOMPILED_RUNTIME
 
@@ skipping 27 matching lines @@
         *p = d->ReadRef();
       }
       for (RawObject** p = to_snapshot + 1; p <= to; p++) {
         *p = Object::null();
       }
 
       if (kind != Snapshot::kFullAOT) {
         field->ptr()->token_pos_ = d->ReadTokenPosition();
         field->ptr()->guarded_cid_ = d->ReadCid();
         field->ptr()->is_nullable_ = d->ReadCid();
+#if !defined(DART_PRECOMPILED_RUNTIME)
+        field->ptr()->kernel_offset_ = d->Read<int32_t>();
+#endif
       }
       field->ptr()->kind_bits_ = d->Read<uint8_t>();
     }
   }
 
   void PostLoad(const Array& refs, Snapshot::Kind kind, Zone* zone) {
     NOT_IN_PRODUCT(TimelineDurationScope tds(
         Thread::Current(), Timeline::GetIsolateStream(), "PostLoadField"));
 
     Field& field = Field::Handle(zone);
@@ skipping 203 matching lines @@
       RawScript* script = objects_[i];
       RawObject** from = script->from();
       RawObject** to = script->to_snapshot(kind);
       for (RawObject** p = from; p <= to; p++) {
         s->WriteRef(*p);
       }
 
       s->Write<int32_t>(script->ptr()->line_offset_);
       s->Write<int32_t>(script->ptr()->col_offset_);
       s->Write<int8_t>(script->ptr()->kind_);
+      s->Write<int32_t>(script->ptr()->kernel_script_index_);
     }
   }
 
  private:
   GrowableArray<RawScript*> objects_;
 };
 #endif  // !DART_PRECOMPILED_RUNTIME
 
 class ScriptDeserializationCluster : public DeserializationCluster {
  public:
@@ skipping 24 matching lines @@
       for (RawObject** p = from; p <= to_snapshot; p++) {
         *p = d->ReadRef();
       }
       for (RawObject** p = to_snapshot + 1; p <= to; p++) {
         *p = Object::null();
       }
 
       script->ptr()->line_offset_ = d->Read<int32_t>();
       script->ptr()->col_offset_ = d->Read<int32_t>();
       script->ptr()->kind_ = d->Read<int8_t>();
+      script->ptr()->kernel_script_index_ = d->Read<int32_t>();
       script->ptr()->load_timestamp_ = 0;
     }
   }
 };
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 class LibrarySerializationCluster : public SerializationCluster {
  public:
   LibrarySerializationCluster() {}
   virtual ~LibrarySerializationCluster() {}
@@ skipping 4181 matching lines @@
     thread_->isolate()->SetupImagePage(data_buffer_,
                                        /* is_executable */ false);
   }
 
   deserializer.ReadIsolateSnapshot(thread_->isolate()->object_store());
 
   return ApiError::null();
 }
 
 }  // namespace dart