Adjust index of type parameters at finalization time (fix issue 718).

runtime/vm/raw_object.h

 // Copyright (c) 2011, 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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "vm/assert.h"
 #include "vm/globals.h"
 #include "vm/snapshot.h"
@@ skipping 257 matching lines @@
   RawString* ident_;  // Name of the unresolved identifier.
   RawClass* factory_signature_class_;  // Expected type parameters for factory.
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->factory_signature_class_);
   }
   intptr_t token_index_;
 };
 
 
 class RawAbstractType : public RawObject {
+ protected:
+  enum TypeState {
+    kAllocated,  // Initial state.
+    kBeingFinalized,  // In the process of being finalized.
+    kFinalized,  // Type ready for use.
+  };
+
+ private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(AbstractType);
 
   friend class ObjectStore;
 };
 
 
 class RawType : public RawAbstractType {
  private:
-  enum TypeState {
-    kAllocated,  // Initial state.
-    kBeingFinalized,  // In the process of being finalized.
-    kFinalized,  // Type ready for use.
-  };
-
   RAW_HEAP_OBJECT_IMPLEMENTATION(Type);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->type_class_);
   }
   RawObject* type_class_;  // Either resolved class or unresolved class.
   RawAbstractTypeArguments* arguments_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->arguments_); }
   int8_t type_state_;
 };
 
 
 class RawTypeParameter : public RawAbstractType {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(TypeParameter);
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   RawString* name_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   intptr_t index_;
+  int8_t type_state_;
 };
 
 
 class RawInstantiatedType : public RawAbstractType {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(InstantiatedType);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->uninstantiated_type_);
   }
   RawAbstractType* uninstantiated_type_;
   RawAbstractTypeArguments* instantiator_type_arguments_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->instantiator_type_arguments_);
   }
 };
 
 
 class RawAbstractTypeArguments : public RawObject {
+ private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(AbstractTypeArguments);
 };
 
 
 class RawTypeArguments : public RawAbstractTypeArguments {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(TypeArguments);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->length_);
@@ skipping 517 matching lines @@
   intptr_t type_;  // Uninitialized, simple or complex.
   intptr_t flags_;  // Represents global/local, case insensitive, multiline.
 
   // Variable length data follows here.
   uint8_t data_[0];
 };
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_