Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/bootstrapper.cc

Issue 10692185: Couple the enumeration index of a property to the size of the descriptor array where it first appea… (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Adding assert in Set Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/factory.cc » ('j') | src/objects.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/bootstrapper.cc
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index 54eb9b8a8f7ca9599f4d0131292022bccd1a887e..5ad444b57952e742cfd3c460a8524d02b7ee90b3 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -394,28 +394,23 @@ Handle<DescriptorArray> Genesis::ComputeFunctionInstanceDescriptor(
{ // Add length.
Handle<Foreign> f(factory()->NewForeign(&Accessors::FunctionLength));
- CallbacksDescriptor d(*factory()->length_symbol(), *f, attribs, index + 1);
- descriptors->Set(index, &d, witness);
- ++index;
+ CallbacksDescriptor d(*factory()->length_symbol(), *f, attribs);
+ descriptors->Append(index++, &d, witness);
}
{ // Add name.
Handle<Foreign> f(factory()->NewForeign(&Accessors::FunctionName));
- CallbacksDescriptor d(*factory()->name_symbol(), *f, attribs, index + 1);
- descriptors->Set(index, &d, witness);
- ++index;
+ CallbacksDescriptor d(*factory()->name_symbol(), *f, attribs);
+ descriptors->Append(index++, &d, witness);
}
{ // Add arguments.
Handle<Foreign> f(factory()->NewForeign(&Accessors::FunctionArguments));
- CallbacksDescriptor d(
- *factory()->arguments_symbol(), *f, attribs, index + 1);
- descriptors->Set(index, &d, witness);
- ++index;
+ CallbacksDescriptor d(*factory()->arguments_symbol(), *f, attribs);
+ descriptors->Append(index++, &d, witness);
}
{ // Add caller.
Handle<Foreign> f(factory()->NewForeign(&Accessors::FunctionCaller));
- CallbacksDescriptor d(*factory()->caller_symbol(), *f, attribs, index + 1);
- descriptors->Set(index, &d, witness);
- ++index;
+ CallbacksDescriptor d(*factory()->caller_symbol(), *f, attribs);
+ descriptors->Append(index++, &d, witness);
}
if (prototypeMode != DONT_ADD_PROTOTYPE) {
// Add prototype.
@@ -423,9 +418,8 @@ Handle<DescriptorArray> Genesis::ComputeFunctionInstanceDescriptor(
attribs = static_cast<PropertyAttributes>(attribs & ~READ_ONLY);
}
Handle<Foreign> f(factory()->NewForeign(&Accessors::FunctionPrototype));
- CallbacksDescriptor d(
- *factory()->prototype_symbol(), *f, attribs, index + 1);
- descriptors->Set(index, &d, witness);
+ CallbacksDescriptor d(*factory()->prototype_symbol(), *f, attribs);
+ descriptors->Append(index, &d, witness);
}
descriptors->Sort(witness);
@@ -545,29 +539,23 @@ Handle<DescriptorArray> Genesis::ComputeStrictFunctionInstanceDescriptor(
int index = 0;
{ // Add length.
Handle<Foreign> f(factory()->NewForeign(&Accessors::FunctionLength));
- CallbacksDescriptor d(*factory()->length_symbol(), *f, attribs, index + 1);
- descriptors->Set(index, &d, witness);
- ++index;
+ CallbacksDescriptor d(*factory()->length_symbol(), *f, attribs);
+ descriptors->Append(index++, &d, witness);
}
{ // Add name.
Handle<Foreign> f(factory()->NewForeign(&Accessors::FunctionName));
- CallbacksDescriptor d(*factory()->name_symbol(), *f, attribs, index + 1);
- descriptors->Set(index, &d, witness);
- ++index;
+ CallbacksDescriptor d(*factory()->name_symbol(), *f, attribs);
+ descriptors->Append(index++, &d, witness);
}
{ // Add arguments.
Handle<AccessorPair> arguments(factory()->NewAccessorPair());
- CallbacksDescriptor d(
- *factory()->arguments_symbol(), *arguments, attribs, index + 1);
- descriptors->Set(index, &d, witness);
- ++index;
+ CallbacksDescriptor d(*factory()->arguments_symbol(), *arguments, attribs);
+ descriptors->Append(index++, &d, witness);
}
{ // Add caller.
Handle<AccessorPair> caller(factory()->NewAccessorPair());
- CallbacksDescriptor d(
- *factory()->caller_symbol(), *caller, attribs, index + 1);
- descriptors->Set(index, &d, witness);
- ++index;
+ CallbacksDescriptor d(*factory()->caller_symbol(), *caller, attribs);
+ descriptors->Append(index++, &d, witness);
}
if (prototypeMode != DONT_ADD_PROTOTYPE) {
@@ -576,9 +564,8 @@ Handle<DescriptorArray> Genesis::ComputeStrictFunctionInstanceDescriptor(
attribs = static_cast<PropertyAttributes>(attribs | READ_ONLY);
}
Handle<Foreign> f(factory()->NewForeign(&Accessors::FunctionPrototype));
- CallbacksDescriptor d(
- *factory()->prototype_symbol(), *f, attribs, index + 1);
- descriptors->Set(index, &d, witness);
+ CallbacksDescriptor d(*factory()->prototype_symbol(), *f, attribs);
+ descriptors->Append(index, &d, witness);
}
descriptors->Sort(witness);
@@ -972,37 +959,29 @@ bool Genesis::InitializeGlobal(Handle<GlobalObject> inner_global,
// ECMA-262, section 15.10.7.1.
FieldDescriptor field(heap->source_symbol(),
JSRegExp::kSourceFieldIndex,
- final,
- index + 1);
- descriptors->Set(index, &field, witness);
- ++index;
+ final);
+ descriptors->Append(index++, &field, witness);
}
{
// ECMA-262, section 15.10.7.2.
FieldDescriptor field(heap->global_symbol(),
JSRegExp::kGlobalFieldIndex,
- final,
- index + 1);
- descriptors->Set(index, &field, witness);
- ++index;
+ final);
+ descriptors->Append(index++, &field, witness);
}
{
// ECMA-262, section 15.10.7.3.
FieldDescriptor field(heap->ignore_case_symbol(),
JSRegExp::kIgnoreCaseFieldIndex,
- final,
- index + 1);
- descriptors->Set(index, &field, witness);
- ++index;
+ final);
+ descriptors->Append(index++, &field, witness);
}
{
// ECMA-262, section 15.10.7.4.
FieldDescriptor field(heap->multiline_symbol(),
JSRegExp::kMultilineFieldIndex,
- final,
- index + 1);
- descriptors->Set(index, &field, witness);
- ++index;
+ final);
+ descriptors->Append(index++, &field, witness);
}
{
// ECMA-262, section 15.10.7.5.
@@ -1010,9 +989,8 @@ bool Genesis::InitializeGlobal(Handle<GlobalObject> inner_global,
static_cast<PropertyAttributes>(DONT_ENUM | DONT_DELETE);
FieldDescriptor field(heap->last_index_symbol(),
JSRegExp::kLastIndexFieldIndex,
- writable,
- index + 1);
- descriptors->Set(index, &field, witness);
+ writable);
+ descriptors->Append(index, &field, witness);
}
descriptors->Sort(witness);
@@ -1160,24 +1138,20 @@ bool Genesis::InitializeGlobal(Handle<GlobalObject> inner_global,
DescriptorArray::WhitenessWitness witness(*descriptors);
int index = 0;
{ // length
- FieldDescriptor d(*factory->length_symbol(), 0, DONT_ENUM, index + 1);
- descriptors->Set(index, &d, witness);
- ++index;
+ FieldDescriptor d(*factory->length_symbol(), 0, DONT_ENUM);
+ descriptors->Append(index++, &d, witness);
}
{ // callee
CallbacksDescriptor d(*factory->callee_symbol(),
*callee,
- attributes,
- index + 1);
- descriptors->Set(index, &d, witness);
- ++index;
+ attributes);
+ descriptors->Append(index++, &d, witness);
}
{ // caller
CallbacksDescriptor d(*factory->caller_symbol(),
*caller,
- attributes,
- index + 1);
- descriptors->Set(index, &d, witness);
+ attributes);
+ descriptors->Append(index++, &d, witness);
}
descriptors->Sort(witness);
@@ -1779,18 +1753,15 @@ bool Genesis::InstallNatives() {
{
FieldDescriptor index_field(heap()->index_symbol(),
JSRegExpResult::kIndexIndex,
- NONE,
- index + 1);
- reresult_descriptors->Set(index, &index_field, witness);
- ++index;
+ NONE);
+ reresult_descriptors->Append(index++, &index_field, witness);
}
{
FieldDescriptor input_field(heap()->input_symbol(),
JSRegExpResult::kInputIndex,
- NONE,
- index + 1);
- reresult_descriptors->Set(index, &input_field, witness);
+ NONE);
+ reresult_descriptors->Append(index, &input_field, witness);
}
reresult_descriptors->Sort(witness);
« no previous file with comments | « no previous file | src/factory.cc » ('j') | src/objects.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698