# HG changeset patch
# User anoll
# Date 1394011612 28800
# Node ID 08adf1b5f2b633b4d6c4da2ca5c3e472e326e744
# Parent  a5f0657a16665254a7bd42d305ee32ba5f8a3be9# Parent  77ca9a58fbe840e3289938e6a3e20c4f213a2516
Merge

diff -r 77ca9a58fbe8 -r 08adf1b5f2b6 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Tue Mar 04 21:15:33 2014 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Wed Mar 05 01:26:52 2014 -0800
@@ -2409,7 +2409,7 @@
   status &= verify_interval(NmethodSweepActivity, 0, 2000, "NmethodSweepActivity");
 
   // TieredCompilation needs at least 2 compiler threads.
-  const int num_min_compiler_threads = (TieredCompilation) ? 2 : 1;
+  const int num_min_compiler_threads = (TieredCompilation && (TieredStopAtLevel >= CompLevel_full_optimization)) ? 2 : 1;
   status &=verify_min_value(CICompilerCount, num_min_compiler_threads, "CICompilerCount");
 
   return status;
diff -r 77ca9a58fbe8 -r 08adf1b5f2b6 test/compiler/membars/DekkerTest.java
--- a/test/compiler/membars/DekkerTest.java	Tue Mar 04 21:15:33 2014 -0800
+++ b/test/compiler/membars/DekkerTest.java	Wed Mar 05 01:26:52 2014 -0800
@@ -25,9 +25,9 @@
  * @test
  * @bug 8007898
  * @summary Incorrect optimization of Memory Barriers in Matcher::post_store_load_barrier().
- * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
- * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
- * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:+StressGCM -XX:+StressLCM DekkerTest
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:+StressGCM -XX:+StressLCM DekkerTest
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:+StressGCM -XX:+StressLCM DekkerTest
  * @author Martin Doerr martin DOT doerr AT sap DOT com
  *
  * Run 3 times since the failure is intermittent.