Merged r16816 into trunk branch.

src/heap-inl.h

Index: src/heap-inl.h
diff --git a/src/heap-inl.h b/src/heap-inl.h
index 86aff1aa34f7d5c5b023bec97a20ed93ef392bef..4f1960386a50dfd48cba60de7c72d9cd1d0f1a4a 100644
--- a/src/heap-inl.h
+++ b/src/heap-inl.h
@@ -525,8 +525,8 @@ void Heap::ScavengeObject(HeapObject** p, HeapObject* object) {
     return;
   }
 
-  // TODO(hpayer): temporary debugging code for issue 284577.
-  CHECK(object->map() != object->GetHeap()->allocation_memento_map());
+  // AllocationMementos are unrooted and shouldn't survive a scavenge
+  ASSERT(object->map() != object->GetHeap()->allocation_memento_map());
   // Call the slow part of scavenge object.
   return ScavengeObjectSlow(p, object);
 }