Revert r3514 and r3515. The new cache is too large for some tests...

src/heap.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1559 matching lines @@
 
   // Allocate the non_monomorphic_cache used in stub-cache.cc. The initial size
   // is set to avoid expanding the dictionary during bootstrapping.
   obj = NumberDictionary::Allocate(64);
   if (obj->IsFailure()) return false;
   set_non_monomorphic_cache(NumberDictionary::cast(obj));
 
   CreateFixedStubs();
 
   // Allocate the number->string conversion cache
-  ASSERT(IsPowerOf2(kNumberStringCacheSize));
   obj = AllocateFixedArray(kNumberStringCacheSize * 2);
   if (obj->IsFailure()) return false;
   set_number_string_cache(FixedArray::cast(obj));
 
   // Allocate cache for single character strings.
   obj = AllocateFixedArray(String::kMaxAsciiCharCode+1);
   if (obj->IsFailure()) return false;
   set_single_character_string_cache(FixedArray::cast(obj));
 
   // Allocate cache for external strings pointing to native source code.
@@ skipping 13 matching lines @@
   // Initialize descriptor cache.
   DescriptorLookupCache::Clear();
 
   // Initialize compilation cache.
   CompilationCache::Clear();
 
   return true;
 }
 
 
-static inline int NumberStringTruncateHash(int value) {
-  return (((value >> 16) ^ value)) & (Heap::kNumberStringCacheSize - 1);
+static inline int double_get_hash(double d) {
+  DoubleRepresentation rep(d);
+  return ((static_cast<int>(rep.bits) ^ static_cast<int>(rep.bits >> 32)) &
+          (Heap::kNumberStringCacheSize - 1));
 }
 
 
-static inline int DoubleGetHash(double d) {
-  DoubleRepresentation rep(d);
-  int value = (static_cast<int>(rep.bits) ^ static_cast<int>(rep.bits >> 32));
-  return NumberStringTruncateHash(value);
+static inline int smi_get_hash(Smi* smi) {
+  return (smi->value() & (Heap::kNumberStringCacheSize - 1));
 }
 
 
-static inline int SmiGetHash(Smi* smi) {
-  return NumberStringTruncateHash(smi->value());
-}
-
 
 Object* Heap::GetNumberStringCache(Object* number) {
   int hash;
   if (number->IsSmi()) {
-    hash = SmiGetHash(Smi::cast(number));
+    hash = smi_get_hash(Smi::cast(number));
   } else {
-    hash = DoubleGetHash(number->Number());
+    hash = double_get_hash(number->Number());
   }
   Object* key = number_string_cache()->get(hash * 2);
   if (key == number) {
     return String::cast(number_string_cache()->get(hash * 2 + 1));
   } else if (key->IsHeapNumber() &&
              number->IsHeapNumber() &&
              key->Number() == number->Number()) {
     return String::cast(number_string_cache()->get(hash * 2 + 1));
   }
   return undefined_value();
 }
 
 
 void Heap::SetNumberStringCache(Object* number, String* string) {
   int hash;
   if (number->IsSmi()) {
-    hash = SmiGetHash(Smi::cast(number));
+    hash = smi_get_hash(Smi::cast(number));
     number_string_cache()->set(hash * 2, number, SKIP_WRITE_BARRIER);
   } else {
-    hash = DoubleGetHash(number->Number());
+    hash = double_get_hash(number->Number());
     number_string_cache()->set(hash * 2, number);
   }
   number_string_cache()->set(hash * 2 + 1, string);
 }
 
 
 Object* Heap::SmiOrNumberFromDouble(double value,
                                     bool new_object,
                                     PretenureFlag pretenure) {
   // We need to distinguish the minus zero value and this cannot be
@@ skipping 2427 matching lines @@
 void ExternalStringTable::TearDown() {
   new_space_strings_.Free();
   old_space_strings_.Free();
 }
 
 
 List<Object*> ExternalStringTable::new_space_strings_;
 List<Object*> ExternalStringTable::old_space_strings_;
 
 } }  // namespace v8::internal