Wed, 04 May 2011 03:42:58 -0700
Merge
1.1 --- a/src/share/vm/runtime/arguments.cpp Wed May 04 00:46:22 2011 -0700 1.2 +++ b/src/share/vm/runtime/arguments.cpp Wed May 04 03:42:58 2011 -0700 1.3 @@ -969,10 +969,10 @@ 1.4 #ifndef ZERO 1.5 // Turn these off for mixed and comp. Leave them on for Zero. 1.6 if (FLAG_IS_DEFAULT(UseFastAccessorMethods)) { 1.7 - UseFastAccessorMethods = mode == _int; 1.8 + UseFastAccessorMethods = (mode == _int); 1.9 } 1.10 if (FLAG_IS_DEFAULT(UseFastEmptyMethods)) { 1.11 - UseFastEmptyMethods = mode == _int; 1.12 + UseFastEmptyMethods = (mode == _int); 1.13 } 1.14 #endif 1.15 1.16 @@ -1987,6 +1987,9 @@ 1.17 Arguments::_ClipInlining = ClipInlining; 1.18 Arguments::_BackgroundCompilation = BackgroundCompilation; 1.19 1.20 + // Setup flags for mixed which is the default 1.21 + set_mode_flags(_mixed); 1.22 + 1.23 // Parse JAVA_TOOL_OPTIONS environment variable (if present) 1.24 jint result = parse_java_tool_options_environment_variable(&scp, &scp_assembly_required); 1.25 if (result != JNI_OK) {