Enable --verify-heap in release mode

src/objects-inl.h

 // Copyright 2012 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:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 3624 matching lines @@
   SetNumberOfOwnDescriptors(len);
   return this;
 }
 
 
 SMI_ACCESSORS(Map, bit_field3, kBitField3Offset)
 
 
 void Map::ClearTransitions(Heap* heap, WriteBarrierMode mode) {
   Object* back_pointer = GetBackPointer();
-#ifdef DEBUG
-  Object* object = READ_FIELD(this, kTransitionsOrBackPointerOffset);
-  if (object->IsTransitionArray()) {
-    ZapTransitions();
-  } else {
-    ASSERT(object->IsMap() || object->IsUndefined());
+
+  // In release builds we only need to run this code if verify_heap is on.
+#ifndef DEBUG

[Michael Starzinger, 2012/10/11 12:42:46]

I think it would be useful to have a static inline function
Heap::ShouldZapGarbage() that captures this predicate so to not spread it out
across the entire code base.

[mvstanton1, 2012/10/12 08:40:50]

Done.

+  if (FLAG_verify_heap) {
+#endif
+    Object* object = READ_FIELD(this, kTransitionsOrBackPointerOffset);
+    if (object->IsTransitionArray()) {
+      ZapTransitions();
+    } else {
+      CHECK(object->IsMap() || object->IsUndefined());
+    }
+#ifndef DEBUG
   }
 #endif
+
   WRITE_FIELD(this, kTransitionsOrBackPointerOffset, back_pointer);
   CONDITIONAL_WRITE_BARRIER(
       heap, this, kTransitionsOrBackPointerOffset, back_pointer, mode);
 }
 
 
 void Map::AppendDescriptor(Descriptor* desc,
                            const DescriptorArray::WhitenessWitness& witness) {
   DescriptorArray* descriptors = instance_descriptors();
   int number_of_own_descriptors = NumberOfOwnDescriptors();
@@ skipping 108 matching lines @@
 
 TransitionArray* Map::transitions() {
   ASSERT(HasTransitionArray());
   Object* object = READ_FIELD(this, kTransitionsOrBackPointerOffset);
   return TransitionArray::cast(object);
 }
 
 
 void Map::set_transitions(TransitionArray* transition_array,
                           WriteBarrierMode mode) {
-#ifdef DEBUG
-  if (HasTransitionArray()) {
-    ASSERT(transitions() != transition_array);
-    ZapTransitions();
+  // In release mode, only run this code if verify_heap is on.
+#ifndef DEBUG

[Michael Starzinger, 2012/10/11 12:42:46]

Likewise.

[mvstanton1, 2012/10/12 08:40:50]

Done.

+  if (FLAG_verify_heap) {
+#endif
+    if (HasTransitionArray()) {
+      CHECK(transitions() != transition_array);
+      ZapTransitions();
+    }
+#ifndef DEBUG
   }
 #endif
 
   WRITE_FIELD(this, kTransitionsOrBackPointerOffset, transition_array);
   CONDITIONAL_WRITE_BARRIER(
       GetHeap(), this, kTransitionsOrBackPointerOffset, transition_array, mode);
 }
 
 
 void Map::init_back_pointer(Object* undefined) {
@@ skipping 1770 matching lines @@
 #undef WRITE_UINT32_FIELD
 #undef READ_SHORT_FIELD
 #undef WRITE_SHORT_FIELD
 #undef READ_BYTE_FIELD
 #undef WRITE_BYTE_FIELD
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_INL_H_