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

Dictionary::Add() handlified.

Browse Source 
R=yangguo@chromium.org

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20948 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
ishell@chromium.org 2014-04-24 15:16:26 +00:00
parent cb46971aa3
commit 2e0c29654c
4 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/factory.cc
View File

@ -1500,7 +1500,7 @@ Handle<GlobalObject> Factory::NewGlobalObject(Handle<JSFunction> constructor) {
Handle<Name> name(descs->GetKey(i));
Handle<Object> value(descs->GetCallbacksObject(i), isolate());
Handle<PropertyCell> cell = NewPropertyCell(value);
NameDictionary::AddNameEntry(dictionary, name, cell, d);
NameDictionary::Add(dictionary, name, cell, d);
}
// Allocate the global object and initialize it with the backing store.

66
src/objects.cc
View File

@ -667,7 +667,7 @@ void JSObject::SetNormalizedProperty(Handle<JSObject> object,
store_value = object->GetIsolate()->factory()->NewPropertyCell(value);
}
property_dictionary = NameDictionary::AddNameEntry(
property_dictionary = NameDictionary::Add(
property_dictionary, name, store_value, details);
object->set_properties(*property_dictionary);
return;
@ -1942,7 +1942,7 @@ void JSObject::AddSlowProperty(Handle<JSObject> object,
}
PropertyDetails details = PropertyDetails(attributes, NORMAL, 0);
Handle<NameDictionary> result =
NameDictionary::AddNameEntry(dict, name, value, details);
NameDictionary::Add(dict, name, value, details);
if (*dict != *result) object->set_properties(*result);
}
@ -4641,7 +4641,7 @@ void JSObject::NormalizeProperties(Handle<JSObject> object,
Handle<Object> value(descs->GetConstant(i), isolate);
PropertyDetails d = PropertyDetails(
details.attributes(), NORMAL, i + 1);
dictionary = NameDictionary::AddNameEntry(dictionary, key, value, d);
dictionary = NameDictionary::Add(dictionary, key, value, d);
break;
}
case FIELD: {
@ -4650,7 +4650,7 @@ void JSObject::NormalizeProperties(Handle<JSObject> object,
object->RawFastPropertyAt(descs->GetFieldIndex(i)), isolate);
PropertyDetails d =
PropertyDetails(details.attributes(), NORMAL, i + 1);
dictionary = NameDictionary::AddNameEntry(dictionary, key, value, d);
dictionary = NameDictionary::Add(dictionary, key, value, d);
break;
}
case CALLBACKS: {
@ -4658,7 +4658,7 @@ void JSObject::NormalizeProperties(Handle<JSObject> object,
Handle<Object> value(descs->GetCallbacksObject(i), isolate);
PropertyDetails d = PropertyDetails(
details.attributes(), CALLBACKS, i + 1);
dictionary = NameDictionary::AddNameEntry(dictionary, key, value, d);
dictionary = NameDictionary::Add(dictionary, key, value, d);
break;
}
case INTERCEPTOR:
@ -14988,9 +14988,9 @@ template int
Dictionary<NameDictionary, NameDictionaryShape, Handle<Name> >::
NumberOfElementsFilterAttributes(PropertyAttributes);
template MaybeObject*
template Handle<NameDictionary>
Dictionary<NameDictionary, NameDictionaryShape, Handle<Name> >::Add(
Handle<Name>, Object*, PropertyDetails);
Handle<NameDictionary>, Handle<Name>, Handle<Object>, PropertyDetails);
template MaybeObject*
Dictionary<NameDictionary, NameDictionaryShape, Handle<Name> >::
@ -15000,13 +15000,19 @@ template int
Dictionary<SeededNumberDictionary, SeededNumberDictionaryShape, uint32_t>::
NumberOfElementsFilterAttributes(PropertyAttributes);
template MaybeObject*
Dictionary<SeededNumberDictionary, SeededNumberDictionaryShape, uint32_t>::Add(
uint32_t, Object*, PropertyDetails);
template Handle<SeededNumberDictionary>
Dictionary<SeededNumberDictionary, SeededNumberDictionaryShape, uint32_t>::
Add(Handle<SeededNumberDictionary>,
uint32_t,
Handle<Object>,
PropertyDetails);
template MaybeObject*
template Handle<UnseededNumberDictionary>
Dictionary<UnseededNumberDictionary, UnseededNumberDictionaryShape, uint32_t>::
Add(uint32_t, Object*, PropertyDetails);
Add(Handle<UnseededNumberDictionary>,
uint32_t,
Handle<Object>,
PropertyDetails);
template MaybeObject*
Dictionary<SeededNumberDictionary, SeededNumberDictionaryShape, uint32_t>::
@ -15045,16 +15051,6 @@ int HashTable<SeededNumberDictionary, SeededNumberDictionaryShape, uint32_t>::
FindEntry(uint32_t);
Handle<NameDictionary> NameDictionary::AddNameEntry(Handle<NameDictionary> dict,
Handle<Name> name,
Handle<Object> value,
PropertyDetails details) {
CALL_HEAP_FUNCTION(dict->GetIsolate(),
dict->Add(name, *value, details),
NameDictionary);
}
Handle<Object> JSObject::PrepareSlowElementsForSort(
Handle<JSObject> object, uint32_t limit) {
ASSERT(object->HasDictionaryElements());
@ -15495,7 +15491,7 @@ Handle<PropertyCell> JSGlobalObject::EnsurePropertyCell(
isolate->factory()->the_hole_value());
PropertyDetails details(NONE, NORMAL, 0);
details = details.AsDeleted();
Handle<NameDictionary> dictionary = NameDictionary::AddNameEntry(
Handle<NameDictionary> dictionary = NameDictionary::Add(
handle(global->property_dictionary()), name, cell, details);
global->set_properties(*dictionary);
return cell;
@ -15977,20 +15973,17 @@ Handle<Derived> Dictionary<Derived, Shape, Key>::AtPut(
template<typename Derived, typename Shape, typename Key>
MaybeObject* Dictionary<Derived, Shape, Key>::Add(
Handle<Derived> Dictionary<Derived, Shape, Key>::Add(
Handle<Derived> dictionary,
Key key,
Object* value,
Handle<Object> value,
PropertyDetails details) {
// Valdate key is absent.
SLOW_ASSERT((this->FindEntry(key) == Dictionary::kNotFound));
SLOW_ASSERT((dictionary->FindEntry(key) == Dictionary::kNotFound));
// Check whether the dictionary should be extended.
Object* obj;
{ MaybeObject* maybe_obj = EnsureCapacity(1, key);
if (!maybe_obj->ToObject(&obj)) return maybe_obj;
}
dictionary = EnsureCapacity(dictionary, 1, key);
return Dictionary::cast(obj)->AddEntry(
key, value, details, Dictionary::Hash(key));
return AddEntry(dictionary, key, value, details, dictionary->Hash(key));
}
@ -16066,9 +16059,7 @@ Handle<SeededNumberDictionary> SeededNumberDictionary::AddNumberEntry(
PropertyDetails details) {
dictionary->UpdateMaxNumberKey(key);
SLOW_ASSERT(dictionary->FindEntry(key) == kNotFound);
CALL_HEAP_FUNCTION(dictionary->GetIsolate(),
dictionary->Add(key, *value, details),
SeededNumberDictionary);
return Add(dictionary, key, value, details);
}
@ -16077,10 +16068,7 @@ Handle<UnseededNumberDictionary> UnseededNumberDictionary::AddNumberEntry(
uint32_t key,
Handle<Object> value) {
SLOW_ASSERT(dictionary->FindEntry(key) == kNotFound);
CALL_HEAP_FUNCTION(dictionary->GetIsolate(),
dictionary->Add(
key, *value, PropertyDetails(NONE, NORMAL, 0)),
UnseededNumberDictionary);
return Add(dictionary, key, value, PropertyDetails(NONE, NORMAL, 0));
}

16
src/objects.h
View File

@ -4064,7 +4064,7 @@ class Dictionary: public HashTable<Derived, Shape, Key> {
PretenureFlag pretenure = NOT_TENURED);
// Creates a new dictionary.
static Handle<Derived> New(
MUST_USE_RESULT static Handle<Derived> New(
Isolate* isolate,
int at_least_space_for,
PretenureFlag pretenure = NOT_TENURED);
@ -4089,9 +4089,11 @@ class Dictionary: public HashTable<Derived, Shape, Key> {
Object* value,
PropertyDetails details);
MUST_USE_RESULT MaybeObject* Add(Key key,
Object* value,
PropertyDetails details);
MUST_USE_RESULT static Handle<Derived> Add(
Handle<Derived> dictionary,
Key key,
Handle<Object> value,
PropertyDetails details);
protected:
// Generic at put operation.
@ -4153,12 +4155,6 @@ class NameDictionary: public Dictionary<NameDictionary,
// TODO(ishell): Remove this when all the callers are handlified.
int FindEntry(Name* key);
// TODO(mstarzinger): Temporary wrapper until handlified.
static Handle<NameDictionary> AddNameEntry(Handle<NameDictionary> dict,
Handle<Name> name,
Handle<Object> value,
PropertyDetails details);
};

2
src/runtime.cc
View File

@ -15125,7 +15125,7 @@ void Runtime::InitializeIntrinsicFunctionNames(Isolate* isolate,
for (int i = 0; i < kNumFunctions; ++i) {
const char* name = kIntrinsicFunctions[i].name;
if (name == NULL) continue;
Handle<NameDictionary> new_dict = NameDictionary::AddNameEntry(
Handle<NameDictionary> new_dict = NameDictionary::Add(
dict,
isolate->factory()->InternalizeUtf8String(name),
Handle<Smi>(Smi::FromInt(i), isolate),