First stab at mixins in VM compiler

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 643 matching lines @@
   // The super type of this class, Object type if not explicitly specified.
   RawType* super_type() const { return raw_ptr()->super_type_; }
   void set_super_type(const Type& value) const;
   static intptr_t super_type_offset() {
     return OFFSET_OF(RawClass, super_type_);
   }
 
   // Asserts that the class of the super type has been resolved.
   RawClass* SuperClass() const;
 
+  RawType* mixin() const { return raw_ptr()->mixin_; }
+  void set_mixin(const Type& value) const;
+
   // Interfaces is an array of Types.
   RawArray* interfaces() const { return raw_ptr()->interfaces_; }
   void set_interfaces(const Array& value) const;
   static intptr_t interfaces_offset() {
     return OFFSET_OF(RawClass, interfaces_);
   }
 
   // Returns the list of classes having this class as direct superclass.
   RawGrowableObjectArray* direct_subclasses() const {
     return raw_ptr()->direct_subclasses_;
@@ skipping 516 matching lines @@
       NameVisibility name_visibility) const {
     const bool instantiate = true;
     return BuildSignature(instantiate, name_visibility, instantiator);
   }
 
   // Returns true if the signature of this function is instantiated, i.e. if it
   // does not involve generic parameter types or generic result type.
   bool HasInstantiatedSignature() const;
 
   RawClass* Owner() const;
-
+  RawClass* origin() const;

[siva, 2013/02/13 01:34:37]

Our function naming style seems in consistent. I am wondering if origin and
script need to be Origin and Script (I am not suggesting you rename them in this
CL just noting that we are already inconsistent).

[hausner, 2013/02/13 19:58:14]

I noticed that too. Technically, according to our coding standards, it would
have to be Origin() and Script() since the methods are more than simple
accessors. I never got that rule, since all the advantages of hiding the
implementation details of an accessor are lost if you have to change the
accessor name when the implementation changes. I prefer the lower case versions.

On 2013/02/13 01:34:37, siva wrote:

   RawScript* script() const;
 
   RawAbstractType* result_type() const { return raw_ptr()->result_type_; }
   void set_result_type(const AbstractType& value) const;
 
   RawAbstractType* ParameterTypeAt(intptr_t index) const;
   void SetParameterTypeAt(intptr_t index, const AbstractType& value) const;
+  RawArray* parameter_types() const { return raw_ptr()->parameter_types_; }
   void set_parameter_types(const Array& value) const;
 
   // Parameter names are valid for all valid parameter indices, and are not
   // limited to named optional parameters.
   RawString* ParameterNameAt(intptr_t index) const;
   void SetParameterNameAt(intptr_t index, const String& value) const;
+  RawArray* parameter_names() const { return raw_ptr()->parameter_names_; }
   void set_parameter_names(const Array& value) const;
 
   // Sets function's code and code's function.
   void SetCode(const Code& value) const;
 
   // Disables optimized code and switches to unoptimized code.
   void SwitchToUnoptimizedCode() const;
 
   // Return the most recently compiled and installed code for this function.
   // It is not the only Code object that points to this function.
@@ skipping 53 matching lines @@
   RawFunction::Kind kind() const {
     return KindBits::decode(raw_ptr()->kind_tag_);
   }
 
   bool is_static() const { return StaticBit::decode(raw_ptr()->kind_tag_); }
   bool is_const() const { return ConstBit::decode(raw_ptr()->kind_tag_); }
   bool is_external() const { return ExternalBit::decode(raw_ptr()->kind_tag_); }
   bool IsConstructor() const {
     return (kind() == RawFunction::kConstructor) && !is_static();
   }
+  bool IsImplicitConstructor() const;
   bool IsFactory() const {
     return (kind() == RawFunction::kConstructor) && is_static();
   }
   bool IsDynamicFunction() const {
     if (is_static() || is_abstract()) {
       return false;
     }
     switch (kind()) {
       case RawFunction::kRegularFunction:
       case RawFunction::kGetterFunction:
@@ skipping 257 matching lines @@
                           intptr_t token_pos);
 
   // Allocates a new Function object representing a closure function, as well as
   // a new associated Class object representing the signature class of the
   // function.
   // The function and the class share the same given name.
   static RawFunction* NewClosureFunction(const String& name,
                                          const Function& parent,
                                          intptr_t token_pos);
 
+  // Allocate new function object, clone values from this function. The
+  // owner of the clone is new_owner.
+  RawFunction* Clone(const Class& new_owner) const;
+
   // Slow function, use in asserts to track changes in important library
   // functions.
   int32_t SourceFingerprint() const;
 
   // Return false and report an error if the fingerprint does not match.
   bool CheckSourceFingerprint(intptr_t fp) const;
 
   static const int kCtorPhaseInit = 1 << 0;
   static const int kCtorPhaseBody = 1 << 1;
   static const int kCtorPhaseAll = (kCtorPhaseInit | kCtorPhaseBody);
@@ skipping 142 matching lines @@
   bool is_static() const { return StaticBit::decode(raw_ptr()->kind_bits_); }
   bool is_final() const { return FinalBit::decode(raw_ptr()->kind_bits_); }
   bool is_const() const { return ConstBit::decode(raw_ptr()->kind_bits_); }
 
   inline intptr_t Offset() const;
   inline void SetOffset(intptr_t value_in_bytes) const;
 
   RawInstance* value() const;
   void set_value(const Instance& value) const;
 
-  RawClass* owner() const { return raw_ptr()->owner_; }
+  RawClass* owner() const;
+  RawClass* origin() const;  // Either mixin class, or same as owner().
 
   RawAbstractType* type() const  { return raw_ptr()->type_; }
   void set_type(const AbstractType& value) const;
 
   static intptr_t InstanceSize() {
     return RoundedAllocationSize(sizeof(RawField));
   }
 
   static RawField* New(const String& name,
                        bool is_static,
                        bool is_final,
                        bool is_const,
                        const Class& owner,
                        intptr_t token_pos);
 
+  // Allocate new field object, clone values from this field. The
+  // owner of the clone is new_owner.
+  RawField* Clone(const Class& new_owner) const;
+
   static intptr_t value_offset() { return OFFSET_OF(RawField, value_); }
 
   intptr_t token_pos() const { return raw_ptr()->token_pos_; }
 
   bool has_initializer() const {
     return HasInitializerBit::decode(raw_ptr()->kind_bits_);
   }
   void set_has_initializer(bool has_initializer) const {
     set_kind_bits(HasInitializerBit::update(has_initializer,
                                             raw_ptr()->kind_bits_));
@@ skipping 24 matching lines @@
   void set_name(const String& value) const;
   void set_is_static(bool is_static) const {
     set_kind_bits(StaticBit::update(is_static, raw_ptr()->kind_bits_));
   }
   void set_is_final(bool is_final) const {
     set_kind_bits(FinalBit::update(is_final, raw_ptr()->kind_bits_));
   }
   void set_is_const(bool value) const {
     set_kind_bits(ConstBit::update(value, raw_ptr()->kind_bits_));
   }
-  void set_owner(const Class& value) const {
+  void set_owner(const Object& value) const {
     StorePointer(&raw_ptr()->owner_, value.raw());
   }
   void set_token_pos(intptr_t token_pos) const {
     raw_ptr()->token_pos_ = token_pos;
   }
   void set_kind_bits(intptr_t value) const {
     raw_ptr()->kind_bits_ = static_cast<uint8_t>(value);
   }
   static RawField* New();
 
@@ skipping 4538 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_