Mercurial > hg > truffle
changeset 3344:0139aac70fb5
Merge
author | twisti |
---|---|
date | Wed, 04 May 2011 03:42:58 -0700 |
parents | 6ee92b277bc5 (current diff) e9b8ef09622a (diff) |
children | bad7ecd0b6ed |
files | |
diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Wed May 04 00:46:22 2011 -0700 +++ b/src/share/vm/runtime/arguments.cpp Wed May 04 03:42:58 2011 -0700 @@ -969,10 +969,10 @@ #ifndef ZERO // Turn these off for mixed and comp. Leave them on for Zero. if (FLAG_IS_DEFAULT(UseFastAccessorMethods)) { - UseFastAccessorMethods = mode == _int; + UseFastAccessorMethods = (mode == _int); } if (FLAG_IS_DEFAULT(UseFastEmptyMethods)) { - UseFastEmptyMethods = mode == _int; + UseFastEmptyMethods = (mode == _int); } #endif @@ -1987,6 +1987,9 @@ Arguments::_ClipInlining = ClipInlining; Arguments::_BackgroundCompilation = BackgroundCompilation; + // Setup flags for mixed which is the default + set_mode_flags(_mixed); + // Parse JAVA_TOOL_OPTIONS environment variable (if present) jint result = parse_java_tool_options_environment_variable(&scp, &scp_assembly_required); if (result != JNI_OK) {