comparison src/share/vm/runtime/arguments.cpp @ 1161:1fc01a2425ce

Merge
author iveresov
date Tue, 12 Jan 2010 13:54:40 -0800
parents 0579c695832f 4e6abf09f540
children 99af867dfa05
comparison
equal deleted inserted replaced
1149:0579c695832f 1161:1fc01a2425ce
2647 IgnoreUnrecognizedVMOptions = true; 2647 IgnoreUnrecognizedVMOptions = true;
2648 } 2648 }
2649 if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) { 2649 if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
2650 IgnoreUnrecognizedVMOptions = false; 2650 IgnoreUnrecognizedVMOptions = false;
2651 } 2651 }
2652 if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
2653 CommandLineFlags::printFlags();
2654 vm_exit(0);
2655 }
2652 } 2656 }
2653 2657
2654 if (IgnoreUnrecognizedVMOptions) { 2658 if (IgnoreUnrecognizedVMOptions) {
2655 // uncast const to modify the flag args->ignoreUnrecognized 2659 // uncast const to modify the flag args->ignoreUnrecognized
2656 *(jboolean*)(&args->ignoreUnrecognized) = true; 2660 *(jboolean*)(&args->ignoreUnrecognized) = true;
2804 if (!UseBiasedLocking || EmitSync != 0) { 2808 if (!UseBiasedLocking || EmitSync != 0) {
2805 UseOptoBiasInlining = false; 2809 UseOptoBiasInlining = false;
2806 } 2810 }
2807 #endif 2811 #endif
2808 2812
2813 if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
2814 warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output");
2815 DebugNonSafepoints = true;
2816 }
2817
2809 if (PrintCommandLineFlags) { 2818 if (PrintCommandLineFlags) {
2810 CommandLineFlags::printSetFlags(); 2819 CommandLineFlags::printSetFlags();
2811 } 2820 }
2812 2821
2813 #ifdef ASSERT
2814 if (PrintFlagsFinal) { 2822 if (PrintFlagsFinal) {
2815 CommandLineFlags::printFlags(); 2823 CommandLineFlags::printFlags();
2816 } 2824 }
2817 #endif
2818 2825
2819 return JNI_OK; 2826 return JNI_OK;
2820 } 2827 }
2821 2828
2822 int Arguments::PropertyList_count(SystemProperty* pl) { 2829 int Arguments::PropertyList_count(SystemProperty* pl) {