src/share/vm/runtime/arguments.cpp

*** 1758,1768 ****
                                            CollectorPolicy::compute_heap_alignment());
  }
  
  bool Arguments::gc_selected() {
  #if INCLUDE_ALL_GCS
!   return UseSerialGC || UseParallelGC || UseParallelOldGC || UseConcMarkSweepGC || UseG1GC;
  #else
    return UseSerialGC;
  #endif // INCLUDE_ALL_GCS
  }
  
--- 1758,1768 ----
                                            CollectorPolicy::compute_heap_alignment());
  }
  
  bool Arguments::gc_selected() {
  #if INCLUDE_ALL_GCS
!   return UseSerialGC || UseParallelGC || UseParallelOldGC || UseConcMarkSweepGC || UseG1GC || UseEpsilonGC;
  #else
    return UseSerialGC;
  #endif // INCLUDE_ALL_GCS
  }
  
*** 2302,2311 ****
--- 2302,2312 ----
    uint i = 0;
    if (UseSerialGC)                       i++;
    if (UseConcMarkSweepGC)                i++;
    if (UseParallelGC || UseParallelOldGC) i++;
    if (UseG1GC)                           i++;
+   if (UseEpsilonGC)                      i++;
    if (i > 1) {
      jio_fprintf(defaultStream::error_stream(),
                  "Conflicting collector combinations in option list; "
                  "please refer to the release notes for the combinations "
                  "allowed\n");