[heap] More flag cleanup.

test/cctest/test-mementos.cc

 // Copyright 2014 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 45 matching lines @@
 TEST(Regress340063) {
   CcTest::InitializeVM();
   if (!i::FLAG_allocation_site_pretenuring) return;
   v8::HandleScope scope(CcTest::isolate());
 
   SetUpNewSpaceWithPoisonedMementoAtTop();
 
   // Call GC to see if we can handle a poisonous memento right after the
   // current new space top pointer.
   CcTest::i_isolate()->heap()->CollectAllGarbage(
-      Heap::kAbortIncrementalMarkingMask);
+      "Regress340063", Heap::kAbortIncrementalMarkingMask);
 }
 
 
 TEST(Regress470390) {
   CcTest::InitializeVM();
   if (!i::FLAG_allocation_site_pretenuring) return;
   v8::HandleScope scope(CcTest::isolate());
 
   SetUpNewSpaceWithPoisonedMementoAtTop();
 
   // Set the new space limit to be equal to the top.
   Address top = CcTest::i_isolate()->heap()->new_space()->top();
   *(CcTest::i_isolate()->heap()->new_space()->allocation_limit_address()) = top;
 
   // Call GC to see if we can handle a poisonous memento right after the
   // current new space top pointer.
   CcTest::i_isolate()->heap()->CollectAllGarbage(
-      Heap::kAbortIncrementalMarkingMask);
+      "Regress470390", Heap::kAbortIncrementalMarkingMask);
 }
 
 
 TEST(BadMementoAfterTopForceScavenge) {
   CcTest::InitializeVM();
   if (!i::FLAG_allocation_site_pretenuring) return;
   v8::HandleScope scope(CcTest::isolate());
 
   SetUpNewSpaceWithPoisonedMementoAtTop();
 
   // Force GC to test the poisoned memento handling
-  CcTest::i_isolate()->heap()->CollectGarbage(i::NEW_SPACE);
+  CcTest::i_isolate()->heap()->CollectGarbageNewSpace();
 }
 
 
 TEST(PretenuringCallNew) {
   CcTest::InitializeVM();
   if (!i::FLAG_allocation_site_pretenuring) return;
   if (!i::FLAG_pretenuring_call_new) return;
   if (i::FLAG_always_opt) return;
 
   v8::HandleScope scope(CcTest::isolate());
@@ skipping 23 matching lines @@
   AllocationMemento* memento =
       reinterpret_cast<AllocationMemento*>(memento_address + kHeapObjectTag);
   CHECK_EQ(memento->map(), heap->allocation_memento_map());
 
   // Furthermore, how many mementos did we create? The count should match
   // call_count. Note, that mementos are allocated during the inobject slack
   // tracking phase.
   AllocationSite* site = memento->GetAllocationSite();
   CHECK_EQ(call_count, site->pretenure_create_count()->value());
 }