Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/runtime/arguments.cpp	Tue Feb 25 13:52:37 2014 +0100
     1.2 +++ b/src/share/vm/runtime/arguments.cpp	Wed Mar 05 10:20:30 2014 +0100
     1.3 @@ -2463,7 +2463,7 @@
     1.4  #endif
     1.5  
     1.6    // TieredCompilation needs at least 2 compiler threads.
     1.7 -  const int num_min_compiler_threads = (TieredCompilation) ? 2 : 1;
     1.8 +  const int num_min_compiler_threads = (TieredCompilation && (TieredStopAtLevel >= CompLevel_full_optimization)) ? 2 : 1;
     1.9    status &=verify_min_value(CICompilerCount, num_min_compiler_threads, "CICompilerCount");
    1.10  
    1.11    return status;

     2.1 --- a/test/compiler/membars/DekkerTest.java	Tue Feb 25 13:52:37 2014 +0100
     2.2 +++ b/test/compiler/membars/DekkerTest.java	Wed Mar 05 10:20:30 2014 +0100
     2.3 @@ -25,9 +25,9 @@
     2.4   * @test
     2.5   * @bug 8007898
     2.6   * @summary Incorrect optimization of Memory Barriers in Matcher::post_store_load_barrier().
     2.7 - * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
     2.8 - * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
     2.9 - * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
    2.10 + * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:+StressGCM -XX:+StressLCM DekkerTest
    2.11 + * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:+StressGCM -XX:+StressLCM DekkerTest
    2.12 + * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:+StressGCM -XX:+StressLCM DekkerTest
    2.13   * @author Martin Doerr martin DOT doerr AT sap DOT com
    2.14   *
    2.15   * Run 3 times since the failure is intermittent.