Merge bleeding_edge revision 3032 to trunk...

src/heap.cc

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;