Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 363:032ddb9432ad
Merge
author | apetrusenko |
---|---|
date | Wed, 17 Sep 2008 19:59:35 +0400 |
parents | 1ee8caae33af 93befa083681 |
children | b6cfd754403d |
comparison
equal
deleted
inserted
replaced
362:f8199438385b | 363:032ddb9432ad |
---|---|
1203 // FLAG_SET_ERGO(bool, UseCompressedOops, true); | 1203 // FLAG_SET_ERGO(bool, UseCompressedOops, true); |
1204 } else if (UseCompressedOops && UseG1GC) { | 1204 } else if (UseCompressedOops && UseG1GC) { |
1205 warning(" UseCompressedOops does not currently work with UseG1GC; switching off UseCompressedOops. "); | 1205 warning(" UseCompressedOops does not currently work with UseG1GC; switching off UseCompressedOops. "); |
1206 FLAG_SET_DEFAULT(UseCompressedOops, false); | 1206 FLAG_SET_DEFAULT(UseCompressedOops, false); |
1207 } | 1207 } |
1208 #ifdef _WIN64 | |
1209 if (UseLargePages && UseCompressedOops) { | |
1210 // Cannot allocate guard pages for implicit checks in indexed addressing | |
1211 // mode, when large pages are specified on windows. | |
1212 FLAG_SET_DEFAULT(UseImplicitNullCheckForNarrowOop, false); | |
1213 } | |
1214 #endif // _WIN64 | |
1208 } else { | 1215 } else { |
1209 if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) { | 1216 if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) { |
1210 warning("Max heap size too large for Compressed Oops"); | 1217 warning("Max heap size too large for Compressed Oops"); |
1211 FLAG_SET_DEFAULT(UseCompressedOops, false); | 1218 FLAG_SET_DEFAULT(UseCompressedOops, false); |
1212 } | 1219 } |