Merge "Refactor the garbage collector driver (GarbageCollector::Run)."

diff --cc runtime/gc/collector/mark_sweep.cc
index 76a7410,3e5fbcd..9fe904c
--- 1/runtime/gc/collector/mark_sweep.cc
--- 2/runtime/gc/collector/mark_sweep.cc
+++ b/runtime/gc/collector/mark_sweep.cc
@@@ -145,17 -145,13 +145,17 @@@ void MarkSweep::ProcessReferences(Threa
                                 &MarkObjectCallback, &ProcessMarkStackPausedCallback, this);
  }
  
 -void MarkSweep::PreProcessReferences(Thread* self) {
 -  timings_.NewSplit("PreProcessReferences");
 -  GetHeap()->ProcessSoftReferences(timings_, clear_soft_references_, &IsMarkedCallback,
 -                                   &MarkObjectCallback, &ProcessMarkStackPausedCallback, this);
 +void MarkSweep::PreProcessReferences() {
 +  if (IsConcurrent()) {
 +    // No reason to do this for non-concurrent GC since pre processing soft references only helps
 +    // pauses.
 +    timings_.NewSplit("PreProcessReferences");
 +    GetHeap()->ProcessSoftReferences(timings_, clear_soft_references_, &IsMarkedCallback,
 +                                     &MarkObjectCallback, &ProcessMarkStackPausedCallback, this);
 +  }
  }
  
- bool MarkSweep::HandleDirtyObjectsPhase() {
+ void MarkSweep::HandleDirtyObjectsPhase() {
    TimingLogger::ScopedSplit split("(Paused)HandleDirtyObjectsPhase", &timings_);
    Thread* self = Thread::Current();
    Locks::mutator_lock_->AssertExclusiveHeld(self);

diff --cc runtime/gc/collector/mark_sweep.h
Simple merge

diff --cc runtime/gc/heap.cc
Simple merge

diff --cc runtime/gc/heap.h
Simple merge