src/share/vm/runtime/arguments.cpp

*** 1172,1182 ****
  #ifdef _LP64
    // Compressed Headers do not work with CMS, which uses a bit in the klass
    // field offset to determine free list chunk markers.
    // Check that UseCompressedOops can be set with the max heap size allocated
    // by ergonomics.
!   if (!UseConcMarkSweepGC && MaxHeapSize <= max_heap_for_compressed_oops()) {
      if (FLAG_IS_DEFAULT(UseCompressedOops)) {
        FLAG_SET_ERGO(bool, UseCompressedOops, true);
      }
    } else {
      if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) {
--- 1172,1182 ----
  #ifdef _LP64
    // Compressed Headers do not work with CMS, which uses a bit in the klass
    // field offset to determine free list chunk markers.
    // Check that UseCompressedOops can be set with the max heap size allocated
    // by ergonomics.
!   if (MaxHeapSize <= max_heap_for_compressed_oops()) {
      if (FLAG_IS_DEFAULT(UseCompressedOops)) {
        FLAG_SET_ERGO(bool, UseCompressedOops, true);
      }
    } else {
      if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) {