--- old/src/share/vm/runtime/globals.hpp 2015-08-19 12:40:21.727832310 -0400 +++ new/src/share/vm/runtime/globals.hpp 2015-08-19 12:40:21.619831775 -0400 @@ -650,10 +650,6 @@ experimental(bool, AlwaysSafeConstructors, false, \ "Force safe construction, as if all fields are final.") \ \ - /* Temporary: See 6948537 */ \ - experimental(bool, UseMemSetInBOT, true, \ - "(Unstable) uses memset in BOT updates in GC code") \ - \ diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug, \ "Enable normal processing of flags relating to field diagnostics")\ \