--- a/hotspot/src/share/vm/runtime/globals.cpp	Mon Dec 19 10:57:53 2016 +0800
+++ b/hotspot/src/share/vm/runtime/globals.cpp	Thu May 04 14:32:37 2017 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -414,9 +414,10 @@
   return is_unlocked_ext();
 }
 
-void Flag::unlock_diagnostic() {
+void Flag::clear_diagnostic() {
   assert(is_diagnostic(), "sanity");
   _flags = Flags(_flags & ~KIND_DIAGNOSTIC);
+  assert(!is_diagnostic(), "sanity");
 }
 
 // Get custom message for this locked flag, or NULL if

--- a/hotspot/src/share/vm/runtime/globals.hpp	Mon Dec 19 10:57:53 2016 +0800
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Thu May 04 14:32:37 2017 -0400
@@ -276,7 +276,7 @@
   bool is_writeable_ext() const;
   bool is_external_ext() const;
 
-  void unlock_diagnostic();
+  void clear_diagnostic();
 
   Flag::MsgType get_locked_message(char*, int) const;
   void get_locked_message_ext(char*, int) const;