Mercurial > hg > truffle

diff src/share/vm/runtime/arguments.cpp @ 1060:323bd24c6520

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6769124: various 64-bit fixes for c1 Reviewed-by: never
author roland
date Mon, 02 Nov 2009 11:17:55 +0100
parents 354d3184f6b2
children fb4c00faa9da
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Fri Oct 30 16:22:59 2009 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Mon Nov 02 11:17:55 2009 +0100
@@ -1234,9 +1234,11 @@
   // Check that UseCompressedOops can be set with the max heap size allocated
   // by ergonomics.
   if (MaxHeapSize <= max_heap_for_compressed_oops()) {
+#ifndef COMPILER1
     if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) {
       FLAG_SET_ERGO(bool, UseCompressedOops, true);
     }
+#endif
 #ifdef _WIN64
     if (UseLargePages && UseCompressedOops) {
       // Cannot allocate guard pages for implicit checks in indexed addressing
@@ -2675,6 +2677,10 @@
     }
   }
 
+#if defined(_LP64) && defined(COMPILER1)
+  UseCompressedOops = false;
+#endif
+
 #ifdef SERIALGC
   set_serial_gc_flags();
 #endif // SERIALGC