Revert of [heap] More flag cleanup.

src/debug/debug.cc

 // 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.
 
 #include "src/debug/debug.h"
 
 #include "src/api.h"
 #include "src/arguments.h"
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
@@ skipping 1291 matching lines @@
   }
 
   List<Handle<JSFunction> > functions;
   List<Handle<JSGeneratorObject> > suspended_generators;
 
   if (!shared->optimized_code_map()->IsSmi()) {
     shared->ClearOptimizedCodeMap();
   }
 
   // Make sure we abort incremental marking.
-  isolate_->heap()->CollectAllGarbage("prepare for break points",
-                                      Heap::kMakeHeapIterableMask);
+  isolate_->heap()->CollectAllGarbage(Heap::kMakeHeapIterableMask,
+                                      "prepare for break points");
 
   {
     HeapIterator iterator(isolate_->heap());
     HeapObject* obj;
     bool include_generators = shared->is_generator();
 
     while ((obj = iterator.next())) {
       if (obj->IsJSFunction()) {
         JSFunction* function = JSFunction::cast(obj);
         if (!function->Inlines(*shared)) continue;
@@ skipping 1289 matching lines @@
 }
 
 
 void LockingCommandMessageQueue::Clear() {
   base::LockGuard<base::Mutex> lock_guard(&mutex_);
   queue_.Clear();
 }
 
 }  // namespace internal
 }  // namespace v8