Reviewers: Mads Ager, Description: Merge r3768 from bleeding_edge to branches/1.3 to fix http://crbug.com/3867 regression.
Please review this at http://codereview.chromium.org/560012 SVN Base: http://v8.googlecode.com/svn/branches/1.3/ 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 =================================================================== --- test/mjsunit/regress/regress-crbug-3867.js (revision 3771) +++ test/mjsunit/regress/regress-crbug-3867.js (working copy) @@ -1,4 +1,4 @@ -// Copyright 2010 the V8 project authors. All rights reserved. +// Copyright 2009 the V8 project authors. All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are // met: Index: src/heap.cc =================================================================== --- src/heap.cc (revision 3771) +++ src/heap.cc (working copy) @@ -2297,8 +2297,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 3771) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 3 #define BUILD_NUMBER 18 -#define PATCH_LEVEL 21 +#define PATCH_LEVEL 22 #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
