diff -r 58b6bcd2ecac -r f62a5a399b21 hotspot/src/share/vm/runtime/globals.hpp
--- a/hotspot/src/share/vm/runtime/globals.hpp	Thu Nov 05 15:29:46 2015 +0100
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Thu Nov 05 16:35:21 2015 +0300
@@ -4262,9 +4262,6 @@
              "Use the FP register for holding the frame pointer "           \
              "and not as a general purpose register.")                      \
                                                                             \
-  diagnostic(bool, StringCharIntrinsics, true,                              \
-             "Inline String*.getChar/putChar intrinsics.")                  \
-                                                                            \
   diagnostic(bool, CheckIntrinsics, true,                                   \
              "When a class C is loaded, check that "                        \
              "(1) all intrinsics defined by the VM for class C are present "\