| Index: src/bootstrapper.cc
|
| diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
|
| index 62109b5ae5c2fa284600dbdb093e3b5594fa4a40..ef802ba987c8208a1a3559597c8029f450ed5c7b 100644
|
| --- a/src/bootstrapper.cc
|
| +++ b/src/bootstrapper.cc
|
| @@ -426,32 +426,31 @@ void Genesis::SetFunctionInstanceDescriptor(
|
| if (prototypeMode != DONT_ADD_PROTOTYPE) {
|
| prototype = factory()->NewForeign(&Accessors::FunctionPrototype);
|
| }
|
| - PropertyAttributes ro_attribs = static_cast<PropertyAttributes>(
|
| + PropertyAttributes attribs = static_cast<PropertyAttributes>(
|
| DONT_ENUM | DONT_DELETE | READ_ONLY);
|
| - PropertyAttributes roc_attribs = static_cast<PropertyAttributes>(
|
| - DONT_ENUM | READ_ONLY);
|
| map->set_instance_descriptors(*descriptors);
|
|
|
| { // Add length.
|
| - CallbacksDescriptor d(*factory()->length_string(), *length, roc_attribs);
|
| + CallbacksDescriptor d(*factory()->length_string(), *length, attribs);
|
| map->AppendDescriptor(&d, witness);
|
| }
|
| { // Add name.
|
| - CallbacksDescriptor d(*factory()->name_string(), *name, roc_attribs);
|
| + CallbacksDescriptor d(*factory()->name_string(), *name, attribs);
|
| map->AppendDescriptor(&d, witness);
|
| }
|
| { // Add arguments.
|
| - CallbacksDescriptor d(*factory()->arguments_string(), *args, ro_attribs);
|
| + CallbacksDescriptor d(*factory()->arguments_string(), *args, attribs);
|
| map->AppendDescriptor(&d, witness);
|
| }
|
| { // Add caller.
|
| - CallbacksDescriptor d(*factory()->caller_string(), *caller, ro_attribs);
|
| + CallbacksDescriptor d(*factory()->caller_string(), *caller, attribs);
|
| map->AppendDescriptor(&d, witness);
|
| }
|
| if (prototypeMode != DONT_ADD_PROTOTYPE) {
|
| // Add prototype.
|
| - PropertyAttributes attribs = (prototypeMode == ADD_WRITEABLE_PROTOTYPE)
|
| - ? static_cast<PropertyAttributes>(ro_attribs & ~READ_ONLY) : ro_attribs;
|
| + if (prototypeMode == ADD_WRITEABLE_PROTOTYPE) {
|
| + attribs = static_cast<PropertyAttributes>(attribs & ~READ_ONLY);
|
| + }
|
| CallbacksDescriptor d(*factory()->prototype_string(), *prototype, attribs);
|
| map->AppendDescriptor(&d, witness);
|
| }
|
| @@ -569,16 +568,14 @@ void Genesis::SetStrictFunctionInstanceDescriptor(
|
| static_cast<PropertyAttributes>(DONT_ENUM | DONT_DELETE);
|
| PropertyAttributes ro_attribs =
|
| static_cast<PropertyAttributes>(DONT_ENUM | DONT_DELETE | READ_ONLY);
|
| - PropertyAttributes roc_attribs =
|
| - static_cast<PropertyAttributes>(DONT_ENUM | READ_ONLY);
|
| map->set_instance_descriptors(*descriptors);
|
|
|
| { // Add length.
|
| - CallbacksDescriptor d(*factory()->length_string(), *length, roc_attribs);
|
| + CallbacksDescriptor d(*factory()->length_string(), *length, ro_attribs);
|
| map->AppendDescriptor(&d, witness);
|
| }
|
| { // Add name.
|
| - CallbacksDescriptor d(*factory()->name_string(), *name, roc_attribs);
|
| + CallbacksDescriptor d(*factory()->name_string(), *name, ro_attribs);
|
| map->AppendDescriptor(&d, witness);
|
| }
|
| { // Add arguments.
|
|
|