Mercurial > hg > truffle
diff src/share/vm/runtime/arguments.cpp @ 12280:9ed97b511b26
8024517: runtime/CDSCompressedKPtrs/XShareAuto.java failed with RuntimeException
Summary: Make sure CDS is off by default when running server compiler.
Reviewed-by: dholmes, coleenp
author | hseigel |
---|---|
date | Thu, 19 Sep 2013 11:04:23 -0400 |
parents | dfae98867ee8 |
children | 0f37d1badced |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Thu Sep 19 08:47:46 2013 +0200 +++ b/src/share/vm/runtime/arguments.cpp Thu Sep 19 11:04:23 2013 -0400 @@ -1096,6 +1096,7 @@ } } +#if defined(COMPILER2) || defined(_LP64) || !INCLUDE_CDS // Conflict: required to use shared spaces (-Xshare:on), but // incompatible command line options were chosen. @@ -1108,6 +1109,7 @@ FLAG_SET_DEFAULT(UseSharedSpaces, false); } } +#endif void Arguments::set_tiered_flags() { // With tiered, set default policy to AdvancedThresholdPolicy, which is 3. @@ -1492,16 +1494,18 @@ FLAG_SET_ERGO(bool, UseParallelGC, true); } } - // Shared spaces work fine with other GCs but causes bytecode rewriting - // to be disabled, which hurts interpreter performance and decreases - // server performance. On server class machines, keep the default - // off unless it is asked for. Future work: either add bytecode rewriting - // at link time, or rewrite bytecodes in non-shared methods. - if (!DumpSharedSpaces && !RequireSharedSpaces && - (FLAG_IS_DEFAULT(UseSharedSpaces) || !UseSharedSpaces)) { - no_shared_spaces(); - } } +#ifdef COMPILER2 + // Shared spaces work fine with other GCs but causes bytecode rewriting + // to be disabled, which hurts interpreter performance and decreases + // server performance. When -server is specified, keep the default off + // unless it is asked for. Future work: either add bytecode rewriting + // at link time, or rewrite bytecodes in non-shared methods. + if (!DumpSharedSpaces && !RequireSharedSpaces && + (FLAG_IS_DEFAULT(UseSharedSpaces) || !UseSharedSpaces)) { + no_shared_spaces(); + } +#endif #ifndef ZERO #ifdef _LP64