src/hotspot/share/runtime/arguments.cpp

rev 52017 : All changes for G1 GC moved from 'combined' repo folder
rev 52487 : Worked on comments from Sangheon, Stefan
rev 52488 : Merge
rev 52490 : Disabling compressedOops
rev 52494 : adding jtreg tests, whitebox api.
rev 52631 : Merge

*** 1620,1629 ****
--- 1620,1633 ----
    LP64_ONLY(return OopEncodingHeapMax - displacement_due_to_null_page);
    NOT_LP64(ShouldNotReachHere(); return 0);
  }
  
  void Arguments::set_use_compressed_oops() {
+ if (AllocateOldGenAt != NULL) {
+   FLAG_SET_ERGO(bool, UseCompressedOops, false);
+   return;
+ }
  #ifndef ZERO
  #ifdef _LP64
    // MaxHeapSize is not set up properly at this point, but
    // the only value that can override MaxHeapSize if we are
    // to use UseCompressedOops is InitialHeapSize.
*** 2060,2069 ****
--- 2064,2076 ----
    if (!FLAG_IS_DEFAULT(AllocateHeapAt)) {
      if ((UseNUMAInterleaving && !FLAG_IS_DEFAULT(UseNUMAInterleaving)) || (UseNUMA && !FLAG_IS_DEFAULT(UseNUMA))) {
        log_warning(arguments) ("NUMA support for Heap depends on the file system when AllocateHeapAt option is used.\n");
      }
    }
+ 
+   status = status && GCArguments::check_args_consistency();
+ 
    return status;
  }
  
  bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore,
    const char* option_type) {