Mercurial > hg > truffle

diff src/share/vm/runtime/arguments.cpp @ 363:032ddb9432ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author apetrusenko
date Wed, 17 Sep 2008 19:59:35 +0400
parents 1ee8caae33af 93befa083681
children b6cfd754403d
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Wed Sep 17 16:49:18 2008 +0400
+++ b/src/share/vm/runtime/arguments.cpp	Wed Sep 17 19:59:35 2008 +0400
@@ -1205,6 +1205,13 @@
       warning(" UseCompressedOops does not currently work with UseG1GC; switching off UseCompressedOops. ");
       FLAG_SET_DEFAULT(UseCompressedOops, false);
     }
+#ifdef _WIN64
+    if (UseLargePages && UseCompressedOops) {
+      // Cannot allocate guard pages for implicit checks in indexed addressing
+      // mode, when large pages are specified on windows.
+      FLAG_SET_DEFAULT(UseImplicitNullCheckForNarrowOop, false);
+    }
+#endif //  _WIN64
   } else {
     if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) {
       warning("Max heap size too large for Compressed Oops");