Implement eager instantiation and canonicalization of type arguments at run

runtime/vm/snapshot.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_SNAPSHOT_H_
 #define VM_SNAPSHOT_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/bitfield.h"
 #include "vm/datastream.h"
 #include "vm/exceptions.h"
 #include "vm/globals.h"
 #include "vm/growable_array.h"
 #include "vm/isolate.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 // Forward declarations.
 class AbstractType;
-class AbstractTypeArguments;
 class Array;
 class Class;
 class ClassTable;
 class ExternalTypedData;
 class GrowableObjectArray;
 class Heap;
 class LanguageError;
 class Library;
 class Object;
 class ObjectStore;
-class RawAbstractTypeArguments;
 class RawApiError;
 class RawArray;
 class RawBigint;
 class RawBoundedType;
 class RawMixinAppType;
 class RawClass;
 class RawContext;
 class RawDouble;
 class RawField;
 class RawClosureData;
@@ skipping 18 matching lines @@
 class RawStacktrace;
 class RawTokenStream;
 class RawType;
 class RawTypeRef;
 class RawTypeParameter;
 class RawTypeArguments;
 class RawTwoByteString;
 class RawUnresolvedClass;
 class String;
 class TokenStream;
+class TypeArguments;
 class UnhandledException;
 
 // Serialized object header encoding is as follows:
 // - Smi: the Smi value is written as is (last bit is not tagged).
 // - VM object (from VM isolate): (object id in vm isolate | 0x3)
 //   This valus is serialized as a negative number.
 //   (note VM objects are never serialized they are expected to be found
 //    using ths unique ID assigned to them).
 // - Reference to object that has already been written: (object id | 0x3)
 //   This valus is serialized as a positive number.
@@ skipping 135 matching lines @@
                  Isolate* isolate);
   ~SnapshotReader() { }
 
   Isolate* isolate() const { return isolate_; }
   Heap* heap() const { return isolate_->heap(); }
   ObjectStore* object_store() const { return isolate_->object_store(); }
   ClassTable* class_table() const { return isolate_->class_table(); }
   Object* ObjectHandle() { return &obj_; }
   String* StringHandle() { return &str_; }
   AbstractType* TypeHandle() { return &type_; }
-  AbstractTypeArguments* TypeArgumentsHandle() { return &type_arguments_; }
+  TypeArguments* TypeArgumentsHandle() { return &type_arguments_; }
   Array* TokensHandle() { return &tokens_; }
   TokenStream* StreamHandle() { return &stream_; }
   ExternalTypedData* DataHandle() { return &data_; }
   UnhandledException* ErrorHandle() { return &error_; }
 
   // Reads an object.
   RawObject* ReadObject();
 
   // Add object to backward references.
   void AddBackRef(intptr_t id, Object* obj, DeserializeState state);
@@ skipping 85 matching lines @@
 
   Snapshot::Kind kind_;  // Indicates type of snapshot(full, script, message).
   Isolate* isolate_;  // Current isolate.
   Class& cls_;  // Temporary Class handle.
   Object& obj_;  // Temporary Object handle.
   Array& array_;  // Temporary Array handle.
   Field& field_;  // Temporary Field handle.
   String& str_;  // Temporary String handle.
   Library& library_;  // Temporary library handle.
   AbstractType& type_;  // Temporary type handle.
-  AbstractTypeArguments& type_arguments_;  // Temporary type argument handle.
+  TypeArguments& type_arguments_;  // Temporary type argument handle.
   Array& tokens_;  // Temporary tokens handle.
   TokenStream& stream_;  // Temporary token stream handle.
   ExternalTypedData& data_;  // Temporary stream data handle.
   UnhandledException& error_;  // Error handle.
   GrowableArray<BackRefNode*> backward_references_;
 
   friend class ApiError;
   friend class Array;
   friend class BoundedType;
   friend class MixinAppType;
   friend class Class;
   friend class Context;
   friend class ContextScope;
   friend class Field;
   friend class ClosureData;
   friend class RedirectionData;
   friend class Function;
   friend class GrowableObjectArray;
   friend class ImmutableArray;
-  friend class InstantiatedTypeArguments;
   friend class JSRegExp;
   friend class LanguageError;
   friend class Library;
   friend class LibraryPrefix;
   friend class Namespace;
   friend class LiteralToken;
   friend class PatchClass;
   friend class Script;
   friend class Stacktrace;
   friend class TokenStream;
@@ skipping 139 matching lines @@
 
   void WriteObjectRef(RawObject* raw);
   void WriteClassId(RawClass* cls);
   void WriteObjectImpl(RawObject* raw);
   void WriteInlinedObject(RawObject* raw);
   void WriteForwardedObjects();
   void ArrayWriteTo(intptr_t object_id,
                     intptr_t array_kind,
                     intptr_t tags,
                     RawSmi* length,
-                    RawAbstractTypeArguments* type_arguments,
+                    RawTypeArguments* type_arguments,
                     RawObject* data[]);
   void CheckIfSerializable(RawClass* cls);
   void SetWriteException(Exceptions::ExceptionType type, const char* msg);
   void WriteInstance(intptr_t object_id,
                      RawObject* raw,
                      RawClass* cls,
                      intptr_t tags);
   void WriteInstanceRef(RawObject* raw, RawClass* cls);
 
   ObjectStore* object_store() const { return object_store_; }
@@ skipping 96 matching lines @@
  private:
   SnapshotWriter* writer_;
   bool as_references_;
 
   DISALLOW_COPY_AND_ASSIGN(SnapshotWriterVisitor);
 };
 
 }  // namespace dart
 
 #endif  // VM_SNAPSHOT_H_