diff -r cdffba164671 -r 3e5d28e6de32 src/hotspot/share/oops/constantPool.hpp
--- a/src/hotspot/share/oops/constantPool.hpp	Mon Aug 20 10:04:00 2018 +0200
+++ b/src/hotspot/share/oops/constantPool.hpp	Mon Aug 20 08:25:57 2018 -0400
@@ -271,7 +271,7 @@
     *int_at_addr(which) = name_index;
   }
 
-  // Anonymous class support:
+  // Unsafe anonymous class support:
   void klass_at_put(int class_index, int name_index, int resolved_klass_index, Klass* k, Symbol* name);
   void klass_at_put(int class_index, Klass* k);
 
@@ -455,7 +455,7 @@
   // A "pseudo-string" is an non-string oop that has found its way into
   // a String entry.
   // This can happen if the user patches a live
-  // object into a CONSTANT_String entry of an anonymous class.
+  // object into a CONSTANT_String entry of an unsafe anonymous class.
   // Method oops internally created for method handles may also
   // use pseudo-strings to link themselves to related metaobjects.