Reviewers: Mads Ager, Description: Merge bleeding_edge revision 3032 to trunk
BUG=483 TEST=mjsunit/regress/regress-483.js [email protected] Please review this at http://codereview.chromium.org/334007 SVN Base: http://v8.googlecode.com/svn/trunk/ Affected files: M src/heap.cc M src/version.cc A + test/mjsunit/regress/regress-483.js Index: test/mjsunit/regress/regress-483.js Index: src/heap.cc =================================================================== --- src/heap.cc (revision 3120) +++ src/heap.cc (working copy) @@ -2135,7 +2135,8 @@ // constructed without having these properties. ASSERT(in_object_properties <= Map::kMaxPreAllocatedPropertyFields); if (fun->shared()->has_only_this_property_assignments() && - fun->shared()->this_property_assignments_count() > 0) { + fun->shared()->this_property_assignments_count() > 0 && + fun->shared()->has_only_simple_this_property_assignments()) { int count = fun->shared()->this_property_assignments_count(); if (count > in_object_properties) { count = in_object_properties; Index: src/version.cc =================================================================== --- src/version.cc (revision 3120) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 3 #define BUILD_NUMBER 16 -#define PATCH_LEVEL 1 +#define PATCH_LEVEL 2 #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 -~----------~----~----~----~------~----~------~--~---
