Inline allocation of implicit closures.

runtime/vm/object.cc

 // Copyright (c) 2011, 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 "vm/assembler.h"
 #include "vm/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 2319 matching lines @@
 
 bool Function::IsInFactoryScope() const {
   Function& outer_function = Function::Handle(raw());
   while (outer_function.IsLocalFunction()) {
     outer_function = outer_function.parent_function();
   }
   return outer_function.IsFactory();
 }
 
 
-bool Function::IsInStaticScope() const {
-  Function& outer_function = Function::Handle(raw());
-  while (outer_function.IsLocalFunction()) {
-    outer_function = outer_function.parent_function();
-  }
-  return outer_function.is_static();
-}
-
-
 void Function::set_name(const String& value) const {
   ASSERT(value.IsSymbol());
   StorePointer(&raw_ptr()->name_, value.raw());
 }
 
 
 void Function::set_owner(const Class& value) const {
   ASSERT(!value.IsNull());
   StorePointer(&raw_ptr()->owner_, value.raw());
 }
@@ skipping 351 matching lines @@
       }
     }
     if (!found_param_name) {
       return false;
     }
   }
   return true;
 }
 
 
+bool Function::IsImplicitClosureFunction() const {
+  if (!IsClosureFunction()) {
+    return false;
+  }
+  const Function& parent = Function::Handle(parent_function());
+  return parent.raw_ptr()->implicit_closure_function_ == raw();
+}
+
+
 RawFunction* Function::New() {
   const Class& function_class = Class::Handle(Object::function_class());
   RawObject* raw = Object::Allocate(function_class,
                                     Function::InstanceSize(),
                                     Heap::kOld);
   return reinterpret_cast<RawFunction*>(raw);
 }
 
 
 RawFunction* Function::New(const String& name,
@@ skipping 20 matching lines @@
 
 RawFunction* Function::NewClosureFunction(const String& name,
                                           const Function& parent,
                                           intptr_t token_index) {
   ASSERT(!parent.IsNull());
   const Class& parent_class = Class::Handle(parent.owner());
   ASSERT(!parent_class.IsNull());
   const Function& result = Function::Handle(
       Function::New(name,
                     RawFunction::kClosureFunction,
-                    /* is_static = */ true,
+                    /* is_static = */ parent.is_static(),
                     /* is_const = */ false,
                     token_index));
   result.set_parent_function(parent);
   result.set_owner(parent_class);
   return result.raw();
 }
 
 
 RawFunction* Function::ImplicitClosureFunction() const {
   // Return the existing implicit closure function if any.
@@ skipping 52 matching lines @@
     signature_class = Class::NewSignatureClass(signature,
                                                closure_function,
                                                script,
                                                token_index());
     library.AddClass(signature_class);
   }
   ASSERT(!Function::Handle(signature_class.signature_function()).IsNull());
   ASSERT(Class::Handle(closure_function.signature_class()).IsNull());
   closure_function.set_signature_class(signature_class);
   set_implicit_closure_function(closure_function);
+  ASSERT(closure_function.IsImplicitClosureFunction());
   return closure_function.raw();
 }
 
 
 template<typename T>
 static RawArray* NewArray(const GrowableArray<T*>& objs) {
   Array& a = Array::Handle(Array::New(objs.length(), Heap::kOld));
   for (int i = 0; i < objs.length(); i++) {
     a.SetAt(i, *objs[i]);
   }
@@ skipping 3441 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart