Allow signature functions to be allocated in new space.

runtime/vm/object.cc

 // 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.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/become.h"
@@ skipping 6458 matching lines @@
   return true;
 }
 
 
 RawFunction* Function::InstantiateSignatureFrom(
     const TypeArguments& instantiator_type_arguments,
     const TypeArguments& function_type_arguments,
     Heap::Space space) const {
   Zone* zone = Thread::Current()->zone();
   const Object& owner = Object::Handle(zone, RawOwner());
-  // TODO(regis): Should we change Function::New() to accept a space, since
-  // InstantiateFrom is sometimes called with Heap::kNew?
   ASSERT(!HasInstantiatedSignature());
   Function& sig = Function::Handle(
-      zone, Function::NewSignatureFunction(owner, TokenPosition::kNoSource));
+      zone,
+      Function::NewSignatureFunction(owner, TokenPosition::kNoSource, space));
+  // TODO(regis): If type parameter bounds are not IsInstantiated(kFunctions),
+  // clone finalized type parameters and instantiate bounds.
   sig.set_type_parameters(TypeArguments::Handle(zone, type_parameters()));
   AbstractType& type = AbstractType::Handle(zone, result_type());
   if (!type.IsInstantiated()) {
     type =
         type.InstantiateFrom(instantiator_type_arguments,
                              function_type_arguments, NULL, NULL, NULL, space);
   }
   sig.set_result_type(type);
   const intptr_t num_params = NumParameters();
   sig.set_num_fixed_parameters(num_fixed_parameters());
@@ skipping 181 matching lines @@
   return (parent_function->ptr()->data_ == reinterpret_cast<RawObject*>(func));
 }
 
 
 bool Function::IsConstructorClosureFunction() const {
   return IsClosureFunction() &&
          String::Handle(name()).StartsWith(Symbols::ConstructorClosurePrefix());
 }
 
 
-RawFunction* Function::New() {
+RawFunction* Function::New(Heap::Space space) {
   ASSERT(Object::function_class() != Class::null());
-  RawObject* raw = Object::Allocate(Function::kClassId,
-                                    Function::InstanceSize(), Heap::kOld);
+  RawObject* raw =
+      Object::Allocate(Function::kClassId, Function::InstanceSize(), space);
   return reinterpret_cast<RawFunction*>(raw);
 }
 
 
 RawFunction* Function::New(const String& name,
                            RawFunction::Kind kind,
                            bool is_static,
                            bool is_const,
                            bool is_abstract,
                            bool is_external,
                            bool is_native,
                            const Object& owner,
-                           TokenPosition token_pos) {
+                           TokenPosition token_pos,
+                           Heap::Space space) {
   ASSERT(!owner.IsNull() || (kind == RawFunction::kSignatureFunction));
-  const Function& result = Function::Handle(Function::New());
+  const Function& result = Function::Handle(Function::New(space));
   result.set_parameter_types(Object::empty_array());
   result.set_parameter_names(Object::empty_array());
   result.set_name(name);
   result.set_kind(kind);
   result.set_recognized_kind(MethodRecognizer::kUnknown);
   result.set_modifier(RawFunction::kNoModifier);
   result.set_is_static(is_static);
   result.set_is_const(is_const);
   result.set_is_abstract(is_abstract);
   result.set_is_external(is_external);
@@ skipping 17 matching lines @@
   NOT_IN_PRECOMPILED(result.set_optimized_instruction_count(0));
   NOT_IN_PRECOMPILED(result.set_optimized_call_site_count(0));
   result.set_kernel_function(NULL);
   result.set_is_optimizable(is_native ? false : true);
   result.set_is_inlinable(true);
   result.set_allows_hoisting_check_class(true);
   result.set_allows_bounds_check_generalization(true);
   result.SetInstructionsSafe(
       Code::Handle(StubCode::LazyCompile_entry()->code()));
   if (kind == RawFunction::kClosureFunction) {
+    ASSERT(space == Heap::kOld);
     const ClosureData& data = ClosureData::Handle(ClosureData::New());
     result.set_data(data);
   } else if (kind == RawFunction::kSignatureFunction) {
-    const SignatureData& data = SignatureData::Handle(SignatureData::New());
+    const SignatureData& data =
+        SignatureData::Handle(SignatureData::New(space));
     result.set_data(data);
+  } else {
+    // Functions other than signature functions have no reason to be allocated
+    // in new space.
+    ASSERT(space == Heap::kOld);
   }
   return result.raw();
 }
 
 
 RawFunction* Function::Clone(const Class& new_owner) const {
   ASSERT(!IsGenerativeConstructor());
   Function& clone = Function::Handle();
   clone ^= Object::Clone(*this, Heap::kOld);
   const Class& origin = Class::Handle(this->origin());
@@ skipping 40 matching lines @@
                     /* is_const = */ false,
                     /* is_abstract = */ false,
                     /* is_external = */ false,
                     /* is_native = */ false, parent_owner, token_pos));
   result.set_parent_function(parent);
   return result.raw();
 }
 
 
 RawFunction* Function::NewSignatureFunction(const Object& owner,
-                                            TokenPosition token_pos) {
+                                            TokenPosition token_pos,
+                                            Heap::Space space) {
   const Function& result = Function::Handle(Function::New(
       Symbols::AnonymousSignature(), RawFunction::kSignatureFunction,
       /* is_static = */ false,
       /* is_const = */ false,
       /* is_abstract = */ false,
       /* is_external = */ false,
       /* is_native = */ false,
       owner,  // Same as function type scope class.
-      token_pos));
+      token_pos, space));
   result.set_is_reflectable(false);
   result.set_is_visible(false);
   result.set_is_debuggable(false);
   return result.raw();
 }
 
 
 RawFunction* Function::NewEvalFunction(const Class& owner,
                                        const Script& script,
                                        bool is_static) {
@@ skipping 653 matching lines @@
 void SignatureData::set_parent_function(const Function& value) const {
   StorePointer(&raw_ptr()->parent_function_, value.raw());
 }
 
 
 void SignatureData::set_signature_type(const Type& value) const {
   StorePointer(&raw_ptr()->signature_type_, value.raw());
 }
 
 
-RawSignatureData* SignatureData::New() {
+RawSignatureData* SignatureData::New(Heap::Space space) {
   ASSERT(Object::signature_data_class() != Class::null());
   RawObject* raw = Object::Allocate(SignatureData::kClassId,
-                                    SignatureData::InstanceSize(), Heap::kOld);
+                                    SignatureData::InstanceSize(), space);
   return reinterpret_cast<RawSignatureData*>(raw);
 }
 
 
 const char* SignatureData::ToCString() const {
   if (IsNull()) {
     return "SignatureData: null";
   }
   const Function& parent = Function::Handle(parent_function());
   const Type& type = Type::Handle(signature_type());
@@ skipping 15694 matching lines @@
   return UserTag::null();
 }
 
 
 const char* UserTag::ToCString() const {
   const String& tag_label = String::Handle(label());
   return tag_label.ToCString();
 }
 
 }  // namespace dart