Reverting r4685, r4686, r4687

src/objects.cc

 // Copyright 2006-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 4665 matching lines @@
     for (; i < length; i++) {
       hasher.AddCharacterNoIndex(chars[i]);
     }
   }
   return hasher.GetHashField();
 }
 
 
 uint32_t String::ComputeAndSetHash() {
   // Should only be called if hash code has not yet been computed.
-  ASSERT(!HasHashCode());
+  ASSERT(!(hash_field() & kHashComputedMask));
 
   const int len = length();
 
   // Compute the hash code.
   uint32_t field = 0;
   if (StringShape(this).IsSequentialAscii()) {
     field = HashSequentialString(SeqAsciiString::cast(this)->GetChars(), len);
   } else if (StringShape(this).IsSequentialTwoByte()) {
     field = HashSequentialString(SeqTwoByteString::cast(this)->GetChars(), len);
   } else {
     StringInputBuffer buffer(this);
     field = ComputeHashField(&buffer, len);
   }
 
   // Store the hash code in the object.
   set_hash_field(field);
 
   // Check the hash code is there.
-  ASSERT(HasHashCode());
+  ASSERT(hash_field() & kHashComputedMask);
   uint32_t result = field >> kHashShift;
   ASSERT(result != 0);  // Ensure that the hash value of 0 is never computed.
   return result;
 }
 
 
 bool String::ComputeArrayIndex(unibrow::CharacterStream* buffer,
                                uint32_t* index,
                                int length) {
   if (length == 0 || length > kMaxArrayIndexSize) return false;
@@ skipping 34 matching lines @@
   } else {
     StringInputBuffer buffer(this);
     return ComputeArrayIndex(&buffer, index, length());
   }
 }
 
 
 static inline uint32_t HashField(uint32_t hash,
                                  bool is_array_index,
                                  int length = -1) {
-  uint32_t result = (hash << String::kHashShift);
+  uint32_t result =
+      (hash << String::kHashShift) | String::kHashComputedMask;
   if (is_array_index) {
     // For array indexes mix the length into the hash as an array index could
     // be zero.
     ASSERT(length > 0);
     ASSERT(TenToThe(String::kMaxCachedArrayIndexLength) <
            (1 << String::kArrayIndexValueBits));
     result |= String::kIsArrayIndexMask;
     result |= length << String::kArrayIndexHashLengthShift;
   }
   return result;
@@ skipping 774 matching lines @@
       }
       default:
         UNREACHABLE();
         break;
     }
   }
 
   // General slow case.
   if (len->IsNumber()) {
     uint32_t length;
-    if (len->ToArrayIndex(&length)) {
+    if (Array::IndexFromObject(len, &length)) {
       return SetSlowElements(len);
     } else {
       return ArrayLengthRangeError();
     }
   }
 
   // len is not a number so make the array size one and
   // set only element to len.
   Object* obj = Heap::AllocateFixedArray(1);
   if (obj->IsFailure()) return obj;
@@ skipping 302 matching lines @@
       return SetPropertyWithDefinedSetter(JSFunction::cast(setter), value);
     }
   }
 
   // Check whether there is extra space in fixed array..
   if (index < elms_length) {
     elms->set(index, value);
     if (IsJSArray()) {
       // Update the length of the array if needed.
       uint32_t array_length = 0;
-      CHECK(JSArray::cast(this)->length()->ToArrayIndex(&array_length));
+      CHECK(Array::IndexFromObject(JSArray::cast(this)->length(),
+                                   &array_length));
       if (index >= array_length) {
         JSArray::cast(this)->set_length(Smi::FromInt(index + 1));
       }
     }
     return value;
   }
 
   // Allow gap in fast case.
   if ((index - elms_length) < kMaxGap) {
     // Try allocating extra space.
@@ skipping 130 matching lines @@
         JSArray* array = JSArray::cast(this);
         Object* return_value = array->JSArrayUpdateLengthFromIndex(index,
                                                                    value);
         if (return_value->IsFailure()) return return_value;
       }
 
       // Attempt to put this object back in fast case.
       if (ShouldConvertToFastElements()) {
         uint32_t new_length = 0;
         if (IsJSArray()) {
-          CHECK(JSArray::cast(this)->length()->ToArrayIndex(&new_length));
+          CHECK(Array::IndexFromObject(JSArray::cast(this)->length(),
+                                       &new_length));
           JSArray::cast(this)->set_length(Smi::FromInt(new_length));
         } else {
           new_length = NumberDictionary::cast(elements())->max_number_key() + 1;
         }
         Object* obj = Heap::AllocateFixedArrayWithHoles(new_length);
         if (obj->IsFailure()) return obj;
         SetFastElements(FixedArray::cast(obj));
 #ifdef DEBUG
         if (FLAG_trace_normalization) {
           PrintF("Object elements are fast case again:\n");
@@ skipping 10 matching lines @@
   }
   // All possible cases have been handled above. Add a return to avoid the
   // complaints from the compiler.
   UNREACHABLE();
   return Heap::null_value();
 }
 
 
 Object* JSArray::JSArrayUpdateLengthFromIndex(uint32_t index, Object* value) {
   uint32_t old_len = 0;
-  CHECK(length()->ToArrayIndex(&old_len));
+  CHECK(Array::IndexFromObject(length(), &old_len));
   // Check to see if we need to update the length. For now, we make
   // sure that the length stays within 32-bits (unsigned).
   if (index >= old_len && index != 0xffffffff) {
     Object* len =
         Heap::NumberFromDouble(static_cast<double>(index) + 1);
     if (len->IsFailure()) return len;
     set_length(len);
   }
   return value;
 }
@@ skipping 273 matching lines @@
   // dictionary, we cannot go back to fast case.
   if (dictionary->requires_slow_elements()) return false;
   // An object requiring access checks is never allowed to have fast
   // elements.  If it had fast elements we would skip security checks.
   if (IsAccessCheckNeeded()) return false;
   // If the dictionary backing storage takes up roughly half as much
   // space as a fast-case backing storage would the array should have
   // fast elements.
   uint32_t length = 0;
   if (IsJSArray()) {
-    CHECK(JSArray::cast(this)->length()->ToArrayIndex(&length));
+    CHECK(Array::IndexFromObject(JSArray::cast(this)->length(), &length));
   } else {
     length = dictionary->max_number_key();
   }
   return static_cast<uint32_t>(dictionary->Capacity()) >=
       (length / (2 * NumberDictionary::kEntrySize));
 }
 
 
 // Certain compilers request function template instantiation when they
 // see the definition of the other template functions in the
@@ skipping 2181 matching lines @@
   if (break_point_objects()->IsUndefined()) return 0;
   // Single beak point.
   if (!break_point_objects()->IsFixedArray()) return 1;
   // Multiple break points.
   return FixedArray::cast(break_point_objects())->length();
 }
 #endif
 
 
 } }  // namespace v8::internal