# HG changeset patch
# User twisti
# Date 1304505778 25200
# Node ID 0139aac70fb540cfbd0d6897762b6edc5c529614
# Parent  6ee92b277bc5c6c16d1d0354c70dbeed1bc938e9# Parent  e9b8ef09622a95f0c170a91ccaacf6a64f2c3927
Merge

diff -r 6ee92b277bc5 -r 0139aac70fb5 src/share/vm/runtime/arguments.cpp
--- 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) {