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

runtime/vm/raw_object.h

Index: runtime/vm/raw_object.h
===================================================================
--- runtime/vm/raw_object.h	(revision 2282)
+++ runtime/vm/raw_object.h	(working copy)
@@ -275,6 +275,14 @@
 
 
 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;
@@ -283,12 +291,6 @@
 
 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() {
@@ -309,6 +311,7 @@
   RawString* name_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   intptr_t index_;
+  int8_t type_state_;
 };
 
 
@@ -328,6 +331,7 @@
 
 
 class RawAbstractTypeArguments : public RawObject {
+ private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(AbstractTypeArguments);
 };