# HG changeset patch
# User roland
# Date 1394102264 28800
# Node ID 84eafecdb9a96cdc34891fc02ca306b2bf31370f
# Parent  2dfa56e10640c2eea171b59104ba80ac0d0adde0# Parent  45b0159f30f2802d5f6279e47d6e1d3e3d896701
Merge

diff -r 2dfa56e10640 -r 84eafecdb9a9 src/share/vm/opto/c2_globals.hpp
--- a/src/share/vm/opto/c2_globals.hpp	Thu Mar 06 12:47:45 2014 +0400
+++ b/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,                 \
diff -r 2dfa56e10640 -r 84eafecdb9a9 test/compiler/types/TestMeetTopArrayExactConstantArray.java
--- a/test/compiler/types/TestMeetTopArrayExactConstantArray.java	Thu Mar 06 12:47:45 2014 +0400
+++ b/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
  *
  */
 
diff -r 2dfa56e10640 -r 84eafecdb9a9 test/compiler/types/TestSpeculationFailedHigherEqual.java
--- a/test/compiler/types/TestSpeculationFailedHigherEqual.java	Thu Mar 06 12:47:45 2014 +0400
+++ b/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
  *
  */
 
diff -r 2dfa56e10640 -r 84eafecdb9a9 test/compiler/types/TypeSpeculation.java
--- a/test/compiler/types/TypeSpeculation.java	Thu Mar 06 12:47:45 2014 +0400
+++ b/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
  *
  */
 
diff -r 2dfa56e10640 -r 84eafecdb9a9 test/compiler/uncommontrap/TestSpecTrapClassUnloading.java
--- a/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java	Thu Mar 06 12:47:45 2014 +0400
+++ b/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
  *
  */