archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Y. Srinivas Ramakrishna 2010-01-09 09:01:41 -08:00
commit c0174fb200
144 changed files with 4007 additions and 823 deletions
Download patch file Download diff file Expand all files Collapse all files

29
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -2715,6 +2715,15 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
}
ScavengeRootsInCode = 1;
}
#ifdef COMPILER2
if (EnableInvokeDynamic && DoEscapeAnalysis) {
// TODO: We need to find rules for invokedynamic and EA. For now,
// simply disable EA by default.
if (FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
DoEscapeAnalysis = false;
}
}
#endif
if (PrintGCDetails) {
// Turn on -verbose:gc options as well
@ -2735,6 +2744,15 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
// Set flags based on ergonomics.
set_ergonomics_flags();
#ifdef _LP64
// XXX JSR 292 currently does not support compressed oops.
if (EnableMethodHandles && UseCompressedOops) {
if (FLAG_IS_DEFAULT(UseCompressedOops) || FLAG_IS_ERGO(UseCompressedOops)) {
UseCompressedOops = false;
}
}
#endif // _LP64
// Check the GC selections again.
if (!check_gc_consistency()) {
return JNI_EINVAL;
@ -2771,9 +2789,16 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
set_aggressive_opts_flags();
#ifdef CC_INTERP
// Biased locking is not implemented with c++ interpreter
// Clear flags not supported by the C++ interpreter
FLAG_SET_DEFAULT(ProfileInterpreter, false);
FLAG_SET_DEFAULT(UseBiasedLocking, false);
#endif /* CC_INTERP */
LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false));
#endif // CC_INTERP
#ifdef ZERO
// Clear flags not supported by Zero
FLAG_SET_DEFAULT(TaggedStackInterpreter, false);
#endif // ZERO
#ifdef COMPILER2
if (!UseBiasedLocking || EmitSync != 0) {