Index: src/bootstrapper.cc |
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc |
index 6d388a56804ffa70aad7f0f861a54bba622e57df..ff40520a07516d853f3688e8385f205b27f944ae 100644 |
--- a/src/bootstrapper.cc |
+++ b/src/bootstrapper.cc |
@@ -378,7 +378,7 @@ static Handle<JSFunction> InstallFunction(Handle<JSObject> target, |
} else { |
attributes = DONT_ENUM; |
} |
- SetLocalPropertyNoThrow(target, symbol, function, attributes); |
+ JSObject::SetLocalPropertyNoThrow(target, symbol, function, attributes); |
if (is_ecma_native) { |
function->shared()->set_instance_class_name(*symbol); |
} |
@@ -600,7 +600,7 @@ Handle<JSFunction> Genesis::GetThrowTypeErrorFunction() { |
throw_type_error_function->shared()->set_code(*code); |
throw_type_error_function->shared()->DontAdaptArguments(); |
- PreventExtensions(throw_type_error_function); |
+ JSObject::PreventExtensions(throw_type_error_function); |
} |
return throw_type_error_function; |
} |
@@ -753,7 +753,7 @@ Handle<JSGlobalProxy> Genesis::CreateNewGlobals( |
Handle<JSObject> prototype = |
Handle<JSObject>( |
JSObject::cast(js_global_function->instance_prototype())); |
- SetLocalPropertyNoThrow( |
+ JSObject::SetLocalPropertyNoThrow( |
prototype, |
factory()->constructor_symbol(), |
isolate()->object_function(), |
@@ -863,8 +863,8 @@ void Genesis::InitializeGlobal(Handle<GlobalObject> inner_global, |
Heap* heap = isolate->heap(); |
Handle<String> object_name = Handle<String>(heap->Object_symbol()); |
- SetLocalPropertyNoThrow(inner_global, object_name, |
- isolate->object_function(), DONT_ENUM); |
+ JSObject::SetLocalPropertyNoThrow( |
+ inner_global, object_name, isolate->object_function(), DONT_ENUM); |
Handle<JSObject> global = Handle<JSObject>(global_context()->global()); |
@@ -1053,7 +1053,7 @@ void Genesis::InitializeGlobal(Handle<GlobalObject> inner_global, |
cons->SetInstanceClassName(*name); |
Handle<JSObject> json_object = factory->NewJSObject(cons, TENURED); |
ASSERT(json_object->IsJSObject()); |
- SetLocalPropertyNoThrow(global, name, json_object, DONT_ENUM); |
+ JSObject::SetLocalPropertyNoThrow(global, name, json_object, DONT_ENUM); |
global_context()->set_json_object(*json_object); |
} |
@@ -1083,12 +1083,10 @@ void Genesis::InitializeGlobal(Handle<GlobalObject> inner_global, |
global_context()->set_arguments_boilerplate(*result); |
// Note: length must be added as the first property and |
// callee must be added as the second property. |
- SetLocalPropertyNoThrow(result, factory->length_symbol(), |
- factory->undefined_value(), |
- DONT_ENUM); |
- SetLocalPropertyNoThrow(result, factory->callee_symbol(), |
- factory->undefined_value(), |
- DONT_ENUM); |
+ JSObject::SetLocalPropertyNoThrow(result, factory->length_symbol(), |
+ factory->undefined_value(), DONT_ENUM); |
+ JSObject::SetLocalPropertyNoThrow(result, factory->callee_symbol(), |
+ factory->undefined_value(), DONT_ENUM); |
#ifdef DEBUG |
LookupResult lookup(isolate); |
@@ -1183,9 +1181,8 @@ void Genesis::InitializeGlobal(Handle<GlobalObject> inner_global, |
global_context()->set_strict_mode_arguments_boilerplate(*result); |
// Add length property only for strict mode boilerplate. |
- SetLocalPropertyNoThrow(result, factory->length_symbol(), |
- factory->undefined_value(), |
- DONT_ENUM); |
+ JSObject::SetLocalPropertyNoThrow(result, factory->length_symbol(), |
+ factory->undefined_value(), DONT_ENUM); |
#ifdef DEBUG |
LookupResult lookup(isolate); |
@@ -1448,7 +1445,8 @@ bool Genesis::InstallNatives() { |
static_cast<PropertyAttributes>(READ_ONLY | DONT_DELETE); |
Handle<String> global_symbol = factory()->LookupAsciiSymbol("global"); |
Handle<Object> global_obj(global_context()->global()); |
- SetLocalPropertyNoThrow(builtins, global_symbol, global_obj, attributes); |
+ JSObject::SetLocalPropertyNoThrow( |
+ builtins, global_symbol, global_obj, attributes); |
// Setup the reference from the global object to the builtins object. |
JSGlobalObject::cast(global_context()->global())->set_builtins(*builtins); |
@@ -1920,17 +1918,17 @@ void Genesis::InstallSpecialObjects(Handle<Context> global_context) { |
if (FLAG_expose_natives_as != NULL && strlen(FLAG_expose_natives_as) != 0) { |
Handle<String> natives_string = |
factory->LookupAsciiSymbol(FLAG_expose_natives_as); |
- SetLocalPropertyNoThrow(js_global, natives_string, |
- Handle<JSObject>(js_global->builtins()), DONT_ENUM); |
+ JSObject::SetLocalPropertyNoThrow(js_global, natives_string, |
+ Handle<JSObject>(js_global->builtins()), |
+ DONT_ENUM); |
} |
Handle<Object> Error = GetProperty(js_global, "Error"); |
if (Error->IsJSObject()) { |
Handle<String> name = factory->LookupAsciiSymbol("stackTraceLimit"); |
- SetLocalPropertyNoThrow(Handle<JSObject>::cast(Error), |
- name, |
- Handle<Smi>(Smi::FromInt(FLAG_stack_trace_limit)), |
- NONE); |
+ JSObject::SetLocalPropertyNoThrow( |
+ Handle<JSObject>::cast(Error), name, |
+ Handle<Smi>(Smi::FromInt(FLAG_stack_trace_limit)), NONE); |
} |
#ifdef ENABLE_DEBUGGER_SUPPORT |
@@ -1949,7 +1947,8 @@ void Genesis::InstallSpecialObjects(Handle<Context> global_context) { |
Handle<String> debug_string = |
factory->LookupAsciiSymbol(FLAG_expose_debug_as); |
Handle<Object> global_proxy(debug->debug_context()->global_proxy()); |
- SetLocalPropertyNoThrow(js_global, debug_string, global_proxy, DONT_ENUM); |
+ JSObject::SetLocalPropertyNoThrow( |
+ js_global, debug_string, global_proxy, DONT_ENUM); |
} |
#endif |
} |
@@ -2165,7 +2164,8 @@ void Genesis::TransferNamedProperties(Handle<JSObject> from, |
Handle<String> key = Handle<String>(descs->GetKey(i)); |
int index = descs->GetFieldIndex(i); |
Handle<Object> value = Handle<Object>(from->FastPropertyAt(index)); |
- SetLocalPropertyNoThrow(to, key, value, details.attributes()); |
+ JSObject::SetLocalPropertyNoThrow( |
+ to, key, value, details.attributes()); |
break; |
} |
case CONSTANT_FUNCTION: { |
@@ -2173,7 +2173,7 @@ void Genesis::TransferNamedProperties(Handle<JSObject> from, |
Handle<String> key = Handle<String>(descs->GetKey(i)); |
Handle<JSFunction> fun = |
Handle<JSFunction>(descs->GetConstantFunction(i)); |
- SetLocalPropertyNoThrow(to, key, fun, details.attributes()); |
+ JSObject::SetLocalPropertyNoThrow(to, key, fun, details.attributes()); |
break; |
} |
case CALLBACKS: { |
@@ -2188,7 +2188,7 @@ void Genesis::TransferNamedProperties(Handle<JSObject> from, |
Handle<Object> callbacks(descs->GetCallbacksObject(i)); |
PropertyDetails d = |
PropertyDetails(details.attributes(), CALLBACKS, details.index()); |
- SetNormalizedProperty(to, key, callbacks, d); |
+ JSObject::SetNormalizedProperty(to, key, callbacks, d); |
break; |
} |
case MAP_TRANSITION: |
@@ -2225,7 +2225,7 @@ void Genesis::TransferNamedProperties(Handle<JSObject> from, |
value = Handle<Object>(JSGlobalPropertyCell::cast(*value)->value()); |
} |
PropertyDetails details = properties->DetailsAt(i); |
- SetLocalPropertyNoThrow(to, key, value, details.attributes()); |
+ JSObject::SetLocalPropertyNoThrow(to, key, value, details.attributes()); |
} |
} |
} |