--- a/hotspot/src/share/vm/runtime/arguments.cpp	Tue Apr 05 19:16:52 2011 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Wed Apr 06 16:02:50 2011 -0700
@@ -962,6 +962,16 @@
   UseCompiler                = true;
   UseLoopCounter             = true;
 
+#ifndef ZERO
+  // Turn these off for mixed and comp.  Leave them on for Zero.
+  if (FLAG_IS_DEFAULT(UseFastAccessorMethods)) {
+    UseFastAccessorMethods = mode == _int;
+  }
+  if (FLAG_IS_DEFAULT(UseFastEmptyMethods)) {
+    UseFastEmptyMethods = mode == _int;
+  }
+#endif
+
   // Default values may be platform/compiler dependent -
   // use the saved values
   ClipInlining               = Arguments::_ClipInlining;

--- a/hotspot/src/share/vm/runtime/globals.hpp	Tue Apr 05 19:16:52 2011 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Wed Apr 06 16:02:50 2011 -0700
@@ -2726,10 +2726,10 @@
   product(bool, UseLoopCounter, true,                                       \
           "Increment invocation counter on backward branch")                \
                                                                             \
-  product(bool, UseFastEmptyMethods, false,                                 \
+  product(bool, UseFastEmptyMethods, true,                                  \
           "Use fast method entry code for empty methods")                   \
                                                                             \
-  product(bool, UseFastAccessorMethods, false,                              \
+  product(bool, UseFastAccessorMethods, true,                               \
           "Use fast method entry code for accessor methods")                \
                                                                             \
   product_pd(bool, UseOnStackReplacement,                                   \