Fix Intrinsifier and MethodRecognizer to correctly match private getters and setters.

runtime/vm/intermediate_language.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/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 199 matching lines @@
   ASSERT(initial_definitions_.length() > 0);
   for (intptr_t i = 0; i < initial_definitions_.length(); ++i) {
     ConstantInstr* defn = initial_definitions_[i]->AsConstant();
     if (defn != NULL && defn->value().IsNull()) return defn;
   }
   UNREACHABLE();
   return NULL;
 }
 
 
+static bool StartsWith(const String& name, const char* prefix, intptr_t n) {

[Florian Schneider, 2013/01/07 13:15:48]

Maybe assert that name is a OneByteString?

[Vyacheslav Egorov (Google), 2013/01/07 15:02:47]

Done.

+  if (name.Length() < n) {
+    return false;
+  }
+
+  for (intptr_t i = 0; i < n; i++) {
+    if (name.CharAt(i) != prefix[i]) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+
 static bool CompareNames(const Library& lib,
                          const char* test_name,
                          const String& name) {
-  // If both names are private mangle test_name before comparison.
-  if ((name.CharAt(0) == '_') && (test_name[0] == '_')) {
-    const String& test_name_symbol = String::Handle(Symbols::New(test_name));
-    return String::Handle(lib.PrivateName(test_name_symbol)).Equals(name);
+  static const intptr_t kPrefixLength = 5;

[Florian Schneider, 2013/01/07 13:15:48]

Do you really need static here? I'd omit it for local variables.

[Florian Schneider, 2013/01/07 13:15:48]

Maybe rather use strlen(kPrefixGetter) and strlen(kPrefixSetter) below? 

[Kevin Millikin (Google), 2013/01/07 13:26:36]

You can also use the trick:

static const char kGetterPrefix[] = "get:_";
static const char kPrefixLength = sizeof(kGetterPrefix);

[Vyacheslav Egorov (Google), 2013/01/07 15:02:47]

Done.

[Vyacheslav Egorov (Google), 2013/01/07 15:02:47]

Done.

+  static const char* kGetterPrefix = "get:_";

[Florian Schneider, 2013/01/07 13:15:48]

We have already kGetterPrefix in object.cc. Maybe define this one too in the
same place and rename it to kPrivateGetterPrefix.

[Vyacheslav Egorov (Google), 2013/01/07 15:02:47]

Done.

+  static const char* kSetterPrefix = "set:_";
+
+  if (test_name[0] == '_') {
+    if (name.CharAt(0) != '_') {
+      return false;
+    }
+  } else if (strncmp(test_name, kGetterPrefix, kPrefixLength) == 0) {
+    if (!StartsWith(name, kGetterPrefix, kPrefixLength)) {
+      return false;
+    }
+  } else if (strncmp(test_name, kSetterPrefix, kPrefixLength) == 0) {
+    if (!StartsWith(name, kSetterPrefix, kPrefixLength)) {
+      return false;
+    }
+  } else {
+    // Compare without mangling.
+    return name.Equals(test_name);
   }
-  return name.Equals(test_name);
+
+  // Both names are private. Mangle test_name before comparison.
+  const String& test_name_symbol = String::Handle(Symbols::New(test_name));
+  return String::Handle(lib.PrivateName(test_name_symbol)).Equals(name);
 }
 
 
 static bool IsRecognizedLibrary(const Library& library) {
   // List of libraries where methods can be recognized.
   return (library.raw() == Library::CoreLibrary())
       || (library.raw() == Library::MathLibrary())
       || (library.raw() == Library::ScalarlistLibrary());
 }
 
+
 MethodRecognizer::Kind MethodRecognizer::RecognizeKind(
     const Function& function) {
   const Class& function_class = Class::Handle(function.Owner());
   const Library& lib = Library::Handle(function_class.library());
   if (!IsRecognizedLibrary(lib)) {
     return kUnknown;
   }
 
   const String& function_name = String::Handle(function.name());
   const String& class_name = String::Handle(function_class.Name());
@@ skipping 2461 matching lines @@
     default:
       UNREACHABLE();
       return -1;
   }
 }
 
 
 #undef __
 
 }  // namespace dart