Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 1135:e66fd840cb6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6893081: method handle & invokedynamic code needs additional cleanup (post 6815692, 6858164) Summary: During the work for 6829187 we have fixed a number of basic bugs which are logically grouped with 6815692 and 6858164 but which must be reviewed and pushed separately. Reviewed-by: kvn, never
author twisti
date Mon, 04 Jan 2010 18:38:08 +0100
parents 40e7c1d24e4a
children 0579c695832f f62a22282a47
comparison
equal deleted inserted replaced
1134:0910903272e5 1135:e66fd840cb6b
2697 if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) { 2697 if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
2698 warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true"); 2698 warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true");
2699 } 2699 }
2700 ScavengeRootsInCode = 1; 2700 ScavengeRootsInCode = 1;
2701 } 2701 }
2702 #ifdef COMPILER2
2703 if (EnableInvokeDynamic && DoEscapeAnalysis) {
2704 // TODO: We need to find rules for invokedynamic and EA. For now,
2705 // simply disable EA by default.
2706 if (FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
2707 DoEscapeAnalysis = false;
2708 }
2709 }
2710 #endif
2702 2711
2703 if (PrintGCDetails) { 2712 if (PrintGCDetails) {
2704 // Turn on -verbose:gc options as well 2713 // Turn on -verbose:gc options as well
2705 PrintGC = true; 2714 PrintGC = true;
2706 if (FLAG_IS_DEFAULT(TraceClassUnloading)) { 2715 if (FLAG_IS_DEFAULT(TraceClassUnloading)) {
2719 no_shared_spaces(); 2728 no_shared_spaces();
2720 #endif // KERNEL 2729 #endif // KERNEL
2721 2730
2722 // Set flags based on ergonomics. 2731 // Set flags based on ergonomics.
2723 set_ergonomics_flags(); 2732 set_ergonomics_flags();
2733
2734 #ifdef _LP64
2735 // XXX JSR 292 currently does not support compressed oops.
2736 if (EnableMethodHandles && UseCompressedOops) {
2737 if (FLAG_IS_DEFAULT(UseCompressedOops) || FLAG_IS_ERGO(UseCompressedOops)) {
2738 UseCompressedOops = false;
2739 }
2740 }
2741 #endif // _LP64
2724 2742
2725 // Check the GC selections again. 2743 // Check the GC selections again.
2726 if (!check_gc_consistency()) { 2744 if (!check_gc_consistency()) {
2727 return JNI_EINVAL; 2745 return JNI_EINVAL;
2728 } 2746 }