Mixins with Generics

runtime/vm/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 VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 3725 matching lines @@
   }
   void set_is_being_checked(bool value) const;
 
   static RawBoundedType* New();
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(BoundedType, AbstractType);
   friend class Class;
 };
 
 
+// A MixinAppType represents a mixin application clause, e.g.
+// "S<T> with M<U, N>". The class finalizer builds the type
+// parameters and arguments at finalization time.
+// MixinType objects do not survive finalization, so they do not
+// need to be written to and read from snapshots.
+class MixinAppType : public AbstractType {
+ public:
+  // MixinAppType objects are replaced with their actual finalized type.
+  virtual bool IsFinalized() const { return false; }
+  virtual bool IsMalformed() const { return false; }

[regis, 2013/03/14 23:40:34]

That is optimistic :-)
I would actually leave this call out, and rely on the AbstractType version to
bomb if this is called. We should not call it, since we will never encounter a
MixinAppType in a type test.

[hausner, 2013/03/15 00:36:32]

There is unfortunately code that calls this and bombs if I don't overwrite this
function. Eg, CollectFinalizedSuperClasses()  is a caller.
In a way, a type can't be malformed if it's not resolved yet, so returning false
seems acceptable to me.

+  virtual bool IsResolved() const;

[regis, 2013/03/14 23:40:34]

I would unconditionally return false.

[hausner, 2013/03/15 00:36:32]

Done.

+  virtual bool HasResolvedTypeClass() const { return false; }
+  virtual RawString* Name() const;
+
+  virtual intptr_t token_pos() const {
+    return AbstractType::Handle(super_type()).token_pos();
+  }
+
+  virtual RawAbstractTypeArguments* arguments() const {
+    return AbstractTypeArguments::null();
+  }
+
+  RawAbstractType* super_type() const { return raw_ptr()->super_type_; }
+  RawArray* mixin_types() const { return raw_ptr()->mixin_types_; }
+
+  static intptr_t InstanceSize() {
+    return RoundedAllocationSize(sizeof(RawMixinAppType));
+  }
+
+  static RawMixinAppType* New(const AbstractType& super_type,
+                              const Array& mixin_types);
+
+ private:
+  void set_super_type(const AbstractType& value) const;
+  void set_mixin_types(const Array& value) const;
+
+  static RawMixinAppType* New();
+
+  FINAL_HEAP_OBJECT_IMPLEMENTATION(MixinAppType, AbstractType);
+  friend class Class;
+};
+
+
 class Number : public Instance {
  public:
   // TODO(iposva): Fill in a useful Number interface.
   virtual bool IsZero() const {
     // Number is an abstract class.
     UNREACHABLE();
     return false;
   }
   virtual bool IsNegative() const {
     // Number is an abstract class.
@@ skipping 3077 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_