Reviewers: Mads Ager, Description: Merge r3768 from bleeding_edge to branches/2.0 to fix http://crbug.com/3867 regression.
Please review this at http://codereview.chromium.org/560011 SVN Base: http://v8.googlecode.com/svn/branches/2.0/ Affected files: M src/heap.cc M src/version.cc A + test/mjsunit/regress/regress-crbug-3867.js Index: test/mjsunit/regress/regress-crbug-3867.js Index: src/heap.cc =================================================================== --- src/heap.cc (revision 3768) +++ src/heap.cc (working copy) @@ -2398,8 +2398,10 @@ String* name = fun->shared()->GetThisPropertyAssignmentName(i); ASSERT(name->IsSymbol()); FieldDescriptor field(name, i, NONE); + field.SetEnumerationIndex(i); descriptors->Set(i, &field); } + descriptors->SetNextEnumerationIndex(count); descriptors->Sort(); map->set_instance_descriptors(descriptors); map->set_pre_allocated_property_fields(count); Index: src/version.cc =================================================================== --- src/version.cc (revision 3768) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 2 #define MINOR_VERSION 0 #define BUILD_NUMBER 6 -#define PATCH_LEVEL 5 +#define PATCH_LEVEL 6 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
