--- old/src/hotspot/share/ci/ciField.cpp	2020-04-02 11:54:15.000000000 -0700
+++ new/src/hotspot/share/ci/ciField.cpp	2020-04-02 11:54:15.000000000 -0700
@@ -223,9 +223,9 @@
       holder->is_in_package("jdk/internal/foreign") || holder->is_in_package("jdk/incubator/foreign") ||
       holder->is_in_package("java/lang"))
     return true;
-  // Trust VM hidden and unsafe anonymous classes. They are created via Lookup.defineClass or
-  // the private API (jdk.internal.misc.Unsafe) and can't be serialized, so there is no hacking
-  // of finals going on with them.
+  // Trust hidden classes and VM unsafe anonymous classes. They are created via
+  // Lookup.defineHiddenClass or the private jdk.internal.misc.Unsafe API and
+  // can't be serialized, so there is no hacking of finals going on with them.
   if (holder->is_hidden() || holder->is_unsafe_anonymous())
     return true;
   // Trust final fields in all boxed classes