# HG changeset patch
# User anoll
# Date 1393996533 28800
# Node ID 77ca9a58fbe840e3289938e6a3e20c4f213a2516
# Parent  27689a7550a8509bdd3fd209330e9ca7e84be110# Parent  81ccf2c854c738e0e67d9de8b594c978e8388fc2
Merge

diff -r 81ccf2c854c7 -r 77ca9a58fbe8 test/compiler/uncommontrap/TestSpecTrapClassUnloading.java
--- a/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java	Tue Mar 04 18:52:06 2014 -0800
+++ b/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java	Tue Mar 04 21:15:33 2014 -0800
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031752
  * @summary speculative traps need to be cleaned up at GC
- * @run main/othervm -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:+UnlockExperimentalVMOptions -XX:+UseTypeSpeculation -XX:TypeProfileLevel=222 -XX:CompileCommand=exclude,java.lang.reflect.Method::invoke -XX:CompileCommand=exclude,sun.reflect.DelegatingMethodAccessorImpl::invoke -Xmx1M TestSpecTrapClassUnloading
  *
  */