Restore factory names in the intrinsifier list to the way they were (is used in a special way durin…

vm/intrinsifier.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.
 // Class for intrinsifying functions.
 
 #include "vm/intrinsifier.h"
 #include "vm/flags.h"
 #include "vm/object.h"
 #include "vm/symbols.h"
 
@@ skipping 46 matching lines @@
 
 
 // Returns true if the function matches function_name and class_name, with
 // special recognition of corelib private classes.
 static bool TestFunction(const Library& lib,
                          const Function& function,
                          const char* function_class_name,
                          const char* function_name,
                          const char* test_class_name,
                          const char* test_function_name) {
+  // If test_function_name starts with a '.' we use that to indicate
+  // that it is a named constructor in the class. Therefore, if
+  // the class matches and the rest of the method name starting with
+  // the dot matches, we have found a match.
+  // We do not store the entire factory constructor name with the class
+  // (e.g: _GrowableObjectArray.withData) because the actual function name
+  //  that we see here includes the private key.
+  if (test_function_name[0] == '.') {
+    function_name = strstr(function_name, ".");
+    if (function_name == NULL) {
+      return false;
+    }
+  }
   return CompareNames(lib, test_class_name, function_class_name) &&
          CompareNames(lib, test_function_name, function_name);
 }
 
 
 bool Intrinsifier::CanIntrinsify(const Function& function) {
   if (!FLAG_intrinsify) return false;
   if (function.IsClosureFunction()) return false;
   // Can occur because of compile-all flag.
   if (function.is_external()) return false;
   return function.is_intrinsic();
 }
 
 
 void Intrinsifier::InitializeState() {
   Library& lib = Library::Handle();
   Class& cls = Class::Handle();
   Function& func = Function::Handle();
   String& str = String::Handle();
 
 #define SETUP_FUNCTION(class_name, function_name, destination, fp)             \
   if (strcmp(#class_name, "::") == 0) {                                        \
     str = String::New(#function_name);                                         \
     func = lib.LookupFunctionAllowPrivate(str);                                \
   } else {                                                                     \
     str = String::New(#class_name);                                            \
     cls = lib.LookupClassAllowPrivate(str);                                    \
     ASSERT(!cls.IsNull());                                                     \
-    str = String::New(#function_name);                                         \
+    if (#function_name[0] == '.') {                                            \
+      str = String::New(#class_name#function_name);                            \
+    } else {                                                                   \
+      str = String::New(#function_name);                                       \
+    }                                                                          \
     func = cls.LookupFunctionAllowPrivate(str);                                \
   }                                                                            \
   ASSERT(!func.IsNull());                                                      \
   func.set_is_intrinsic(true);                                                 \
 
   // Set up all core lib functions that can be intrisified.
   lib = Library::CoreLibrary();
   CORE_LIB_INTRINSIC_LIST(SETUP_FUNCTION);
 
   // Set up all math lib functions that can be intrisified.
@@ skipping 30 matching lines @@
     SCALARLIST_LIB_INTRINSIC_LIST(FIND_INTRINSICS);
   } else if (lib.raw() == Library::MathLibrary()) {
     MATH_LIB_INTRINSIC_LIST(FIND_INTRINSICS);
   }
   return false;
 
 #undef FIND_INTRINSICS
 }
 
 }  // namespace dart