Move reconfiguration into the elements accessor

src/objects.cc

 // Copyright 2013 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 <iomanip>
 #include <sstream>
 
 #include "src/v8.h"
 
 #include "src/accessors.h"
@@ skipping 12373 matching lines @@
   if (*dictionary == *new_dictionary) return;
 
   if (object->HasSloppyArgumentsElements()) {
     FixedArray::cast(object->elements())->set(1, *new_dictionary);
   } else {
     object->set_elements(*new_dictionary);
   }
 }
 
 
-void JSObject::SetDictionaryArgumentsElement(Handle<JSObject> object,
-                                             uint32_t index,
-                                             Handle<Object> value,
-                                             PropertyAttributes attributes) {
-  // TODO(verwaest): Handle with the elements accessor.
-  Isolate* isolate = object->GetIsolate();
-
-  DCHECK(object->HasDictionaryArgumentsElements());
-
-  Handle<FixedArray> parameter_map(FixedArray::cast(object->elements()));
-  uint32_t length = parameter_map->length();
-  Handle<Object> probe =
-      index < length - 2
-          ? handle(parameter_map->get(index + 2), isolate)
-          : Handle<Object>::cast(isolate->factory()->the_hole_value());
-  if (!probe->IsTheHole()) {
-    Handle<Context> context(Context::cast(parameter_map->get(0)));
-    int context_index = Handle<Smi>::cast(probe)->value();
-    DCHECK(!context->get(context_index)->IsTheHole());
-    context->set(context_index, *value);
-
-    DCHECK_NE(NONE, attributes);
-
-    // Redefining attributes of an aliased element destroys fast aliasing.
-    parameter_map->set_the_hole(index + 2);
-    // For elements that are still writable we re-establish slow aliasing.
-    if ((attributes & READ_ONLY) == 0) {
-      value = isolate->factory()->NewAliasedArgumentsEntry(context_index);
-    }
-    Handle<SeededNumberDictionary> dictionary(
-        SeededNumberDictionary::cast(parameter_map->get(1)));
-    AddDictionaryElement(object, dictionary, index, value, attributes);
-  } else {
-    SetDictionaryElement(object, index, value, attributes);
-  }
-}
-
-
-void JSObject::SetDictionaryElement(Handle<JSObject> object, uint32_t index,
-                                    Handle<Object> value,
-                                    PropertyAttributes attributes) {
-  // TODO(verwaest): Handle with the elements accessor.
-  Isolate* isolate = object->GetIsolate();
-
-  // Insert element in the dictionary.
-  Handle<FixedArray> elements(FixedArray::cast(object->elements()));
-  bool is_arguments =
-      (elements->map() == isolate->heap()->sloppy_arguments_elements_map());
-
-  DCHECK(object->HasDictionaryElements() ||
-         object->HasDictionaryArgumentsElements());
-
-  Handle<SeededNumberDictionary> dictionary(is_arguments
-    ? SeededNumberDictionary::cast(elements->get(1))
-    : SeededNumberDictionary::cast(*elements));
-
-  int entry = dictionary->FindEntry(index);
-  DCHECK_NE(SeededNumberDictionary::kNotFound, entry);
-
-  PropertyDetails details = dictionary->DetailsAt(entry);
-  details = PropertyDetails(attributes, DATA, details.dictionary_index(),
-                            PropertyCellType::kNoCell);
-  dictionary->DetailsAtPut(entry, details);
-
-  // Elements of the arguments object in slow mode might be slow aliases.
-  if (is_arguments) {
-    Handle<Object> element(dictionary->ValueAt(entry), isolate);
-    if (element->IsAliasedArgumentsEntry()) {
-      Handle<AliasedArgumentsEntry> entry =
-          Handle<AliasedArgumentsEntry>::cast(element);
-      Handle<Context> context(Context::cast(elements->get(0)));
-      int context_index = entry->aliased_context_slot();
-      DCHECK(!context->get(context_index)->IsTheHole());
-      context->set(context_index, *value);
-      // For elements that are still writable we keep slow aliasing.
-      if (!details.IsReadOnly()) value = element;
-    }
-  }
-
-  dictionary->ValueAtPut(entry, *value);
-}
-
-
 // static
 MaybeHandle<Object> JSReceiver::SetElement(Handle<JSReceiver> object,
                                            uint32_t index, Handle<Object> value,
                                            LanguageMode language_mode) {
   Isolate* isolate = object->GetIsolate();
   LookupIterator it(isolate, object, index);
   return SetProperty(&it, value, language_mode, MAY_BE_STORE_FROM_KEYED);
 }
 
 
@@ skipping 3804 matching lines @@
                                             Handle<Object> new_value) {
   if (cell->value() != *new_value) {
     cell->set_value(*new_value);
     Isolate* isolate = cell->GetIsolate();
     cell->dependent_code()->DeoptimizeDependentCodeGroup(
         isolate, DependentCode::kPropertyCellChangedGroup);
   }
 }
 }  // namespace internal
 }  // namespace v8