AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

JSObject::NormalizeElements() handlified.

Browse Source 
R=verwaest@chromium.org

Review URL: https://codereview.chromium.org/206343002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20146 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
ishell@chromium.org 2014-03-21 08:44:40 +00:00
parent e9a315c978
commit bd2f81397c
2 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/objects.cc
View File

@ -4711,70 +4711,59 @@ static Handle<SeededNumberDictionary> CopyFastElementsToDictionary(
Handle<SeededNumberDictionary> JSObject::NormalizeElements( Handle<SeededNumberDictionary> JSObject::NormalizeElements(
Handle<JSObject> object) { Handle<JSObject> object) {
CALL_HEAP_FUNCTION(object->GetIsolate(), ASSERT(!object->HasExternalArrayElements());
object->NormalizeElements(), Isolate* isolate = object->GetIsolate();
SeededNumberDictionary); Factory* factory = isolate->factory();
}
MaybeObject* JSObject::NormalizeElements() {
ASSERT(!HasExternalArrayElements());
// Find the backing store. // Find the backing store.
FixedArrayBase* array = FixedArrayBase::cast(elements()); Handle<FixedArrayBase> array(FixedArrayBase::cast(object->elements()));
Map* old_map = array->map();
bool is_arguments = bool is_arguments =
(old_map == old_map->GetHeap()->sloppy_arguments_elements_map()); (array->map() == isolate->heap()->sloppy_arguments_elements_map());
if (is_arguments) { if (is_arguments) {
array = FixedArrayBase::cast(FixedArray::cast(array)->get(1)); array = handle(FixedArrayBase::cast(
Handle<FixedArray>::cast(array)->get(1)));
} }
if (array->IsDictionary()) return array; if (array->IsDictionary()) return Handle<SeededNumberDictionary>::cast(array);
ASSERT(HasFastSmiOrObjectElements() || ASSERT(object->HasFastSmiOrObjectElements() ||
HasFastDoubleElements() || object->HasFastDoubleElements() ||
HasFastArgumentsElements()); object->HasFastArgumentsElements());
// Compute the effective length and allocate a new backing store. // Compute the effective length and allocate a new backing store.
int length = IsJSArray() int length = object->IsJSArray()
? Smi::cast(JSArray::cast(this)->length())->value() ? Smi::cast(Handle<JSArray>::cast(object)->length())->value()
: array->length(); : array->length();
int old_capacity = 0; int old_capacity = 0;
int used_elements = 0; int used_elements = 0;
GetElementsCapacityAndUsage(&old_capacity, &used_elements); object->GetElementsCapacityAndUsage(&old_capacity, &used_elements);
SeededNumberDictionary* dictionary; Handle<SeededNumberDictionary> dictionary =
MaybeObject* maybe_dictionary = factory->NewSeededNumberDictionary(used_elements);
SeededNumberDictionary::Allocate(GetHeap(), used_elements);
if (!maybe_dictionary->To(&dictionary)) return maybe_dictionary;
maybe_dictionary = CopyFastElementsToDictionary( dictionary = CopyFastElementsToDictionary(array, length, dictionary);
GetIsolate(), array, length, dictionary);
if (!maybe_dictionary->To(&dictionary)) return maybe_dictionary;
// Switch to using the dictionary as the backing storage for elements. // Switch to using the dictionary as the backing storage for elements.
if (is_arguments) { if (is_arguments) {
FixedArray::cast(elements())->set(1, dictionary); FixedArray::cast(object->elements())->set(1, *dictionary);
} else { } else {
// Set the new map first to satify the elements type assert in // Set the new map first to satify the elements type assert in
// set_elements(). // set_elements().
Map* new_map; Handle<Map> new_map =
MaybeObject* maybe = GetElementsTransitionMap(GetIsolate(), JSObject::GetElementsTransitionMap(object, DICTIONARY_ELEMENTS);
DICTIONARY_ELEMENTS);
if (!maybe->To(&new_map)) return maybe; JSObject::MigrateToMap(object, new_map);
// TODO(verwaest): Replace by MigrateToMap. object->set_elements(*dictionary);
set_map(new_map);
set_elements(dictionary);
} }
old_map->GetHeap()->isolate()->counters()->elements_to_dictionary()-> isolate->counters()->elements_to_dictionary()->Increment();
Increment();
#ifdef DEBUG #ifdef DEBUG
if (FLAG_trace_normalization) { if (FLAG_trace_normalization) {
PrintF("Object elements have been normalized:\n"); PrintF("Object elements have been normalized:\n");
Print(); object->Print();
} }
#endif #endif
ASSERT(HasDictionaryElements() || HasDictionaryArgumentsElements()); ASSERT(object->HasDictionaryElements() ||
object->HasDictionaryArgumentsElements());
return dictionary; return dictionary;
} }

2
src/objects.h
View File

@ -2608,8 +2608,6 @@ class JSObject: public JSReceiver {
static Handle<SeededNumberDictionary> NormalizeElements( static Handle<SeededNumberDictionary> NormalizeElements(
Handle<JSObject> object); Handle<JSObject> object);
MUST_USE_RESULT MaybeObject* NormalizeElements();
// Transform slow named properties to fast variants. // Transform slow named properties to fast variants.
static void TransformToFastProperties(Handle<JSObject> object, static void TransformToFastProperties(Handle<JSObject> object,
int unused_property_fields); int unused_property_fields);