[VM generic function reification] Support generic functions in Invocation class.

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"
 #include "vm/globals.h"
 #include "vm/snapshot.h"
 #include "vm/token.h"
 #include "vm/token_position.h"
 
 namespace dart {
 
 // Macrobatics to define the Object hierarchy of VM implementation classes.
 #define CLASS_LIST_NO_OBJECT_NOR_STRING_NOR_ARRAY(V)                           \
   V(Class)                                                                     \
   V(UnresolvedClass)                                                           \
   V(TypeArguments)                                                             \

[rmacnak, 2017/08/28 18:29:46]

This should appear after Instance to maintain the invariant that
obj.IsInstance() iff obj.cid() >= kInstanceCid. I suspect this will mean more
special cases elsewhere.

[regis, 2017/08/28 23:32:08]

Done.
This required indeed the addition of many special cases. I guess the code is
cleaner now.

   V(PatchClass)                                                                \
   V(Function)                                                                  \
   V(ClosureData)                                                               \
   V(SignatureData)                                                             \
   V(RedirectionData)                                                           \
   V(Field)                                                                     \
   V(LiteralToken)                                                              \
   V(TokenStream)                                                               \
   V(Script)                                                                    \
   V(Library)                                                                   \
@@ skipping 742 matching lines @@
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->library_or_library_prefix_);
   }
   RawObject* library_or_library_prefix_;  // Library or library prefix qualifier
                                           // for the ident.
   RawString* ident_;                      // Name of the unresolved identifier.
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->ident_); }
   TokenPosition token_pos_;
 };
 
-class RawTypeArguments : public RawObject {
- private:
-  RAW_HEAP_OBJECT_IMPLEMENTATION(TypeArguments);
-
-  RawObject** from() {
-    return reinterpret_cast<RawObject**>(&ptr()->instantiations_);
-  }
-  // The instantiations_ array remains empty for instantiated type arguments.
-  RawArray* instantiations_;  // Array of paired canonical vectors:
-                              // Even index: instantiator.
-                              // Odd index: instantiated (without bound error).
-  // Instantiations leading to bound errors do not get cached.
-  RawSmi* length_;
-
-  RawSmi* hash_;
-
-  // Variable length data follows here.
-  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_);
   }
   RawClass* patched_class_;
   RawClass* origin_class_;
   RawScript* script_;
@@ skipping 859 matching lines @@
         break;
     }
     UNREACHABLE();
     return NULL;
   }
   uint16_t num_imports_;  // Number of library entries in libraries_.
   bool is_deferred_load_;
   bool is_loaded_;
 };
 
+class RawTypeArguments : public RawInstance {
+ private:
+  RAW_HEAP_OBJECT_IMPLEMENTATION(TypeArguments);
+
+  RawObject** from() {
+    return reinterpret_cast<RawObject**>(&ptr()->instantiations_);
+  }
+  // The instantiations_ array remains empty for instantiated type arguments.
+  RawArray* instantiations_;  // Array of paired canonical vectors:
+                              // Even index: instantiator.
+                              // Odd index: instantiated (without bound error).
+  // Instantiations leading to bound errors do not get cached.
+  RawSmi* length_;
+
+  RawSmi* hash_;
+
+  // Variable length data follows here.
+  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 RawAbstractType : public RawInstance {
  protected:
   enum TypeState {
     kAllocated,                // Initial state.
     kResolved,                 // Type class and type arguments resolved.
     kBeingFinalized,           // In the process of being finalized.
     kFinalizedInstantiated,    // Instantiated type ready for use.
     kFinalizedUninstantiated,  // Uninstantiated type ready for use.
   };
 
@@ skipping 735 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_