# HG changeset patch
# User thartmann
# Date 1521704391 -3600
# Node ID d374b1634589cb90b06d43d0cbb3b0a41923c4fd
# Parent  45675142a18a7888882cc55c32326682dfd1b189
8199777: Deprecate -XX:+AggressiveOpts
Summary: Deprecate -XX:+AggressiveOpts and remove it from testing.
Reviewed-by: kvn, dholmes, shade

diff -r 45675142a18a -r d374b1634589 src/hotspot/share/runtime/arguments.cpp
--- a/src/hotspot/share/runtime/arguments.cpp	Wed Mar 21 20:15:00 2018 -0700
+++ b/src/hotspot/share/runtime/arguments.cpp	Thu Mar 22 08:39:51 2018 +0100
@@ -517,6 +517,7 @@
   { "PrintSafepointStatistics",     JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
   { "PrintSafepointStatisticsTimeout", JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
   { "PrintSafepointStatisticsCount",JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
+  { "AggressiveOpts",               JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
 
   // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
   { "DefaultMaxRAMFraction",        JDK_Version::jdk(8),  JDK_Version::undefined(), JDK_Version::undefined() },
diff -r 45675142a18a -r d374b1634589 src/hotspot/share/runtime/globals.hpp
--- a/src/hotspot/share/runtime/globals.hpp	Wed Mar 21 20:15:00 2018 -0700
+++ b/src/hotspot/share/runtime/globals.hpp	Thu Mar 22 08:39:51 2018 +0100
@@ -2653,7 +2653,7 @@
           "Inline allocations larger than this in doublewords must go slow")\
                                                                             \
   product(bool, AggressiveOpts, false,                                      \
-          "Enable aggressive optimizations - see arguments.cpp")            \
+          "(Deprecated) Enable aggressive optimizations - see arguments.cpp") \
                                                                             \
   product_pd(bool, CompactStrings,                                          \
           "Enable Strings to use single byte chars in backing store")       \
diff -r 45675142a18a -r d374b1634589 test/hotspot/jtreg/compiler/c2/Test7009359.java
--- a/test/hotspot/jtreg/compiler/c2/Test7009359.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/hotspot/jtreg/compiler/c2/Test7009359.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,11 @@
 /**
  * @test
  * @bug 7009359
- * @summary HS with -XX:+AggressiveOpts optimize new StringBuffer(null) so it does not throw NPE as expected
+ * @summary HS optimizes new StringBuffer(null) so it does not throw NPE as expected
  *
  * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+OptimizeStringConcat
- *      -XX:CompileCommand=dontinline,compiler.c2.Test7009359::stringmakerBUG
- *      compiler.c2.Test7009359
+ *                   -XX:CompileCommand=dontinline,compiler.c2.Test7009359::stringmakerBUG
+ *                   compiler.c2.Test7009359
  */
 
 package compiler.c2;
diff -r 45675142a18a -r d374b1634589 test/hotspot/jtreg/compiler/c2/cr6711117/Test.java
--- a/test/hotspot/jtreg/compiler/c2/cr6711117/Test.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/hotspot/jtreg/compiler/c2/cr6711117/Test.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,8 @@
  * @bug 6711117
  * @summary Assertion in 64bit server vm (flat != TypePtr::BOTTOM,"cannot alias-analyze an untyped ptr")
  *
- * @run main/othervm -Xcomp -XX:+IgnoreUnrecognizedVMOptions -XX:+AggressiveOpts
- *      -XX:+UseCompressedOops
- *       compiler.c2.cr6711117.Test
+ * @run main/othervm -Xcomp -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000
+ *                   -XX:+UseCompressedOops compiler.c2.cr6711117.Test
  */
 
 package compiler.c2.cr6711117;
diff -r 45675142a18a -r d374b1634589 test/hotspot/jtreg/compiler/codegen/Test6909839.java
--- a/test/hotspot/jtreg/compiler/codegen/Test6909839.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/hotspot/jtreg/compiler/codegen/Test6909839.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 6909839
  * @summary missing unsigned compare cases for some cmoves in sparc.ad
  *
- * @run main/othervm -XX:+AggressiveOpts -Xbatch compiler.codegen.Test6909839
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 -Xbatch compiler.codegen.Test6909839
  */
 
 package compiler.codegen;
diff -r 45675142a18a -r d374b1634589 test/hotspot/jtreg/compiler/escapeAnalysis/Test6689060.java
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/Test6689060.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/Test6689060.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
  * @bug 6689060
  * @summary Escape Analysis does not work with Compressed Oops
  *
- * @run main/othervm -Xbatch -XX:+AggressiveOpts
- *      -XX:CompileCommand=exclude,compiler.escapeAnalysis.Test6689060::dummy
- *      compiler.escapeAnalysis.Test6689060
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xbatch -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000
+ *                   -XX:CompileCommand=exclude,compiler.escapeAnalysis.Test6689060::dummy
+ *                   compiler.escapeAnalysis.Test6689060
  */
 
 package compiler.escapeAnalysis;
diff -r 45675142a18a -r d374b1634589 test/hotspot/jtreg/compiler/escapeAnalysis/Test6726999.java
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/Test6726999.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/Test6726999.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
  * @bug 6726999
  * @summary nsk/stress/jck12a/jck12a010 assert(n != NULL,"Bad immediate dominator info.");
  *
- * @run main/othervm -Xbatch -XX:+AggressiveOpts
- *      -XX:CompileCommand=exclude,compiler.escapeAnalysis.Test6726999::dummy
- *      compiler.escapeAnalysis.Test6726999
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xbatch -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000
+ *                   -XX:CompileCommand=exclude,compiler.escapeAnalysis.Test6726999::dummy
+ *                   compiler.escapeAnalysis.Test6726999
  */
 
 package compiler.escapeAnalysis;
diff -r 45675142a18a -r d374b1634589 test/hotspot/jtreg/compiler/escapeAnalysis/cr6716441/Tester.java
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/cr6716441/Tester.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/cr6716441/Tester.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
  * @bug 6716441
  * @summary error in meet with +DoEscapeAnalysis
  *
- * @run main/othervm -Xcomp -XX:+AggressiveOpts
- *      compiler.escapeAnalysis.cr6716441.Tester
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000
+ *                   compiler.escapeAnalysis.cr6716441.Tester
  */
 
 /* Complexity upper bound: 70070 ops */
diff -r 45675142a18a -r d374b1634589 test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java	Thu Mar 22 08:39:51 2018 +0100
@@ -51,6 +51,7 @@
         {"PrintSafepointStatistics",    "false"},
         {"PrintSafepointStatisticsCount", "3"},
         {"PrintSafepointStatisticsTimeout", "3"},
+        {"AggressiveOpts", "true"},
 
         // deprecated alias flags (see also aliased_jvm_flags):
         {"DefaultMaxRAMFraction", "4"},
diff -r 45675142a18a -r d374b1634589 test/jdk/java/lang/Integer/ValueOf.java
--- a/test/jdk/java/lang/Integer/ValueOf.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/jdk/java/lang/Integer/ValueOf.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,8 @@
  * @bug 6807702
  * @summary Basic test for Integer.valueOf
  * @run main ValueOf
- * @run main/othervm -esa -XX:+AggressiveOpts ValueOf
+ * @run main/othervm -esa -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox
+ *                   -XX:AutoBoxCacheMax=20000 ValueOf
  */
 
 public class ValueOf {
diff -r 45675142a18a -r d374b1634589 test/jdk/java/math/BigDecimal/DivideMcTests.java
--- a/test/jdk/java/math/BigDecimal/DivideMcTests.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/jdk/java/math/BigDecimal/DivideMcTests.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 7036582
  * @summary Some tests for the divide(..,MathContext) method.
  * @run main DivideMcTests
- * @run main/othervm -XX:+AggressiveOpts DivideMcTests
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 DivideMcTests
  * @author Sergey V. Kuksenko
  */
 
diff -r 45675142a18a -r d374b1634589 test/jdk/java/math/BigDecimal/FloatDoubleValueTests.java
--- a/test/jdk/java/math/BigDecimal/FloatDoubleValueTests.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/jdk/java/math/BigDecimal/FloatDoubleValueTests.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 6274390 7082971
  * @summary Verify {float, double}Value methods work with condensed representation
  * @run main FloatDoubleValueTests
- * @run main/othervm -XX:+AggressiveOpts FloatDoubleValueTests
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 FloatDoubleValueTests
  */
 import java.math.*;
 
diff -r 45675142a18a -r d374b1634589 test/jdk/java/math/BigDecimal/RangeTests.java
--- a/test/jdk/java/math/BigDecimal/RangeTests.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/jdk/java/math/BigDecimal/RangeTests.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 7036582
  * @summary Some new tests for the add method and constructor with MathContext.
  * @run main RangeTests
- * @run main/othervm -XX:+AggressiveOpts RangeTests
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 RangeTests
  * @author Sergey V. Kuksenko
  */
 
diff -r 45675142a18a -r d374b1634589 test/jdk/java/math/BigDecimal/StrippingZerosTest.java
--- a/test/jdk/java/math/BigDecimal/StrippingZerosTest.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/jdk/java/math/BigDecimal/StrippingZerosTest.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 4108852
  * @summary A few tests of stripTrailingZeros
  * @run main StrippingZerosTest
- * @run main/othervm -XX:+AggressiveOpts StrippingZerosTest
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 StrippingZerosTest
  * @author Joseph D. Darcy
  */
 
diff -r 45675142a18a -r d374b1634589 test/jdk/java/math/BigDecimal/ToPlainStringTests.java
--- a/test/jdk/java/math/BigDecimal/ToPlainStringTests.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/jdk/java/math/BigDecimal/ToPlainStringTests.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 4984872
  * @summary Basic tests of toPlainString method
  * @run main ToPlainStringTests
- * @run main/othervm -XX:+AggressiveOpts ToPlainStringTests
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 ToPlainStringTests
  * @author Joseph D. Darcy
  */
 
diff -r 45675142a18a -r d374b1634589 test/jdk/java/util/HashMap/HashMapCloneLeak.java
--- a/test/jdk/java/util/HashMap/HashMapCloneLeak.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/jdk/java/util/HashMap/HashMapCloneLeak.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary Verify that we do not leak contents when we clone a HashMap
  * @author david.buck@oracle.com
  * @run main/othervm HashMapCloneLeak
- * @run main/othervm -XX:+AggressiveOpts HashMapCloneLeak
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 HashMapCloneLeak
  */
 
 import java.util.HashMap;
diff -r 45675142a18a -r d374b1634589 test/jdk/java/util/NavigableMap/LockStep.java
--- a/test/jdk/java/util/NavigableMap/LockStep.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/jdk/java/util/NavigableMap/LockStep.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
  * @bug     6420753 6242436 6691185
  * @summary Compare NavigableMap implementations for identical behavior
  * @run main LockStep
- * @run main/othervm -XX:+AggressiveOpts LockStep
- * @run main/othervm -XX:+AggressiveOpts -Dthorough=true LockStep
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 LockStep
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 -Dthorough=true LockStep
  * @author  Martin Buchholz
  * @key randomness
  */