Initial support for Java 14

Author: uschindler

build.xml

@@ -62,6 +62,7 @@
       <equals arg1="${-cleaned.specification.version}" arg2="11"/>
       <equals arg1="${-cleaned.specification.version}" arg2="12"/>
       <equals arg1="${-cleaned.specification.version}" arg2="13"/>
+      <equals arg1="${-cleaned.specification.version}" arg2="14"/>
     </or>
   </condition>
 

ivy.xml

@@ -17,7 +17,7 @@
 <!DOCTYPE ivy-module [
   <!ENTITY maven.version "2.0">
   <!ENTITY gradle.version "2.3">
-  <!ENTITY asm.version "7.2">
+  <!ENTITY asm.version "8.0">
   <!ENTITY jarjar.asm.version "5.2">
 ]>
 <ivy-module version="2.0">

src/main/docs/bundled-signatures.html

@@ -29,14 +29,14 @@ <h1>Bundled Signatures Documentation</h1>
 <li><strong><tt>jdk-unsafe-*</tt>:</strong> Signatures
 of &quot;unsafe&quot; methods that use default charset, default locale, or default timezone. For server applications it is very
 stupid to call those methods, as the results will definitely not what the user wants
-(for Java <tt>*</tt> = 1.6, 1.7, 1.8, 9, 10, 11, 12, 13; Ant / Maven / Gradle automatically add the compile Java version).</li>
+(for Java <tt>*</tt> = 1.6, 1.7, 1.8, 9, 10, 11, 12, 13, 14; Ant / Maven / Gradle automatically add the compile Java version).</li>
 
 <li><strong><tt>jdk-deprecated-*</tt>:</strong> This disallows all deprecated
-methods from the JDK (for Java <tt>*</tt> = 1.6, 1.7, 1.8, 9, 10, 11, 12, 13; Ant / Maven / Gradle automatically add the compile Java version).</li>
+methods from the JDK (for Java <tt>*</tt> = 1.6, 1.7, 1.8, 9, 10, 11, 12, 13, 14; Ant / Maven / Gradle automatically add the compile Java version).</li>
 
 <li><strong><tt>jdk-internal-*</tt>:</strong> Lists all internal packages of the JDK as of <code>Security.getProperty(&quot;package.access&quot;)</code>.
 Calling those methods will always trigger security manager and is completely forbidden from Java 9 on
-(for Java <tt>*</tt> = 1.6, 1.7, 1.8, 9, 10, 11, 12, 13; Ant / Maven / Gradle automatically add the compile Java version, <em>since forbiddenapis v2.1</em>).</li>
+(for Java <tt>*</tt> = 1.6, 1.7, 1.8, 9, 10, 11, 12, 13, 14; Ant / Maven / Gradle automatically add the compile Java version, <em>since forbiddenapis v2.1</em>).</li>
 
 <li><strong><tt>jdk-non-portable</tt>:</strong> Signatures of all non-portable (like <code>com.sun.management.HotSpotDiagnosticMXBean</code>)
 or internal runtime APIs (like <code>sun.misc.Unsafe</code>). This is a superset of <tt>jdk-internal</tt>.<br>

src/main/java/de/thetaphi/forbiddenapis/AsmUtils.java

@@ -179,7 +179,7 @@ private static byte[] readStream(final InputStream in) throws IOException {
   @SuppressWarnings("unused")
   public static ClassReader readAndPatchClass(InputStream in) throws IOException {
     final byte[] bytecode = readStream(in);
-    if (false) patchClassMajorVersion(bytecode, Opcodes.V10 + 1, Opcodes.V10);
+    if (false) patchClassMajorVersion(bytecode, Opcodes.V15 + 1, Opcodes.V15);
     return new ClassReader(bytecode);
   }
 

src/main/java/de/thetaphi/forbiddenapis/ClassScanner.java

@@ -35,6 +35,7 @@
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.RecordComponentVisitor;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.TypePath;
 import org.objectweb.asm.commons.Method;
@@ -63,7 +64,7 @@ public final class ClassScanner extends ClassVisitor implements Constants {
   boolean classSuppressed = false;
 
   public ClassScanner(RelatedClassLookup lookup, Signatures forbiddenSignatures, final Pattern suppressAnnotations) {
-    super(Opcodes.ASM7);
+    super(Opcodes.ASM8);
     this.lookup = lookup;
     this.forbiddenSignatures = forbiddenSignatures;
     this.suppressAnnotations = suppressAnnotations;
@@ -249,7 +250,7 @@ public FieldVisitor visitField(final int access, final String name, final String
     if (classSuppressed) {
       return null;
     }
-    return new FieldVisitor(Opcodes.ASM7) {
+    return new FieldVisitor(Opcodes.ASM8) {
       final boolean isDeprecated = (access & Opcodes.ACC_DEPRECATED) != 0;
       {
         // only check signature, if field is not synthetic
@@ -294,7 +295,7 @@ public MethodVisitor visitMethod(final int access, final String name, final Stri
     if (classSuppressed) {
       return null;
     }
-    return new MethodVisitor(Opcodes.ASM7) {
+    return new MethodVisitor(Opcodes.ASM8) {
       private final Method myself = new Method(name, desc);
       private final boolean isDeprecated = (access & Opcodes.ACC_DEPRECATED) != 0;
       private int lineNo = -1;
@@ -531,6 +532,39 @@ public void visitLineNumber(int lineNo, Label start) {
     };
   }
 
+  @Override
+  public RecordComponentVisitor visitRecordComponent(final String name, final String desc, final String signature) {
+    currentGroupId++;
+    if (classSuppressed) {
+      return null;
+    }
+    return new RecordComponentVisitor(Opcodes.ASM8) {
+      {
+        reportRecordComponentViolation(checkDescriptor(desc), "record component declaration");
+      }
+      
+      @Override
+      public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+        final Type type = Type.getType(desc);
+        maybeSuppressCurrentGroup(type);
+        reportRecordComponentViolation(checkAnnotationDescriptor(type, visible), "annotation on record component declaration");
+        return null;
+      }
+
+      @Override
+      public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) {
+        reportRecordComponentViolation(checkAnnotationDescriptor(Type.getType(desc), visible), "type annotation on record component declaration");
+        return null;
+      }
+      
+      private void reportRecordComponentViolation(String violation, String where) {
+        if (violation != null) {
+          violations.add(new ForbiddenViolation(currentGroupId, violation, String.format(Locale.ENGLISH, "%s of '%s'", where, name), -1));
+        }
+      }
+    };
+  }
+
   @Override
   public void visitEnd() {
     // fixup lambdas by assigning them the groupId where they were originally declared:

src/main/java/de/thetaphi/forbiddenapis/ClassSignature.java

@@ -52,7 +52,7 @@ public ClassSignature(final ClassReader classReader, boolean isRuntimeClass, boo
     final Set<Method> methods = new HashSet<Method>();
     final Set<String> fields = new HashSet<String>();
     final Set<String> signaturePolymorphicMethods = new HashSet<String>();
-    classReader.accept(new ClassVisitor(Opcodes.ASM7) {
+    classReader.accept(new ClassVisitor(Opcodes.ASM8) {
       @Override
       public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
         final Method m = new Method(name, desc);