VM: Precompile method extractors for implicit and explicit closurization.

runtime/vm/precompiler.cc

 // Copyright (c) 2015, 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/precompiler.h"
 
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/isolate.h"
 #include "vm/log.h"
@@ skipping 491 matching lines @@
     AddClass(superclass);
   }
 }
 
 
 void Precompiler::CheckForNewDynamicFunctions() {
   Library& lib = Library::Handle(Z);
   Class& cls = Class::Handle(Z);
   Array& functions = Array::Handle(Z);
   Function& function = Function::Handle(Z);
-  Function& function2 = Function::Handle(Z);
   String& selector = String::Handle(Z);
   String& selector2 = String::Handle(Z);
   String& selector3 = String::Handle(Z);
 
   for (intptr_t i = 0; i < libraries_.Length(); i++) {
     lib ^= libraries_.At(i);
     ClassDictionaryIterator it(lib, ClassDictionaryIterator::kIteratePrivate);
     while (it.HasNext()) {
       cls = it.GetNextClass();
 
@@ skipping 51 matching lines @@
         }
 
         // Handle the implicit call type conversions.
         if (Field::IsGetterName(selector)) {
           selector2 = Field::NameFromGetter(selector);
           selector3 = Symbols::Lookup(selector2);
           if (IsSent(selector2)) {
             // Call-through-getter.
             // Function is get:foo and somewhere foo is called.
             AddFunction(function);
+
+            AddImplicitClosure(function, selector3);

[rmacnak, 2015/10/14 17:07:33]

This one wants an invoke-field dispatcher, not a method-extractor.

[Florian Schneider, 2015/10/14 17:55:54]

Yes, I wrongly thought I missed a case here, but I had to fix
Resolver::ResolveDynamicAnyArgs instead to make #-closurization work with
precompiled code.

           }
           selector3 = Symbols::LookupFromConcat(Symbols::ClosurizePrefix(),
                                                 selector2);
           if (IsSent(selector3)) {
             // Hash-closurization.
             // Function is get:foo and somewhere get:#foo is called.
             AddFunction(function);
 
-            function2 = function.ImplicitClosureFunction();
-            AddFunction(function2);
+            AddImplicitClosure(function, selector3);
           }
         } else if (Field::IsSetterName(selector)) {
           selector2 = Symbols::LookupFromConcat(Symbols::ClosurizePrefix(),
                                                 selector);
           if (IsSent(selector2)) {
             // Hash-closurization.
             // Function is set:foo and somewhere get:#set:foo is called.
             AddFunction(function);
 
-            function2 = function.ImplicitClosureFunction();
-            AddFunction(function2);
+            AddImplicitClosure(function, selector2);
           }
         } else if (function.kind() == RawFunction::kRegularFunction) {
           selector2 = Field::LookupGetterSymbol(selector);
           if (IsSent(selector2)) {
             // Closurization.
             // Function is foo and somewhere get:foo is called.
-            function2 = function.ImplicitClosureFunction();
-            AddFunction(function2);
+            AddImplicitClosure(function, selector2);
           }
           selector2 = Symbols::LookupFromConcat(Symbols::ClosurizePrefix(),
                                                 selector);
           if (IsSent(selector2)) {
             // Hash-closurization.
             // Function is foo and somewhere get:#foo is called.
-            function2 = function.ImplicitClosureFunction();
-            AddFunction(function2);
+            AddImplicitClosure(function, selector2);
           }
         }
       }
     }
   }
 }
 
 
+void Precompiler::AddImplicitClosure(const Function& function,
+                                     const String& selector) {
+  AddFunction(Function::Handle(function.ImplicitClosureFunction()));

[rmacnak, 2015/10/14 17:07:34]

Handle(Z, ...

[Florian Schneider, 2015/10/14 17:55:54]

I removed this helper again to not create extra handles in the loop.

+  AddFunction(Function::Handle(function.GetMethodExtractor(selector)));
+}
+
+
 void Precompiler::DropUncompiledFunctions() {
   Library& lib = Library::Handle(Z);
   Class& cls = Class::Handle(Z);
   Array& functions = Array::Handle(Z);
   Function& function = Function::Handle(Z);
   GrowableObjectArray& retained_functions = GrowableObjectArray::Handle(Z);
   GrowableObjectArray& closures = GrowableObjectArray::Handle(Z);
 
   for (intptr_t i = 0; i < libraries_.Length(); i++) {
     lib ^= libraries_.At(i);
@@ skipping 179 matching lines @@
         for (intptr_t j = 0; j < closures.Length(); j++) {
           function ^= closures.At(j);
           visitor->VisitFunction(function);
         }
       }
     }
   }
 }
 
 }  // namespace dart