*** old/src/share/vm/runtime/globals.hpp	Fri Jun 10 17:18:56 2016
--- new/src/share/vm/runtime/globals.hpp	Fri Jun 10 17:18:56 2016

*** 4031,4040 ****
--- 4031,4045 ----
            "show method handle implementation frames (usually hidden)")      \
                                                                              \
    experimental(bool, TrustFinalNonStaticFields, false,                      \
            "trust final non-static declarations for constant folding")       \
                                                                              \
+   diagnostic(bool, CheckFinalFieldModifications, true,                      \
+           "Check that final fields are modified only in initializers. "     \
+           "For compatibility reasons, the check has an effect only "        \
+           "for classfile version >= 51")                                    \
+                                                                             \
    diagnostic(bool, FoldStableValues, true,                                  \
            "Optimize loads from stable fields (marked w/ @Stable)")          \
                                                                              \
    develop(bool, TraceInvokeDynamic, false,                                  \
            "trace internal invoke dynamic operations")                       \