Make sure unresolved function type parameter bounds do not end up in snapshot.

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 2705 matching lines @@
     } else {
       objects_.Add(type);
     }
 
     RawObject** from = type->from();
     RawObject** to = type->to();
     for (RawObject** p = from; p <= to; p++) {
       s->Push(*p);
     }
 
+    if (type->ptr()->type_class_id_->IsHeapObject()) {
+      // Type class is still an unresolved class.
+      UNREACHABLE();
+    }
+
     RawSmi* raw_type_class_id = Smi::RawCast(type->ptr()->type_class_id_);
     RawClass* type_class =
         s->isolate()->class_table()->At(Smi::Value(raw_type_class_id));
     s->Push(type_class);
   }
 
   void WriteAlloc(Serializer* s) {
     s->WriteCid(kTypeCid);
     intptr_t count = canonical_objects_.length();
     s->Write<int32_t>(count);
@@ skipping 211 matching lines @@
     for (intptr_t i = 0; i < count; i++) {
       RawTypeParameter* type = objects_[i];
       RawObject** from = type->from();
       RawObject** to = type->to();
       for (RawObject** p = from; p <= to; p++) {
         s->WriteRef(*p);
       }
       s->Write<int32_t>(type->ptr()->parameterized_class_id_);
       s->WriteTokenPosition(type->ptr()->token_pos_);
       s->Write<int16_t>(type->ptr()->index_);
+      s->Write<uint8_t>(type->ptr()->parent_level_);
       s->Write<int8_t>(type->ptr()->type_state_);
     }
   }
 
  private:
   GrowableArray<RawTypeParameter*> objects_;
 };
 #endif  // !DART_PRECOMPILED_RUNTIME
 
 
@@ skipping 22 matching lines @@
                                      TypeParameter::InstanceSize(),
                                      is_vm_object);
       RawObject** from = type->from();
       RawObject** to = type->to();
       for (RawObject** p = from; p <= to; p++) {
         *p = d->ReadRef();
       }
       type->ptr()->parameterized_class_id_ = d->Read<int32_t>();
       type->ptr()->token_pos_ = d->ReadTokenPosition();
       type->ptr()->index_ = d->Read<int16_t>();
+      type->ptr()->parent_level_ = d->Read<uint8_t>();
       type->ptr()->type_state_ = d->Read<int8_t>();
     }
   }
 };
 
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 class BoundedTypeSerializationCluster : public SerializationCluster {
  public:
   BoundedTypeSerializationCluster() { }
@@ skipping 2111 matching lines @@
 
   deserializer.ReadVMSnapshot();
 
   Dart::set_instructions_snapshot_buffer(instructions_buffer_);
   Dart::set_data_snapshot_buffer(data_buffer_);
 
   return ApiError::null();
 }
 
 }  // namespace dart