*** old/src/share/vm/runtime/arguments.cpp	Thu Nov 25 07:06:13 2010
--- new/src/share/vm/runtime/arguments.cpp	Thu Nov 25 07:06:13 2010

*** 1003,1032 ****
--- 1003,1016 ----
      FLAG_SET_DEFAULT(UseSharedSpaces, false);
    }
  }
  
  void Arguments::check_compressed_oops_compat() {
  #ifdef _LP64
    assert(UseCompressedOops, "Precondition");
  #  if defined(COMPILER1) && !defined(TIERED)
    // Until c1 supports compressed oops turn them off.
    FLAG_SET_DEFAULT(UseCompressedOops, false);
  #  else
    // Is it on by default or set on ergonomically
    bool is_on_by_default = FLAG_IS_DEFAULT(UseCompressedOops) || FLAG_IS_ERGO(UseCompressedOops);
  
    // Tiered currently doesn't work with compressed oops
    if (TieredCompilation) {
      if (is_on_by_default) {
        FLAG_SET_DEFAULT(UseCompressedOops, false);
        return;
      } else {
        vm_exit_during_initialization(
          "Tiered compilation is not supported with compressed oops yet", NULL);
      }
    }
  
    // If dumping an archive or forcing its use, disable compressed oops if possible
    if (DumpSharedSpaces || RequireSharedSpaces) {
      if (is_on_by_default) {
        FLAG_SET_DEFAULT(UseCompressedOops, false);
        return;

*** 1036,1048 ****
--- 1020,1029 ----
      }
    } else if (UseSharedSpaces) {
      // UseSharedSpaces is on by default. With compressed oops, we turn it off.
      FLAG_SET_DEFAULT(UseSharedSpaces, false);
    }
  
  #  endif // defined(COMPILER1) && !defined(TIERED)
  #endif // _LP64
  }
  
  void Arguments::set_tiered_flags() {
    if (FLAG_IS_DEFAULT(CompilationPolicyChoice)) {
      FLAG_SET_DEFAULT(CompilationPolicyChoice, 2);

*** 3073,3087 ****
--- 3054,3066 ----
  #endif // KERNEL
  
    // Set flags based on ergonomics.
    set_ergonomics_flags();
  
  #ifdef _LP64
    if (UseCompressedOops) {
      check_compressed_oops_compat();
    }
  #endif
  
    // Check the GC selections again.
    if (!check_gc_consistency()) {
      return JNI_EINVAL;
    }