src/share/vm/runtime/arguments.cpp
Index
Unified diffs
Context diffs
Sdiffs
Wdiffs
Patch
New
Old
Previous File
Next File
*** old/src/share/vm/runtime/arguments.cpp Wed Dec 2 16:27:02 2009
--- new/src/share/vm/runtime/arguments.cpp Wed Dec 2 16:27:02 2009
*** 2697,2706 ****
--- 2697,2715 ----
if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true");
}
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
PrintGC = true;
if (FLAG_IS_DEFAULT(TraceClassUnloading)) {
*** 2720,2729 ****
--- 2729,2747 ----
#endif // KERNEL
// 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;
}
src/share/vm/runtime/arguments.cpp
Index
Unified diffs
Context diffs
Sdiffs
Wdiffs
Patch
New
Old
Previous File
Next File