--- old/src/java.base/share/classes/jdk/internal/reflect/AccessorGenerator.java	2019-05-15 13:57:57.635804449 -0400
+++ new/src/java.base/share/classes/jdk/internal/reflect/AccessorGenerator.java	2019-05-15 13:57:57.239802485 -0400
@@ -420,11 +420,17 @@
             return "[" + getClassName(c.getComponentType(), true);
         } else {
             if (addPrefixAndSuffixForNonPrimitiveTypes) {
-                if (unsafe.isValueType(c)) {
-                    return internalize('Q' + c.getName() + ";");
+                final String desc;
+                if (c.isInlineClass()) {
+                    if (c == c.asPrimaryType()) {
+                        desc = 'Q' + c.getName() + ";";
+                    } else {
+                        desc = 'L' + c.asPrimaryType().getName() + ";";
+                    }
                 } else {
-                    return internalize('L' + c.getName() + ";");
+                    desc = 'L' + c.getName() + ";";
                 }
+                return internalize(desc);
             } else {
                 return internalize(c.getName());
             }