OpenJDK / jdk / hs
changeset 23209:da015b1dca01
Merge
| author | roland |
|---|---|
| date | Thu, 06 Mar 2014 02:37:44 -0800 |
| parents | fc39038d37dc 4c37d91b8b09 |
| children | 3dd7a99b8173 954e3a81da29 |
| files | |
| diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/opto/c2_globals.hpp Thu Mar 06 12:47:45 2014 +0400 +++ b/hotspot/src/share/vm/opto/c2_globals.hpp Thu Mar 06 02:37:44 2014 -0800 @@ -650,7 +650,7 @@ experimental(bool, ReplaceInParentMaps, false, \ "Propagate type improvements in callers of inlinee if possible") \ \ - experimental(bool, UseTypeSpeculation, false, \ + product(bool, UseTypeSpeculation, true, \ "Speculatively propagate types from profiles") \ \ diagnostic(bool, UseInlineDepthForSpeculativeTypes, true, \
--- a/hotspot/test/compiler/types/TestMeetTopArrayExactConstantArray.java Thu Mar 06 12:47:45 2014 +0400 +++ b/hotspot/test/compiler/types/TestMeetTopArrayExactConstantArray.java Thu Mar 06 02:37:44 2014 -0800 @@ -25,7 +25,7 @@ * @test * @bug 8027571 * @summary meet of TopPTR exact array with constant array is not symmetric - * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222 -XX:+UnlockExperimentalVMOptions -XX:+UseTypeSpeculation -XX:-BackgroundCompilation TestMeetTopArrayExactConstantArray + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation -XX:-BackgroundCompilation TestMeetTopArrayExactConstantArray * */
--- a/hotspot/test/compiler/types/TestSpeculationFailedHigherEqual.java Thu Mar 06 12:47:45 2014 +0400 +++ b/hotspot/test/compiler/types/TestSpeculationFailedHigherEqual.java Thu Mar 06 02:37:44 2014 -0800 @@ -25,7 +25,7 @@ * @test * @bug 8027422 * @summary type methods shouldn't always operate on speculative part - * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:TypeProfileLevel=222 -XX:+UnlockExperimentalVMOptions -XX:+UseTypeSpeculation -XX:-BackgroundCompilation TestSpeculationFailedHigherEqual + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation -XX:-BackgroundCompilation TestSpeculationFailedHigherEqual * */
--- a/hotspot/test/compiler/types/TypeSpeculation.java Thu Mar 06 12:47:45 2014 +0400 +++ b/hotspot/test/compiler/types/TypeSpeculation.java Thu Mar 06 02:37:44 2014 -0800 @@ -25,7 +25,7 @@ * @test * @bug 8024070 * @summary Test that type speculation doesn't cause incorrect execution - * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:TypeProfileLevel=222 -XX:+UnlockExperimentalVMOptions -XX:+UseTypeSpeculation TypeSpeculation + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation TypeSpeculation * */
--- a/hotspot/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java Thu Mar 06 12:47:45 2014 +0400 +++ b/hotspot/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java Thu Mar 06 02:37:44 2014 -0800 @@ -25,7 +25,7 @@ * @test * @bug 8031752 * @summary speculative traps need to be cleaned up at GC - * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:+UnlockExperimentalVMOptions -XX:+UseTypeSpeculation -XX:TypeProfileLevel=222 -XX:CompileCommand=exclude,java.lang.reflect.Method::invoke -XX:CompileCommand=exclude,sun.reflect.DelegatingMethodAccessorImpl::invoke -Xmx1M TestSpecTrapClassUnloading + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:+UseTypeSpeculation -XX:TypeProfileLevel=222 -XX:CompileCommand=exclude,java.lang.reflect.Method::invoke -XX:CompileCommand=exclude,sun.reflect.DelegatingMethodAccessorImpl::invoke -Xmx1M TestSpecTrapClassUnloading * */