--- old/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java	2016-05-29 18:05:56.046420615 -0700
+++ new/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java	2016-05-29 18:05:55.870332617 -0700
@@ -161,6 +161,9 @@
      * Translates a member value (in "dynamic proxy return form") into a string
      */
     private static String memberValueToString(Object value) {
+        if (value instanceof ExceptionProxy) {
+            return ((ExceptionProxy)value).memberToString();
+        }
         Class<?> type = value.getClass();
         if (!type.isArray())    // primitive, string, class, enum const,
                                 // or annotation
--- old/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java	2016-05-29 18:05:56.490642608 -0700
+++ new/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java	2016-05-29 18:05:56.298546610 -0700
@@ -56,4 +56,9 @@
     protected RuntimeException generateException() {
         return new AnnotationTypeMismatchException(member, foundType);
     }
+
+    @Override
+    public String memberToString() {
+        return "/* Type mismatch! \"" + foundType + "\" */" ;
+    }
 }
--- old/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java	2016-05-29 18:05:56.918856600 -0700
+++ new/src/java.base/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java	2016-05-29 18:05:56.726760604 -0700
@@ -45,4 +45,9 @@
     protected RuntimeException generateException() {
         return new EnumConstantNotPresentException(enumType, constName);
     }
+
+    @Override
+    public String memberToString() {
+        return constName + " /* Not present! */";
+    }
 }
--- old/src/java.base/share/classes/sun/reflect/annotation/ExceptionProxy.java	2016-05-29 18:05:57.331062594 -0700
+++ new/src/java.base/share/classes/sun/reflect/annotation/ExceptionProxy.java	2016-05-29 18:05:57.146970597 -0700
@@ -39,4 +39,8 @@
 public abstract class ExceptionProxy implements java.io.Serializable {
     private static final long serialVersionUID = 7241930048386631401L;
     protected abstract RuntimeException generateException();
+    /**
+     * String to use when printed out in an annotation
+     */
+    public abstract String memberToString();
 }
--- old/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java	2016-05-29 18:05:57.743268587 -0700
+++ new/src/java.base/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java	2016-05-29 18:05:57.567180591 -0700
@@ -45,4 +45,9 @@
     protected RuntimeException generateException() {
         return new TypeNotPresentException(typeName, cause);
     }
+
+    @Override
+    public String memberToString() {
+        return typeName + " /* Not present! */";
+    }
 }
--- /dev/null	2016-04-30 12:24:07.320478178 -0700
+++ new/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java	2016-05-29 18:05:57.991392584 -0700
@@ -0,0 +1,6 @@
+
+@DangerousAnnotation(utopia=Utopia.BRIGADOON,
+                     thirtyTwoBitsAreNotEnough=42,
+                     fleeting=@Fleeting(5))
+public class AnnotationHost {
+}
\ No newline at end of file
--- /dev/null	2016-04-30 12:24:07.320478178 -0700
+++ new/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java	2016-05-29 18:05:58.415604577 -0700
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug     5040830
+ * @summary Verify information annotation strings with exception proxies
+ * @compile -source 8 version1/Utopia.java version1/DangerousAnnotation.java version1/Fleeting.java 
+ * @compile  AnnotationHost.java
+ * @build ExceptionalToStringTest
+ * @run main ExceptionalToStringTest
+ * @clean Utopia DangerousAnnotation
+ * @compile -source 8 -implicit:none version2/Utopia.java
+ * @compile -source 8 -implicit:none version2/DangerousAnnotation.java
+ * @clean Fleeting
+ * @run main ExceptionalToStringTest
+ */
+
+// Version 1 of the source, extra enum constant, 
+
+// EnumConstantNotPresentException - "Thrown when an application tries
+// to access an enum constant by name and the enum type contains no
+// constant with the specified name."
+
+// AnnotationTypeMismatchException - "Thrown to indicate that a
+// program has attempted to access an element of an annotation whose
+// type has changed after the annotation was compiled (or serialized)"
+
+// TypeNotPresentException - "Thrown when an application tries to
+// access a type using a string representing the type's name, but no
+// definition for the type with the specified name can be found."
+
+public class ExceptionalToStringTest {
+    public static void main(String... args) {
+        System.out.println(AnnotationHost.class.getAnnotation(DangerousAnnotation.class));
+    }
+}
\ No newline at end of file
--- /dev/null	2016-04-30 12:24:07.320478178 -0700
+++ new/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java	2016-05-29 18:05:58.807800572 -0700
@@ -0,0 +1,8 @@
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DangerousAnnotation {
+    Utopia utopia();
+    int thirtyTwoBitsAreNotEnough();
+    Fleeting fleeting();
+}
--- /dev/null	2016-04-30 12:24:07.320478178 -0700
+++ new/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java	2016-05-29 18:05:59.199996565 -0700
@@ -0,0 +1,6 @@
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Fleeting {
+    int value();
+}
\ No newline at end of file
--- /dev/null	2016-04-30 12:24:07.320478178 -0700
+++ new/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java	2016-05-29 18:05:59.616204559 -0700
@@ -0,0 +1,4 @@
+public enum Utopia {
+    SHANGRI_LA,
+    BRIGADOON;  // Only there one day out of every 100 years.
+}
--- /dev/null	2016-04-30 12:24:07.320478178 -0700
+++ new/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java	2016-05-29 18:06:00.008400552 -0700
@@ -0,0 +1,7 @@
+import java.lang.annotation.*;
+ 
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DangerousAnnotation {
+    Utopia utopia();
+    long thirtyTwoBitsAreNotEnough();
+}
--- /dev/null	2016-04-30 12:24:07.320478178 -0700
+++ new/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java	2016-05-29 18:06:00.400596547 -0700
@@ -0,0 +1,4 @@
+public enum Utopia {
+    SHANGRI_LA;
+  //BRIGADOON -- Only there one day out of every 100 years.
+}