--- old/src/hotspot/share/classfile/defaultMethods.cpp	2019-10-08 18:52:55.000000000 -0700
+++ new/src/hotspot/share/classfile/defaultMethods.cpp	2019-10-08 18:52:55.000000000 -0700
@@ -862,7 +862,7 @@
     ConstantPool* cp = bpool->create_constant_pool(CHECK);
     if (cp != klass->constants()) {
       // Copy resolved anonymous class into new constant pool.
-      if (klass->is_unsafe_anonymous()) {
+      if (klass->is_unsafe_anonymous() || klass->is_hidden()) {
         cp->klass_at_put(klass->this_class_index(), klass);
       }
       klass->class_loader_data()->add_to_deallocate_list(klass->constants());