Automatic merge of jdk:master into master

Author: duke

src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java

@@ -666,7 +666,7 @@ private void readObject(java.io.ObjectInputStream s)
                 if (!(memberType.isInstance(value) ||
                       value instanceof ExceptionProxy)) {
                     value = new AnnotationTypeMismatchExceptionProxy(
-                                objectToString(value))
+                                Objects.toIdentityString(value))
                         .setMember(annotationType.members().get(name));
                 }
             }
@@ -677,15 +677,6 @@ private void readObject(java.io.ObjectInputStream s)
         UnsafeAccessor.setMemberValues(this, mv);
     }
 
-    /*
-     * Create a textual representation of the argument without calling
-     * any overridable methods of the argument.
-     */
-    private static String objectToString(Object value) {
-        return value.getClass().getName() + "@" +
-            Integer.toHexString(System.identityHashCode(value));
-    }
-
     private static class UnsafeAccessor {
         private static final jdk.internal.misc.Unsafe unsafe
                 = jdk.internal.misc.Unsafe.getUnsafe();