Add support for converted closures with explicit contexts to VM

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 RUNTIME_VM_OBJECT_H_
 #define RUNTIME_VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 481 matching lines @@
     return *vm_isolate_snapshot_object_table_;
   }
   static const Type& dynamic_type() {
     ASSERT(dynamic_type_ != NULL);
     return *dynamic_type_;
   }
   static const Type& void_type() {
     ASSERT(void_type_ != NULL);
     return *void_type_;
   }
+  static const Type& vector_type() {
+    ASSERT(vector_type_ != NULL);
+    return *vector_type_;
+  }
 
   static void set_vm_isolate_snapshot_object_table(const Array& table);
 
   static RawClass* class_class() { return class_class_; }
   static RawClass* dynamic_class() { return dynamic_class_; }
   static RawClass* void_class() { return void_class_; }
   static RawClass* unresolved_class_class() { return unresolved_class_class_; }
   static RawClass* type_arguments_class() { return type_arguments_class_; }
   static RawClass* patch_class_class() { return patch_class_class_; }
   static RawClass* function_class() { return function_class_; }
@@ skipping 244 matching lines @@
   static cpp_vtable handle_vtable_;
   static cpp_vtable builtin_vtables_[kNumPredefinedCids];
 
   // The static values below are singletons shared between the different
   // isolates. They are all allocated in the non-GC'd Dart::vm_isolate_.
   static RawObject* null_;
 
   static RawClass* class_class_;             // Class of the Class vm object.
   static RawClass* dynamic_class_;           // Class of the 'dynamic' type.
   static RawClass* void_class_;              // Class of the 'void' type.
+  static RawClass* vector_class_;            // Class of the 'vector' type.
   static RawClass* unresolved_class_class_;  // Class of UnresolvedClass.
   static RawClass* type_arguments_class_;  // Class of TypeArguments vm object.
   static RawClass* patch_class_class_;     // Class of the PatchClass vm object.
   static RawClass* function_class_;        // Class of the Function vm object.
   static RawClass* closure_data_class_;    // Class of ClosureData vm obj.
   static RawClass* signature_data_class_;  // Class of SignatureData vm obj.
   static RawClass* redirection_data_class_;  // Class of RedirectionData vm obj.
   static RawClass* field_class_;             // Class of the Field vm object.
   static RawClass* literal_token_class_;     // Class of LiteralToken vm object.
   static RawClass* token_stream_class_;  // Class of the TokenStream vm object.
@@ skipping 46 matching lines @@
   static Bool* bool_true_;
   static Bool* bool_false_;
   static Smi* smi_illegal_cid_;
   static LanguageError* snapshot_writer_error_;
   static LanguageError* branch_offset_error_;
   static LanguageError* speculative_inlining_error_;
   static LanguageError* background_compilation_error_;
   static Array* vm_isolate_snapshot_object_table_;
   static Type* dynamic_type_;
   static Type* void_type_;
+  static Type* vector_type_;
 
   friend void ClassTable::Register(const Class& cls);
   friend void RawObject::Validate(Isolate* isolate) const;
   friend class Closure;
   friend class SnapshotReader;
   friend class InstanceDeserializationCluster;
   friend class OneByteString;
   friend class TwoByteString;
   friend class ExternalOneByteString;
   friend class ExternalTwoByteString;
@@ skipping 724 matching lines @@
 
   static RawUnresolvedClass* New();
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(UnresolvedClass, Object);
   friend class Class;
 };
 
 
 // Classification of type genericity according to type parameter owners.
 enum Genericity {
-  kAny,              // Consider type params of current class and functions.
-  kCurrentClass,     // Consider type params of current class only.
-  kFunctions,        // Consider type params of current and parent functions.
+  kAny,           // Consider type params of current class and functions.
+  kCurrentClass,  // Consider type params of current class only.
+  kFunctions,     // Consider type params of current and parent functions.
 };
 
 
 // A TypeArguments is an array of AbstractType.
 class TypeArguments : public Object {
  public:
   // We use 30 bits for the hash code so hashes in a snapshot taken on a
   // 64-bit architecture stay in Smi range when loaded on a 32-bit
   // architecture.
   static const intptr_t kHashBits = 30;
@@ skipping 799 matching lines @@
   bool IsInvokeFieldDispatcher() const {
     return kind() == RawFunction::kInvokeFieldDispatcher;
   }
 
   // Returns true iff an implicit closure function has been created
   // for this function.
   bool HasImplicitClosureFunction() const {
     return implicit_closure_function() != null();
   }
 
+  // Returns true iff a converted closure function has been created
+  // for this function.
+  bool HasConvertedClosureFunction() const {
+    return converted_closure_function() != null();
+  }
+
   // Return the closure function implicitly created for this function.
   // If none exists yet, create one and remember it.
   RawFunction* ImplicitClosureFunction() const;
   void DropUncompiledImplicitClosureFunction() const;
 
+  // Return the converted closure function created for this function.

[kustermann, 2017/06/20 12:13:14]

s/Return/Returns/

also above in the old code.

[Dmitry Stefantsov, 2017/06/22 14:12:52]

Thanks!  Fixed.

+  // If none exists yet, create one and remember it.
+  RawFunction* ConvertedClosureFunction() const;
+  void DropUncompiledConvertedClosureFunction() const;

[kustermann, 2017/06/20 12:13:14]

A reader of this could would be very curious what the difference between a
"implicit closure function" and a "converted closure function" is.

Consider adding a length comment somewhere explaining the difference (or add a
pointer to look where to find the documentation)

[Dmitry Stefantsov, 2017/06/22 14:12:52]

I think the comment on `Function::ConvertedClosureFunction` in
runtime/vm/object.cc partially explains the difference.  I'll put a reference to
it here.  I also added a comment above, for `ImplicitClosureFunction` stating
that it is used for tear-offs.

+
   // Return the closure implicitly created for this function.
   // If none exists yet, create one and remember it.
   RawInstance* ImplicitStaticClosure() const;
 
   RawInstance* ImplicitInstanceClosure(const Instance& receiver) const;
 
   RawSmi* GetClosureHashCode() const;
 
   // Redirection information for a redirecting factory.
   bool IsRedirectingFactory() const;
@@ skipping 340 matching lines @@
   }
 
   // Returns true if this function represents a generated irregexp function.
   bool IsIrregexpFunction() const {
     return kind() == RawFunction::kIrregexpFunction;
   }
 
   // Returns true if this function represents an implicit closure function.
   bool IsImplicitClosureFunction() const;
 
+  // Returns true if this function represents a converted closure function.
+  bool IsConvertedClosureFunction() const {
+    return kind() == RawFunction::kConvertedClosureFunction;
+  }
+
   // Returns true if this function represents a non implicit closure function.
   bool IsNonImplicitClosureFunction() const {
     return IsClosureFunction() && !IsImplicitClosureFunction();
   }
 
   // Returns true if this function represents an implicit static closure
   // function.
   bool IsImplicitStaticClosureFunction() const {
     return is_static() && IsImplicitClosureFunction();
   }
@@ skipping 72 matching lines @@
                           bool is_native,
                           const Object& owner,
                           TokenPosition token_pos,
                           Heap::Space space = Heap::kOld);
 
   // Allocates a new Function object representing a closure function.
   static RawFunction* NewClosureFunction(const String& name,
                                          const Function& parent,
                                          TokenPosition token_pos);
 
+  // Allocates a new Function object representing a converted closure function.
+  static RawFunction* NewConvertedClosureFunction(const String& name,
+                                                  const Function& parent,
+                                                  TokenPosition token_pos);
+
   // Allocates a new Function object representing a signature function.
   // The owner is the scope class of the function type.
   static RawFunction* NewSignatureFunction(const Object& owner,
                                            TokenPosition token_pos,
                                            Heap::Space space = Heap::kOld);
 
   static RawFunction* NewEvalFunction(const Class& owner,
                                       const Script& script,
                                       bool is_static);
 
@@ skipping 141 matching lines @@
   class name##Bit : public BitField<uint32_t, bool, k##name##Bit, 1> {};
   FOR_EACH_FUNCTION_KIND_BIT(DEFINE_BIT)
 #undef DEFINE_BIT
 
   void set_name(const String& value) const;
   void set_kind(RawFunction::Kind value) const;
   void set_parent_function(const Function& value) const;
   void set_owner(const Object& value) const;
   RawFunction* implicit_closure_function() const;
   void set_implicit_closure_function(const Function& value) const;
+  RawFunction* converted_closure_function() const;
+  void set_converted_closure_function(const Function& value) const;
   RawInstance* implicit_static_closure() const;
   void set_implicit_static_closure(const Instance& closure) const;
   RawScript* eval_script() const;
   void set_eval_script(const Script& value) const;
   void set_num_optional_parameters(intptr_t value) const;  // Encoded value.
   void set_kind_tag(uint32_t value) const;
   void set_data(const Object& value) const;
 
   static RawFunction* New(Heap::Space space = Heap::kOld);
 
@@ skipping 2073 matching lines @@
   // only be created using the Code::FinalizeCode method. This method creates
   // the RawInstruction and RawCode objects, sets up the pointer offsets
   // and links the two in a GC safe manner.
   static RawCode* New(intptr_t pointer_offsets_length);
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(Code, Object);
   friend class Class;
   friend class SnapshotWriter;
   friend class FunctionSerializationCluster;
   friend class CodeSerializationCluster;
-  friend class CodePatcher;  // for set_instructions
+  friend class CodePatcher;     // for set_instructions
   friend class ProgramVisitor;  // for set_instructions
   // So that the RawFunction pointer visitor can determine whether code the
   // function points to is optimized.
   friend class RawFunction;
 };
 
 
 class Context : public Object {
  public:
   RawContext* parent() const { return raw_ptr()->parent_; }
@@ skipping 3947 matching lines @@
 
 inline void TypeArguments::SetHash(intptr_t value) const {
   // This is only safe because we create a new Smi, which does not cause
   // heap allocation.
   StoreSmi(&raw_ptr()->hash_, Smi::New(value));
 }
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_OBJECT_H_