--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java	Mon Feb 01 17:05:35 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java	Tue Feb 02 10:56:10 2010 -0800
@@ -744,6 +744,7 @@
                 out.writeByte(p.type_index);
                 break;
             case CLASS_LITERAL:
+            case CLASS_LITERAL_GENERIC_OR_ARRAY:
                 out.writeShort(p.offset);
                 break;
             // method parameter: not specified

--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java	Mon Feb 01 17:05:35 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java	Tue Feb 02 10:56:10 2010 -0800
@@ -139,6 +139,7 @@
             sb.append(type_index);
             break;
         case CLASS_LITERAL:
+        case CLASS_LITERAL_GENERIC_OR_ARRAY:
             sb.append(", offset = ");
             sb.append(offset);
             break;

--- a/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java	Mon Feb 01 17:05:35 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java	Tue Feb 02 10:56:10 2010 -0800
@@ -162,6 +162,7 @@
             print(pos.type_index);
             break;
         case CLASS_LITERAL:
+        case CLASS_LITERAL_GENERIC_OR_ARRAY:
             if (showOffsets) {
                 print(", offset=");
                 print(pos.offset);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javap/typeAnnotations/ArrayClassLiterals2.java	Tue Feb 02 10:56:10 2010 -0800
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6918625
+ * @summary javap dumps type information of array class literals
+ */
+
+import java.io.*;
+
+public class ArrayClassLiterals2 {
+    public static void main(String[] args) throws Exception {
+        new ArrayClassLiterals2().run();
+    }
+
+    public void run() throws IOException {
+        File classFile = new File(System.getProperty("test.classes"), "ArrayClassLiterals2$Test.class");
+
+        verify(classFile,
+               "RuntimeInvisibleTypeAnnotations:",
+               "CLASS_LITERAL_GENERIC_OR_ARRAY"
+               );
+
+        if (errors > 0)
+            throw new Error(errors + " found.");
+    }
+
+    String javap(File f) {
+        StringWriter sw = new StringWriter();
+        PrintWriter out = new PrintWriter(sw);
+        int rc = com.sun.tools.javap.Main.run(new String[] { "-v", f.getPath() }, out);
+        if (rc != 0)
+            throw new Error("javap failed. rc=" + rc);
+        out.close();
+        return sw.toString();
+    }
+
+    void verify(File classFile, String... expects) {
+        String output = javap(classFile);
+        for (String expect: expects) {
+            if (output.indexOf(expect)< 0)
+                error(expect + " not found");
+        }
+    }
+
+    void error(String msg) {
+        System.err.println(msg);
+        errors++;
+    }
+
+    int errors;
+
+
+    /*********************** Test class *************************/
+    static class Test {
+        @interface A { }
+        void test() {
+            Object a = @A String @A [] @A [].class;
+        }
+    }
+}