Remove parent_level field of function type parameters.

runtime/vm/raw_object.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 RUNTIME_VM_RAW_OBJECT_H_
 #define RUNTIME_VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/atomic.h"
 #include "vm/exceptions.h"
@@ skipping 746 matching lines @@
   RawAbstractType* const* types() const {
     OPEN_ARRAY_START(RawAbstractType*, RawAbstractType*);
   }
   RawAbstractType** types() {
     OPEN_ARRAY_START(RawAbstractType*, RawAbstractType*);
   }
   RawObject** to(intptr_t length) {
     return reinterpret_cast<RawObject**>(&ptr()->types()[length - 1]);
   }
 
+  friend class Object;
   friend class SnapshotReader;
 };
 
 
 class RawPatchClass : public RawObject {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(PatchClass);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->patched_class_);
@@ skipping 954 matching lines @@
   RawString* name_;
   RawSmi* hash_;
   RawAbstractType* bound_;  // ObjectType if no explicit bound specified.
   RawFunction* parameterized_function_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->parameterized_function_);
   }
   classid_t parameterized_class_id_;
   TokenPosition token_pos_;
   int16_t index_;
-  uint8_t parent_level_;  // Max 255 levels of nested generic functions is OK.
   int8_t type_state_;
 
   friend class CidRewriteVisitor;
 };
 
 
 class RawBoundedType : public RawAbstractType {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(BoundedType);
 
@@ skipping 21 matching lines @@
     return reinterpret_cast<RawObject**>(&ptr()->mixin_types_);
   }
 };
 
 
 class RawClosure : public RawInstance {
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(Closure);
 
   RawObject** from() {
-    return reinterpret_cast<RawObject**>(&ptr()->instantiator_);
+    return reinterpret_cast<RawObject**>(&ptr()->instantiator_type_arguments_);
   }
 
   // No instance fields should be declared before the following 3 fields whose
   // offsets must be identical in Dart and C++.
 
-  // These 3 fields are also declared in the Dart source of class _Closure.
-  RawTypeArguments* instantiator_;
+  // These 4 fields are also declared in the Dart source of class _Closure.
+  RawTypeArguments* instantiator_type_arguments_;
+  RawTypeArguments* function_type_arguments_;
   RawFunction* function_;
   RawContext* context_;
 
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->context_); }
 };
 
 
 class RawNumber : public RawInstance {
   RAW_OBJECT_IMPLEMENTATION(Number);
 };
@@ skipping 634 matching lines @@
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_RAW_OBJECT_H_