Backport 67c4a0826babb55ce56acf2b3b289b51d9d5529e

Author: cushon

src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java

@@ -2216,6 +2216,12 @@ private TypeAnnotationSymbolVisitor(List<Attribute.TypeCompound> attributes) {
             this.attributes = attributes;
         }
 
+        /**
+         * A supertype_index value of 65535 specifies that the annotation appears on the superclass
+         * in an extends clause of a class declaration, see JVMS 4.7.20.1
+         */
+        public static final int SUPERCLASS_INDEX = 65535;
+
         @Override
         public Void visitClassSymbol(Symbol.ClassSymbol s, Void unused) {
             ClassType t = (ClassType) s.type;
@@ -2225,7 +2231,7 @@ public Void visitClassSymbol(Symbol.ClassSymbol s, Void unused) {
                 interfaces.add(addTypeAnnotations(itf, classExtends(i++)));
             }
             t.interfaces_field = interfaces.toList();
-            t.supertype_field = addTypeAnnotations(t.supertype_field, classExtends(65535));
+            t.supertype_field = addTypeAnnotations(t.supertype_field, classExtends(SUPERCLASS_INDEX));
             if (t.typarams_field != null) {
                 t.typarams_field =
                         rewriteTypeParameters(