diff -r 151b990e3764 -r 9c260a6b6471 src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
--- a/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java	Mon Oct 22 14:41:51 2018 -0700
+++ b/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java	Mon Oct 22 17:00:04 2018 -0700
@@ -624,12 +624,12 @@
 
         static void setType(AnnotationInvocationHandler o,
                             Class<? extends Annotation> type) {
-            unsafe.putObject(o, typeOffset, type);
+            unsafe.putReference(o, typeOffset, type);
         }
 
         static void setMemberValues(AnnotationInvocationHandler o,
                                     Map<String, Object> memberValues) {
-            unsafe.putObject(o, memberValuesOffset, memberValues);
+            unsafe.putReference(o, memberValuesOffset, memberValues);
         }
     }
 }