--- old/test/compiler/intrinsics/muladd/TestMulAdd.java 2016-04-07 18:57:10.750721292 -0400 +++ new/test/compiler/intrinsics/muladd/TestMulAdd.java 2016-04-07 18:57:10.558715875 -0400 @@ -28,7 +28,7 @@ * @summary Add C2 x86 intrinsic for BigInteger::mulAdd() method * * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch - * -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-UseSquareToLenIntrinsic -XX:-UseMultiplyToLenIntrinsic + * -XX:+IgnoreUnrecognizedVMOptions -XX:-UseSquareToLenIntrinsic -XX:-UseMultiplyToLenIntrinsic * -XX:CompileCommand=dontinline,TestMulAdd::main * -XX:CompileCommand=option,TestMulAdd::base_multiply,ccstr,DisableIntrinsic,_mulAdd * -XX:CompileCommand=option,java.math.BigInteger::multiply,ccstr,DisableIntrinsic,_mulAdd --- old/test/compiler/runtime/6859338/Test6859338.java 2016-04-07 18:57:10.758721518 -0400 +++ new/test/compiler/runtime/6859338/Test6859338.java 2016-04-07 18:57:10.574716325 -0400 @@ -27,7 +27,7 @@ * @bug 6859338 * @summary Assertion failure in sharedRuntime.cpp * - * @run main/othervm -Xcomp -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-InlineObjectHash -Xbatch -XX:-ProfileInterpreter Test6859338 + * @run main/othervm -Xcomp -XX:+IgnoreUnrecognizedVMOptions -XX:-InlineObjectHash -Xbatch -XX:-ProfileInterpreter Test6859338 */ public class Test6859338 { --- old/src/share/vm/c1/c1_globals.hpp 2016-04-07 18:57:10.758721518 -0400 +++ new/src/share/vm/c1/c1_globals.hpp 2016-04-07 18:57:10.574716325 -0400 @@ -176,7 +176,7 @@ product(bool, InlineSynchronizedMethods, true, \ "Inline synchronized methods") \ \ - diagnostic(bool, InlineNIOCheckIndex, true, \ + develop(bool, InlineNIOCheckIndex, true, \ "Intrinsify java.nio.Buffer.checkIndex") \ \ develop(bool, CanonicalizeNodes, true, \ --- old/src/share/vm/opto/c2_globals.hpp 2016-04-07 18:57:10.758721518 -0400 +++ new/src/share/vm/opto/c2_globals.hpp 2016-04-07 18:57:10.578716439 -0400 @@ -589,26 +589,26 @@ product(bool, BlockLayoutRotateLoops, true, \ "Allow back branches to be fall throughs in the block layour") \ \ - diagnostic(bool, InlineReflectionGetCallerClass, true, \ + develop(bool, InlineReflectionGetCallerClass, true, \ "inline sun.reflect.Reflection.getCallerClass(), known to be " \ "part of base library DLL") \ \ - diagnostic(bool, InlineObjectCopy, true, \ + develop(bool, InlineObjectCopy, true, \ "inline Object.clone and Arrays.copyOf[Range] intrinsics") \ \ - diagnostic(bool, SpecialStringCompareTo, true, \ + develop(bool, SpecialStringCompareTo, true, \ "special version of string compareTo") \ \ - diagnostic(bool, SpecialStringIndexOf, true, \ + develop(bool, SpecialStringIndexOf, true, \ "special version of string indexOf") \ \ - diagnostic(bool, SpecialStringEquals, true, \ + develop(bool, SpecialStringEquals, true, \ "special version of string equals") \ \ - diagnostic(bool, SpecialArraysEquals, true, \ + develop(bool, SpecialArraysEquals, true, \ "special version of Arrays.equals(char[],char[])") \ \ - diagnostic(bool, SpecialEncodeISOArray, true, \ + product(bool, SpecialEncodeISOArray, true, \ "special version of ISO_8859_1$Encoder.encodeISOArray") \ \ develop(bool, BailoutToInterpreterForThrows, false, \ @@ -710,22 +710,22 @@ diagnostic(bool, OptimizeExpensiveOps, true, \ "Find best control for expensive operations") \ \ - diagnostic(bool, UseMathExactIntrinsics, true, \ + product(bool, UseMathExactIntrinsics, true, \ "Enables intrinsification of various java.lang.Math functions") \ \ - diagnostic(bool, UseMultiplyToLenIntrinsic, false, \ + product(bool, UseMultiplyToLenIntrinsic, false, \ "Enables intrinsification of BigInteger.multiplyToLen()") \ \ - diagnostic(bool, UseSquareToLenIntrinsic, false, \ + product(bool, UseSquareToLenIntrinsic, false, \ "Enables intrinsification of BigInteger.squareToLen()") \ \ - diagnostic(bool, UseMulAddIntrinsic, false, \ + product(bool, UseMulAddIntrinsic, false, \ "Enables intrinsification of BigInteger.mulAdd()") \ \ - diagnostic(bool, UseMontgomeryMultiplyIntrinsic, false, \ + product(bool, UseMontgomeryMultiplyIntrinsic, false, \ "Enables intrinsification of BigInteger.montgomeryMultiply()") \ \ - diagnostic(bool, UseMontgomerySquareIntrinsic, false, \ + product(bool, UseMontgomerySquareIntrinsic, false, \ "Enables intrinsification of BigInteger.montgomerySquare()") \ \ product(bool, UseTypeSpeculation, true, \ --- old/src/share/vm/runtime/globals.hpp 2016-04-07 18:57:10.778722082 -0400 +++ new/src/share/vm/runtime/globals.hpp 2016-04-07 18:57:10.586716665 -0400 @@ -738,7 +738,7 @@ "Control whether SHA instructions can be used " \ "on SPARC, on ARM and on x86") \ \ - diagnostic(bool, UseGHASHIntrinsics, false, \ + product(bool, UseGHASHIntrinsics, false, \ "Use intrinsics for GHASH versions of crypto") \ \ product(size_t, LargePageSizeInBytes, 0, \ @@ -808,27 +808,27 @@ product(bool, UseInlineCaches, true, \ "Use Inline Caches for virtual calls ") \ \ - diagnostic(bool, InlineArrayCopy, true, \ + develop(bool, InlineArrayCopy, true, \ "Inline arraycopy native that is known to be part of " \ "base library DLL") \ \ - diagnostic(bool, InlineObjectHash, true, \ + develop(bool, InlineObjectHash, true, \ "Inline Object::hashCode() native that is known to be part " \ "of base library DLL") \ \ - diagnostic(bool, InlineNatives, true, \ + develop(bool, InlineNatives, true, \ "Inline natives that are known to be part of base library DLL") \ \ - diagnostic(bool, InlineMathNatives, true, \ + develop(bool, InlineMathNatives, true, \ "Inline SinD, CosD, etc.") \ \ - diagnostic(bool, InlineClassNatives, true, \ + develop(bool, InlineClassNatives, true, \ "Inline Class.isInstance, etc") \ \ - diagnostic(bool, InlineThreadNatives, true, \ + develop(bool, InlineThreadNatives, true, \ "Inline Thread.currentThread, etc") \ \ - diagnostic(bool, InlineUnsafeOps, true, \ + develop(bool, InlineUnsafeOps, true, \ "Inline memory ops (native methods) from Unsafe") \ \ product(bool, CriticalJNINatives, true, \ @@ -837,34 +837,34 @@ notproduct(bool, StressCriticalJNINatives, false, \ "Exercise register saving code in critical natives") \ \ - diagnostic(bool, UseAESIntrinsics, false, \ + product(bool, UseAESIntrinsics, false, \ "Use intrinsics for AES versions of crypto") \ \ - diagnostic(bool, UseAESCTRIntrinsics, false, \ + product(bool, UseAESCTRIntrinsics, false, \ "Use intrinsics for the paralleled version of AES/CTR crypto") \ \ - diagnostic(bool, UseSHA1Intrinsics, false, \ + product(bool, UseSHA1Intrinsics, false, \ "Use intrinsics for SHA-1 crypto hash function. " \ "Requires that UseSHA is enabled.") \ \ - diagnostic(bool, UseSHA256Intrinsics, false, \ + product(bool, UseSHA256Intrinsics, false, \ "Use intrinsics for SHA-224 and SHA-256 crypto hash functions. " \ "Requires that UseSHA is enabled.") \ \ - diagnostic(bool, UseSHA512Intrinsics, false, \ + product(bool, UseSHA512Intrinsics, false, \ "Use intrinsics for SHA-384 and SHA-512 crypto hash functions. " \ "Requires that UseSHA is enabled.") \ \ - diagnostic(bool, UseCRC32Intrinsics, false, \ + product(bool, UseCRC32Intrinsics, false, \ "use intrinsics for java.util.zip.CRC32") \ \ - diagnostic(bool, UseCRC32CIntrinsics, false, \ + product(bool, UseCRC32CIntrinsics, false, \ "use intrinsics for java.util.zip.CRC32C") \ \ - diagnostic(bool, UseAdler32Intrinsics, false, \ + product(bool, UseAdler32Intrinsics, false, \ "use intrinsics for java.util.zip.Adler32") \ \ - diagnostic(bool, UseVectorizedMismatchIntrinsic, false, \ + product(bool, UseVectorizedMismatchIntrinsic, false, \ "Enables intrinsification of ArraysSupport.vectorizedMismatch()") \ \ diagnostic(ccstrlist, DisableIntrinsic, "", \