Minor optimization to v8::internal::Factory::InternalizeOneByteString.

src/objects.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/objects.h"
 
 #include <cmath>
 #include <iomanip>
 #include <memory>
 #include <sstream>
@@ skipping 11745 matching lines @@
   value <<= String::ArrayIndexValueBits::kShift;
   value |= length << String::ArrayIndexLengthBits::kShift;
 
   DCHECK((value & String::kIsNotArrayIndexMask) == 0);
   DCHECK_EQ(length <= String::kMaxCachedArrayIndexLength,
             (value & String::kContainsCachedArrayIndexMask) == 0);
   return value;
 }
 
 
-uint32_t StringHasher::GetHashField() {
-  if (length_ <= String::kMaxHashCalcLength) {
-    if (is_array_index_) {
-      return MakeArrayIndexHash(array_index_, length_);
-    }
-    return (GetHashCore(raw_running_hash_) << String::kHashShift) |
-           String::kIsNotArrayIndexMask;
-  } else {
-    return (length_ << String::kHashShift) | String::kIsNotArrayIndexMask;
-  }
-}
-
-
 uint32_t StringHasher::ComputeUtf8Hash(Vector<const char> chars,
                                        uint32_t seed,
                                        int* utf16_length_out) {
   int vector_length = chars.length();
   // Handle some edge cases
   if (vector_length <= 1) {
     DCHECK(vector_length == 0 ||
            static_cast<uint8_t>(chars.start()[0]) <=
                unibrow::Utf8::kMaxOneByteChar);
     *utf16_length_out = vector_length;
@@ skipping 5615 matching lines @@
                             : isolate->factory()->cons_string_map();
       string->set_map(*map);
       Handle<ConsString> cons = Handle<ConsString>::cast(string);
       cons->set_first(*result);
       cons->set_second(isolate->heap()->empty_string());
     }
   }
   return result;
 }
 
-
-Handle<String> StringTable::LookupKey(Isolate* isolate, HashTableKey* key) {
-  Handle<StringTable> table = isolate->factory()->string_table();
-  int entry = table->FindEntry(key);
-
-  // String already in table.
-  if (entry != kNotFound) {
-    return handle(String::cast(table->KeyAt(entry)), isolate);
-  }
-
+Handle<String> StringTable::InsertKey(Isolate* isolate,
+                                      Handle<StringTable> table,
+                                      HashTableKey* key, int32_t hash) {
   // Adding new string. Grow table if needed.
   table = StringTable::EnsureCapacity(table, 1, key);
 
   // Create string object.
   Handle<Object> string = key->AsHandle(isolate);
   // There must be no attempts to internalize strings that could throw
   // InvalidStringLength error.
   CHECK(!string.is_null());
 
   // Add the new string and return it along with the string table.
-  entry = table->FindInsertionEntry(key->Hash());
+  int entry = table->FindInsertionEntry(hash);
   table->set(EntryToIndex(entry), *string);
   table->ElementAdded();
 
   isolate->heap()->SetRootStringTable(*table);
   return Handle<String>::cast(string);
 }
 
 
 String* StringTable::LookupKeyIfExists(Isolate* isolate, HashTableKey* key) {
   Handle<StringTable> table = isolate->factory()->string_table();
@@ skipping 2851 matching lines @@
       // depend on this.
       return DICTIONARY_ELEMENTS;
     }
     DCHECK_LE(kind, LAST_ELEMENTS_KIND);
     return kind;
   }
 }
 
 }  // namespace internal
 }  // namespace v8