--- old/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java	2016-07-01 10:38:25.440928213 +0300
+++ new/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java	2016-07-01 10:38:25.135919129 +0300
@@ -133,6 +133,8 @@
                 if (defaultValue != null) {
                     memberDefaults.put(name, defaultValue);
                 }
+            } else {
+                throw new IllegalArgumentException(method + " has invalid modifier");                
             }
         }
 
--- /dev/null	2016-07-01 10:21:58.952446902 +0300
+++ new/test/java/lang/annotation/AnnotationVerifier.java	2016-07-01 10:38:26.021945516 +0300
@@ -0,0 +1,76 @@
+/*
+* 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.  Oracle designates this
+* particular file as subject to the "Classpath" exception as provided
+* by Oracle in the LICENSE file that accompanied this code.
+*
+* 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.
+*/
+
+import sun.reflect.annotation.AnnotationType;
+
+import java.lang.annotation.AnnotationFormatError;
+import java.util.function.Supplier;
+
+/*
+ * @test
+ * @bug 8158510
+ * @summary Verify valid annotation
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ * @modules java.base/sun.reflect.annotation
+ * @clean AnnoationWithVoidReturn.class AnnoationWithParameter.class AnnoationWithStaticModifier.class AnnoationWithPrivateModifier.class
+ * @compile -XDignore.symbol.file ClassFileGenerator.java
+ * @run main ClassFileGenerator
+ * @build AnnotationVerifier
+ * @run main AnnotationVerifier
+ */
+
+@AnnoationWithStaticModifier
+@AnnoationWithPrivateModifier
+@AnnoationWithParameter
+@AnnoationWithVoidReturn
+public class AnnotationVerifier {
+
+    public static void main(String[] args) throws Exception {
+        int failures = 0;
+        failures += expectAFE(() -> {return AnnotationType.getInstance(AnnoationWithParameter.class).toString(); });
+        failures += expectAFE(() -> {return AnnotationType.getInstance(AnnoationWithPrivateModifier.class).toString(); });
+        failures += expectAFE(() -> {return AnnotationType.getInstance(AnnoationWithStaticModifier.class).toString(); });
+        failures += expectAFE(() -> {return AnnotationVerifier.class.getAnnotation(AnnoationWithVoidReturn.class); });
+
+        if (failures > 0) {
+            System.err.println(failures + " failure(s) seen");
+            throw new RuntimeException();
+        }
+    }
+
+    private static int expectAFE(Supplier<Object> supplier) {
+        try {
+            Object o = supplier.get();
+            System.err.println("Failure: unexpected value seen: " + o);
+            return 1;
+        } catch (AnnotationFormatError afe) {
+            System.out.println(afe);
+            return 0;
+        } catch (IllegalArgumentException iae) {
+            System.out.println(iae);
+            return 0;
+        }
+    }
+}
--- /dev/null	2016-07-01 10:21:58.952446902 +0300
+++ new/test/java/lang/annotation/ClassFileGenerator.java	2016-07-01 10:38:26.642963970 +0300
@@ -0,0 +1,243 @@
+/*
+* 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.  Oracle designates this
+* particular file as subject to the "Classpath" exception as provided
+* by Oracle in the LICENSE file that accompanied this code.
+*
+* 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.
+*/
+
+/*
+ * Create class file using ASM, slightly modified the ASMifier output
+*/
+
+
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import jdk.internal.org.objectweb.asm.*;
+
+
+public class ClassFileGenerator {
+
+    public static void main(String... args) throws Exception {
+        classFileWriter("AnnoationWithVoidReturn.class", AnnoationWithVoidReturnDump.dump());
+        classFileWriter("AnnoationWithParameter.class", AnnoationWithParameterDump.dump());
+        classFileWriter("AnnoationWithStaticModifier.class", AnnoationWithStaticModifierDump.dump());
+        classFileWriter("AnnoationWithPrivateModifier.class", AnnoationWithPrivateModifierDump.dump());
+    }
+
+    private static void classFileWriter(String name, byte[] contents) throws IOException {
+        try (FileOutputStream fos = new FileOutputStream(new File(System.getProperty("test.classes"),
+                name))) {
+            fos.write(contents);
+        }
+    }
+
+    /*
+    Following code create equivalent classfile, 
+    which is not allowed by javac.
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface AnnoationWithVoidReturn {
+    void m() default 1;
+    }
+    */
+
+    private static class AnnoationWithVoidReturnDump implements Opcodes {
+        public static byte[] dump() throws Exception {
+            ClassWriter cw = new ClassWriter(0);
+            MethodVisitor mv;
+            AnnotationVisitor av0;
+
+            cw.visit(52, ACC_PUBLIC + ACC_ANNOTATION + ACC_ABSTRACT + +ACC_INTERFACE,
+                    "AnnoationWithVoidReturn", null,
+                    "java/lang/Object", new String[]{"java/lang/annotation/Annotation"});
+
+            {
+                av0 = cw.visitAnnotation("Ljava/lang/annotation/Retention;", true);
+                av0.visitEnum("value", "Ljava/lang/annotation/RetentionPolicy;",
+                        "RUNTIME");
+                av0.visitEnd();
+            }
+            {
+                mv = cw.visitMethod(ACC_PUBLIC + ACC_ABSTRACT, "m", "()V", null, null);
+                mv.visitEnd();
+            }
+            {
+                av0 = mv.visitAnnotationDefault();
+                av0.visit(null, new Integer(1));
+                av0.visitEnd();
+            }
+            cw.visitEnd();
+
+            return cw.toByteArray();
+
+        }
+    }
+
+    /*
+    Following code create equivalent classfile, 
+    which is not allowed by javac.
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface AnnoationWithParameter {
+       int m(int x);
+    }
+    */
+
+    private static class AnnoationWithParameterDump implements Opcodes {
+        public static byte[] dump() throws Exception {
+
+            ClassWriter cw = new ClassWriter(0);
+            MethodVisitor mv;
+            AnnotationVisitor av0;
+
+            cw.visit(52, ACC_PUBLIC + ACC_ANNOTATION + ACC_ABSTRACT + ACC_INTERFACE,
+                    "AnnoationWithParameter", null,
+                    "java/lang/Object", new String[]{"java/lang/annotation/Annotation"});
+
+            {
+                av0 = cw.visitAnnotation("Ljava/lang/annotation/Retention;", true);
+                av0.visitEnum("value", "Ljava/lang/annotation/RetentionPolicy;",
+                        "RUNTIME");
+                av0.visitEnd();
+            }
+            {
+                mv = cw.visitMethod(ACC_PUBLIC + ACC_ABSTRACT,
+                        "badValue",
+                        "(I)I", // Bad method with a parameter
+                        null, null);
+                mv.visitEnd();
+            }
+            {
+                av0 = mv.visitAnnotationDefault();
+                av0.visit(null, new Integer(-1));
+                av0.visitEnd();
+            }
+            cw.visitEnd();
+
+            return cw.toByteArray();
+        }
+    }
+
+    /*
+    Following code create equivalent classfile,
+    which is not allowed by javac.
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface AnnoationWithStaticModifier {
+        static int m() {
+            return 1;
+        }
+    }
+    */
+
+    private static class AnnoationWithStaticModifierDump implements Opcodes {
+        public static byte[] dump() throws Exception {
+            ClassWriter cw = new ClassWriter(0);
+            MethodVisitor mv;
+            AnnotationVisitor av0;
+
+            cw.visit(52, ACC_PUBLIC + ACC_ANNOTATION + ACC_ABSTRACT + ACC_INTERFACE,
+                    "AnnoationWithStaticModifier", null,
+                    "java/lang/Object", new String[]{"java/lang/annotation/Annotation"});
+
+            {
+                av0 = cw.visitAnnotation("Ljava/lang/annotation/Retention;", true);
+                av0.visitEnum("value", "Ljava/lang/annotation/RetentionPolicy;",
+                        "RUNTIME");
+                av0.visitEnd();
+            }
+            {
+                mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "m", "()I", null, null);
+                {
+                    av0 = mv.visitAnnotationDefault();
+                    av0.visit(null, new Integer(1));
+                    av0.visitEnd();
+                }
+                mv.visitCode();
+                mv.visitInsn(ICONST_M1);
+                mv.visitInsn(IRETURN);
+                mv.visitMaxs(1, 1);
+                mv.visitEnd();
+            }
+            cw.visitEnd();
+
+            return cw.toByteArray();
+
+        }
+    }
+
+    /*
+    Following code create equivalent classfile, 
+    which is not allowed by javac.
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface AnnoationWithPrivateModifier {
+        private int m() {
+            return 1;
+        }
+    }
+    */
+
+    private static class AnnoationWithPrivateModifierDump implements Opcodes {
+        public static byte[] dump() throws Exception {
+            ClassWriter cw = new ClassWriter(0);
+            MethodVisitor mv;
+            AnnotationVisitor av0;
+
+            cw.visit(V1_8,
+                    ACC_PUBLIC + ACC_ANNOTATION + ACC_ABSTRACT + ACC_INTERFACE,
+                    "AnnoationWithPrivateModifier",
+                    null, "java/lang/Object",
+                    new String[]{"java/lang/annotation/Annotation"});
+
+            {
+                av0 = cw.visitAnnotation("Ljava/lang/annotation/Retention;", true);
+                av0.visitEnum("value", "Ljava/lang/annotation/RetentionPolicy;",
+                        "RUNTIME");
+                av0.visitEnd();
+            }
+            {
+
+                mv = cw.visitMethod(ACC_PRIVATE, // Bad modifier, not abstract
+                        "badMethod",
+                        "()I",
+                        null,
+                        null);
+                {
+                    av0 = mv.visitAnnotationDefault();
+                    av0.visit(null, new Integer(1));
+                    av0.visitEnd();
+                }
+
+                {
+                    mv.visitCode();
+                    mv.visitInsn(ICONST_M1);
+                    mv.visitInsn(IRETURN);
+                    mv.visitMaxs(1, 1);
+                    mv.visitEnd();
+                }
+                mv.visitEnd();
+            }
+            cw.visitEnd();
+
+            return cw.toByteArray();
+
+        }
+    }
+}