--- a/hotspot/src/share/vm/c1/c1_globals.hpp	Fri May 06 18:08:01 2016 +0000
+++ b/hotspot/src/share/vm/c1/c1_globals.hpp	Mon May 09 01:21:55 2016 -0700
@@ -176,7 +176,7 @@
   product(bool, InlineSynchronizedMethods, true,                            \
           "Inline synchronized methods")                                    \
                                                                             \
-  develop(bool, InlineNIOCheckIndex, true,                                  \
+  diagnostic(bool, InlineNIOCheckIndex, true,                               \
           "Intrinsify java.nio.Buffer.checkIndex")                          \
                                                                             \
   develop(bool, CanonicalizeNodes, true,                                    \