Do not make objects in optimized code weak if collecting maps is disabled.

src/objects-inl.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Review notes:
 //
 // - The use of macros in these inline functions may seem superfluous
 // but it is absolutely needed to make sure gcc generates optimal
 // code. gcc is not happy when attempting to inline too deep.
 //
@@ skipping 4789 matching lines @@
   return result;
 }
 
 
 Object* Code::GetObjectFromEntryAddress(Address location_of_address) {
   return HeapObject::
       FromAddress(Memory::Address_at(location_of_address) - Code::kHeaderSize);
 }
 
 
 bool Code::IsWeakObjectInOptimizedCode(Object* object) {

[Igor Sheludko, 2014/04/29 12:22:56]

Probably it would be better to add
  if (!FLAG_collect_maps ||
      !FLAG_weak_embedded_objects_in_optimized_code) {
    return false;
  }
here and remove these checks from the code below.

[ulan, 2014/04/29 12:26:17]

Moved the common check "if (!FLAG_collect_maps) return false" up.

   if (object->IsMap()) {
     return Map::cast(object)->CanTransition() &&
            FLAG_collect_maps &&
            FLAG_weak_embedded_maps_in_optimized_code;
   }
   if (object->IsJSObject() ||
       (object->IsCell() && Cell::cast(object)->value()->IsJSObject())) {
-    return FLAG_weak_embedded_objects_in_optimized_code;
+    return FLAG_collect_maps &&
+           FLAG_weak_embedded_objects_in_optimized_code;
   }
   return false;
 }
 
 
 class Code::FindAndReplacePattern {
  public:
   FindAndReplacePattern() : count_(0) { }
   void Add(Handle<Map> map_to_find, Handle<Object> obj_to_replace) {
     ASSERT(count_ < kMaxCount);
@@ skipping 2153 matching lines @@
 #undef READ_SHORT_FIELD
 #undef WRITE_SHORT_FIELD
 #undef READ_BYTE_FIELD
 #undef WRITE_BYTE_FIELD
 #undef NOBARRIER_READ_BYTE_FIELD
 #undef NOBARRIER_WRITE_BYTE_FIELD
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_INL_H_