Minor changes based on the profile while running dart2js compile all.

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 "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 1911 matching lines @@
   }
   for (intptr_t i = 0, j = prefix_length; i < accessor_name_len; i++, j++) {
     if (name.CharAt(j) != accessor_name.CharAt(i)) {
       return false;
     }
   }
   return true;
 }
 
 
-// Check to see if mangled_name is equal to bare_name once the private
-// key separator is stripped from mangled_name.
+// Check to see if 'lookup_name' matches 'name' as is or
+// once the private key separator is stripped from name.
 //
 // Things are made more complicated by the fact that constructors are
 // added *after* the private suffix, so "foo@123.named" should match
 // "foo.named".
 //
 // Also, the private suffix can occur more than once in the name, as in:
 //
 //    _ReceivePortImpl@6be832b._internal@6be832b
 //
-bool EqualsIgnoringPrivate(const String& mangled_name,
-                           const String& bare_name) {
-  intptr_t mangled_len = mangled_name.Length();
-  intptr_t bare_len = bare_name.Length();
-  if (mangled_len < bare_len) {
-    // No way they can match.
-    return false;
+bool EqualsIgnoringPrivate(const String& name, const String& lookup_name) {

[srdjan, 2012/07/13 23:22:23]

Compare raws.

[siva, 2012/07/16 18:29:23]

Done.

+  intptr_t name_len = name.Length();
+  intptr_t lookup_name_len = lookup_name.Length();
+  if (name_len == lookup_name_len) {
+    for (intptr_t i = 0; i < name_len; i++) {
+      if (name.CharAt(i) != lookup_name.CharAt(i)) {
+        return false;
+      }
+    }
+    return true;
   }
+  if (name_len < lookup_name_len) {
+    return false;  // No way they can match.
+  }
+  intptr_t name_pos = 0;
+  intptr_t lookup_name_pos = 0;
+  while (name_pos < name_len) {
+    int32_t name_char = name.CharAt(name_pos);
+    name_pos++;
 
-  intptr_t mangled_pos = 0;
-  intptr_t bare_pos = 0;
-  while (mangled_pos < mangled_len) {
-    int32_t mangled_char = mangled_name.CharAt(mangled_pos);
-    mangled_pos++;
-
-    if (mangled_char == Scanner::kPrivateKeySeparator) {
+    if (name_char == Scanner::kPrivateKeySeparator) {
       // Consume a private key separator.
-      while (mangled_pos < mangled_len &&
-             mangled_name.CharAt(mangled_pos) != '.') {
-        mangled_pos++;
+      while (name_pos < name_len && name.CharAt(name_pos) != '.') {
+        name_pos++;
       }
-
       // Resume matching characters.
       continue;
     }
-    if (bare_pos == bare_len || mangled_char != bare_name.CharAt(bare_pos)) {
+    if (lookup_name_pos == lookup_name_len ||
+        name_char != lookup_name.CharAt(lookup_name_pos)) {
       return false;
     }
-    bare_pos++;
+    lookup_name_pos++;
   }
 
-  // The strings match if we have reached the end of both strings.
-  return (mangled_pos == mangled_len &&
-          bare_pos == bare_len);
+  // We have reached the end of mangled_name string.
+  ASSERT(name_pos == name_len);
+  return (lookup_name_pos == lookup_name_len);
 }
 
 
 RawFunction* Class::LookupFunction(const String& name) const {
   Isolate* isolate = Isolate::Current();
   Array& funcs = Array::Handle(isolate, functions());
   Function& function = Function::Handle(isolate, Function::null());
   String& function_name = String::Handle(isolate, String::null());
   intptr_t len = funcs.Length();
   for (intptr_t i = 0; i < len; i++) {
     function ^= funcs.At(i);
     function_name ^= function.name();
-    if (function_name.Equals(name) ||
-        EqualsIgnoringPrivate(function_name, name)) {
+    if (EqualsIgnoringPrivate(function_name, name)) {
       return function.raw();
     }
   }
 
   // No function found.
   return Function::null();
 }
 
 
 RawFunction* Class::LookupGetterFunction(const String& name) const {
@@ skipping 81 matching lines @@
 
 RawField* Class::LookupField(const String& name) const {
   Isolate* isolate = Isolate::Current();
   const Array& flds = Array::Handle(isolate, fields());
   Field& field = Field::Handle(isolate, Field::null());
   String& field_name = String::Handle(isolate, String::null());
   intptr_t len = flds.Length();
   for (intptr_t i = 0; i < len; i++) {
     field ^= flds.At(i);
     field_name ^= field.name();
-    if (field_name.Equals(name) || EqualsIgnoringPrivate(field_name, name)) {
+    if (EqualsIgnoringPrivate(field_name, name)) {
       return field.raw();
     }
   }
   // No field found.
   return Field::null();
 }
 
 
 RawLibraryPrefix* Class::LookupLibraryPrefix(const String& name) const {
   Isolate* isolate = Isolate::Current();
@@ skipping 6193 matching lines @@
     return true;
   }
 
   if (!other.IsString() || other.IsNull()) {
     return false;
   }
 
   const String& other_string = String::Cast(other);
   if (this->HasHash() && other_string.HasHash() &&
       (this->Hash() != other_string.Hash())) {
-    // Both sides have a hash code and it does not match.
-    return false;
+    return false;  // Both sides have a hash code and it does not match.
   }
-
-  intptr_t len = this->Length();
-  if (len != other_string.Length()) {
-    // Lengths don't match.
-    return false;
-  }
-
-  for (intptr_t i = 0; i < len; i++) {
-    if (this->CharAt(i) != other_string.CharAt(i)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-
-bool String::Equals(const String& str,
-                    intptr_t begin_index,
-                    intptr_t len) const {
-  ASSERT(begin_index >= 0);
-  ASSERT(begin_index == 0 || begin_index < str.Length());
-  ASSERT(len >= 0);
-  ASSERT(len <= str.Length());
-  if (len != this->Length()) {
-    // Lengths don't match.
-    return false;
-  }
-
-  for (intptr_t i = 0; i < len; i++) {
-    if (this->CharAt(i) != str.CharAt(begin_index + i)) {
-      return false;
-    }
-  }
-  return true;
+  return Equals(other_string, 0, other_string.Length());
 }
 
 
 bool String::Equals(const char* str) const {
   for (intptr_t i = 0; i < this->Length(); ++i) {
     if (*str == '\0') {
       // Lengths don't match.
       return false;
     }
     int32_t ch;
@@ skipping 2390 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