--- old/src/hotspot/share/runtime/globals.hpp	Mon Oct  9 11:13:47 2017
+++ new/src/hotspot/share/runtime/globals.hpp	Mon Oct  9 11:13:46 2017
@@ -2478,6 +2478,12 @@
   LP64_ONLY(range(-1, max_intx/MICROUNITS))                                 \
   NOT_LP64(range(-1, max_intx))                                             \
                                                                             \
+  diagnostic(bool, EnableThreadSMRExtraValidityChecks, true,                \
+          "Enable Thread SMR extra validity checks")                        \
+                                                                            \
+  diagnostic(bool, EnableThreadSMRStatistics, true,                         \
+          "Enable Thread SMR Statistics")                                   \
+                                                                            \
   product(bool, Inline, true,                                               \
           "Enable inlining")                                                \
                                                                             \