Before a scavenge collection in debug builds with ENABLE_SLOW_ASSERTS,...

src/heap.cc

Index: src/heap.cc
===================================================================
--- src/heap.cc	(revision 1890)
+++ src/heap.cc	(working copy)
@@ -554,26 +554,36 @@
     }
   }
 };
-#endif
 
-void Heap::Scavenge() {
-#ifdef DEBUG
-  if (FLAG_enable_slow_asserts) {
-    VerifyNonPointerSpacePointersVisitor v;
-    HeapObjectIterator it(code_space_);
-    while (it.has_next()) {
-      HeapObject* object = it.next();
-      if (object->IsCode()) {
-        Code::cast(object)->ConvertICTargetsFromAddressToObject();
-      }
+
+static void VerifyNonPointerSpacePointers() {

[Erik Corry, 2009/05/07 09:53:01]

If you move the flag test into this you and put an empty implementation in an
#else you can get rid of an intra-function ifdef at the cost of adding an
extra-function #else.  That seems like a clear style win to me.

[Kevin Millikin (Chromium), 2009/05/07 10:24:02]

Not a clear win.  I actually prefer seeing at the call site that nothing happens
unless in DEBUG and with --enable-slow-asserts.

+  // Verify that there are no pointers to new space in spaces where we
+  // do not expect them.
+  VerifyNonPointerSpacePointersVisitor v;
+  HeapObjectIterator code_it(Heap::code_space());
+  while (code_it.has_next()) {
+    HeapObject* object = code_it.next();
+    if (object->IsCode()) {
+      Code::cast(object)->ConvertICTargetsFromAddressToObject();
       object->Iterate(&v);
-      if (object->IsCode()) {
-        Code::cast(object)->ConvertICTargetsFromObjectToAddress();
-      }
+      Code::cast(object)->ConvertICTargetsFromObjectToAddress();
+    } else {
+      // If we find non-code objects in code space (e.g., free list
+      // nodes) we want to verify them as well.
+      object->Iterate(&v);
     }
   }
+
+  HeapObjectIterator data_it(Heap::old_data_space());
+  while (data_it.has_next()) data_it.next()->Iterate(&v);
+}
 #endif
 
+void Heap::Scavenge() {
+#ifdef DEBUG
+  if (FLAG_enable_slow_asserts) VerifyNonPointerSpacePointers();
+#endif
+
   gc_state_ = SCAVENGE;
 
   // Implements Cheney's copying algorithm