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

Revert "Handlify Runtime::InitializeIntrinsicFunctionNames."

Browse Source 
This reverts r20718.

TBR=jarin@chromium.org

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20719 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
yangguo@chromium.org 2014-04-14 11:43:40 +00:00
parent 3a12bbe0fa
commit 8eaff70bed
6 changed files with 59 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/factory.cc
View File

@ -1318,6 +1318,17 @@ Handle<JSModule> Factory::NewJSModule(Handle<Context> context,
}
// TODO(mstarzinger): Temporary wrapper until handlified.
static Handle<NameDictionary> NameDictionaryAdd(Handle<NameDictionary> dict,
Handle<Name> name,
Handle<Object> value,
PropertyDetails details) {
CALL_HEAP_FUNCTION(dict->GetIsolate(),
dict->Add(*name, *value, details),
NameDictionary);
}
static Handle<GlobalObject> NewGlobalObjectFromMap(Isolate* isolate,
Handle<Map> map) {
CALL_HEAP_FUNCTION(isolate,
@ -1360,7 +1371,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::Add(dictionary, name, cell, d);
NameDictionaryAdd(dictionary, name, cell, d);
}
// Allocate the global object and initialize it with the backing store.

9
src/heap.cc
View File

@ -2996,6 +2996,10 @@ bool Heap::CreateInitialObjects() {
NameDictionary::Allocate(this, Runtime::kNumFunctions);
if (!maybe_obj->ToObject(&obj)) return false;
}
{ MaybeObject* maybe_obj = Runtime::InitializeIntrinsicFunctionNames(this,
obj);
if (!maybe_obj->ToObject(&obj)) return false;
}
set_intrinsic_function_names(NameDictionary::cast(obj));
{ MaybeObject* maybe_obj = AllocateInitialNumberStringCache();
@ -6176,11 +6180,6 @@ bool Heap::CreateHeapObjects() {
array_buffers_list_ = undefined_value();
allocation_sites_list_ = undefined_value();
weak_object_to_code_table_ = undefined_value();
HandleScope scope(isolate());
Runtime::InitializeIntrinsicFunctionNames(
isolate(), handle(intrinsic_function_names(), isolate()));
return true;
}

35
src/objects.cc
View File

@ -633,6 +633,17 @@ void JSObject::SetNormalizedProperty(Handle<JSObject> object,
}
// TODO(mstarzinger): Temporary wrapper until handlified.
static Handle<NameDictionary> NameDictionaryAdd(Handle<NameDictionary> dict,
Handle<Name> name,
Handle<Object> value,
PropertyDetails details) {
CALL_HEAP_FUNCTION(dict->GetIsolate(),
dict->Add(*name, *value, details),
NameDictionary);
}
void JSObject::SetNormalizedProperty(Handle<JSObject> object,
Handle<Name> name,
Handle<Object> value,
@ -653,7 +664,7 @@ void JSObject::SetNormalizedProperty(Handle<JSObject> object,
}
property_dictionary =
NameDictionary::Add(property_dictionary, name, store_value, details);
NameDictionaryAdd(property_dictionary, name, store_value, details);
object->set_properties(*property_dictionary);
return;
}
@ -1933,8 +1944,7 @@ void JSObject::AddSlowProperty(Handle<JSObject> object,
value = cell;
}
PropertyDetails details = PropertyDetails(attributes, NORMAL, 0);
Handle<NameDictionary> result =
NameDictionary::Add(dict, name, value, details);
Handle<NameDictionary> result = NameDictionaryAdd(dict, name, value, details);
if (*dict != *result) object->set_properties(*result);
}
@ -4493,7 +4503,7 @@ void JSObject::NormalizeProperties(Handle<JSObject> object,
Handle<Object> value(descs->GetConstant(i), isolate);
PropertyDetails d = PropertyDetails(
details.attributes(), NORMAL, i + 1);
dictionary = NameDictionary::Add(dictionary, key, value, d);
dictionary = NameDictionaryAdd(dictionary, key, value, d);
break;
}
case FIELD: {
@ -4502,7 +4512,7 @@ void JSObject::NormalizeProperties(Handle<JSObject> object,
object->RawFastPropertyAt(descs->GetFieldIndex(i)), isolate);
PropertyDetails d =
PropertyDetails(details.attributes(), NORMAL, i + 1);
dictionary = NameDictionary::Add(dictionary, key, value, d);
dictionary = NameDictionaryAdd(dictionary, key, value, d);
break;
}
case CALLBACKS: {
@ -4510,7 +4520,7 @@ void JSObject::NormalizeProperties(Handle<JSObject> object,
Handle<Object> value(descs->GetCallbacksObject(i), isolate);
PropertyDetails d = PropertyDetails(
details.attributes(), CALLBACKS, i + 1);
dictionary = NameDictionary::Add(dictionary, key, value, d);
dictionary = NameDictionaryAdd(dictionary, key, value, d);
break;
}
case INTERCEPTOR:
@ -14298,17 +14308,6 @@ template
int HashTable<SeededNumberDictionaryShape, uint32_t>::FindEntry(uint32_t);
Handle<NameDictionary> NameDictionary::Add(Handle<NameDictionary> dict,
Handle<Name> name,
Handle<Object> value,
PropertyDetails details) {
CALL_HEAP_FUNCTION(dict->GetIsolate(),
Handle<Dictionary>::cast(dict)->Add(
*name, *value, details),
NameDictionary);
}
Handle<Object> JSObject::PrepareSlowElementsForSort(
Handle<JSObject> object, uint32_t limit) {
CALL_HEAP_FUNCTION(object->GetIsolate(),
@ -14840,7 +14839,7 @@ Handle<PropertyCell> JSGlobalObject::EnsurePropertyCell(
isolate->factory()->the_hole_value());
PropertyDetails details(NONE, NORMAL, 0);
details = details.AsDeleted();
Handle<NameDictionary> dictionary = NameDictionary::Add(
Handle<NameDictionary> dictionary = NameDictionaryAdd(
handle(global->property_dictionary()), name, cell, details);
global->set_properties(*dictionary);
return cell;

6
src/objects.h
View File

@ -4093,12 +4093,6 @@ class NameDictionary: public Dictionary<NameDictionaryShape, Name*> {
// Find entry for key, otherwise return kNotFound. Optimized version of
// HashTable::FindEntry.
int FindEntry(Name* key);
// TODO(mstarzinger): Temporary wrapper until handlified.
static Handle<NameDictionary> Add(Handle<NameDictionary> dict,
Handle<Name> name,
Handle<Object> value,
PropertyDetails details);
};

32
src/runtime.cc
View File

@ -15089,21 +15089,31 @@ static const Runtime::Function kIntrinsicFunctions[] = {
#undef F
void Runtime::InitializeIntrinsicFunctionNames(Isolate* isolate,
Handle<NameDictionary> dict) {
ASSERT(dict->NumberOfElements() == 0);
HandleScope scope(isolate);
MaybeObject* Runtime::InitializeIntrinsicFunctionNames(Heap* heap,
Object* dictionary) {
ASSERT(dictionary != NULL);
ASSERT(NameDictionary::cast(dictionary)->NumberOfElements() == 0);
for (int i = 0; i < kNumFunctions; ++i) {
const char* name = kIntrinsicFunctions[i].name;
if (name == NULL) continue;
Handle<NameDictionary> new_dict = NameDictionary::Add(
dict,
isolate->factory()->InternalizeUtf8String(name),
Handle<Smi>(Smi::FromInt(i), isolate),
PropertyDetails(NONE, NORMAL, Representation::None()));
// The dictionary does not need to grow.
CHECK(new_dict.is_identical_to(dict));
Object* name_string;
{ MaybeObject* maybe_name_string =
heap->InternalizeUtf8String(name);
if (!maybe_name_string->ToObject(&name_string)) return maybe_name_string;
}
NameDictionary* name_dictionary = NameDictionary::cast(dictionary);
{ MaybeObject* maybe_dictionary = name_dictionary->Add(
String::cast(name_string),
Smi::FromInt(i),
PropertyDetails(NONE, NORMAL, Representation::None()));
if (!maybe_dictionary->ToObject(&dictionary)) {
// Non-recoverable failure. Calling code must restart heap
// initialization.
return maybe_dictionary;
}
}
}
return dictionary;
}

7
src/runtime.h
View File

@ -798,8 +798,11 @@ class Runtime : public AllStatic {
// Add internalized strings for all the intrinsic function names to a
// StringDictionary.
static void InitializeIntrinsicFunctionNames(Isolate* isolate,
Handle<NameDictionary> dict);
// Returns failure if an allocation fails. In this case, it must be
// retried with a new, empty StringDictionary, not with the same one.
// Alternatively, heap initialization can be completely restarted.
MUST_USE_RESULT static MaybeObject* InitializeIntrinsicFunctionNames(
Heap* heap, Object* dictionary);
// Get the intrinsic function with the given name, which must be internalized.
static const Function* FunctionForName(Handle<String> name);