Enable ASM8_EXPERIMENTAL for Java 14 record support

jhoeller · jhoeller · commit 10d47d4d2126 · 2020-03-23T18:00:59.000+01:00
Closes gh-24722
diff --git a/spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java b/spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java
@@ -76,9 +76,7 @@ public AnnotationVisitor(final int api, final AnnotationVisitor annotationVisito
         && api != Opcodes.ASM8_EXPERIMENTAL) {
       throw new IllegalArgumentException("Unsupported api " + api);
     }
-    if (api == Opcodes.ASM8_EXPERIMENTAL) {
-      Constants.checkAsm8Experimental(this);
-    }
+    // SPRING PATCH: no preview mode check for ASM 8 experimental
     this.api = api;
     this.av = annotationVisitor;
   }
diff --git a/spring-core/src/main/java/org/springframework/asm/ClassVisitor.java b/spring-core/src/main/java/org/springframework/asm/ClassVisitor.java
@@ -74,9 +74,7 @@ public ClassVisitor(final int api, final ClassVisitor classVisitor) {
         && api != Opcodes.ASM8_EXPERIMENTAL) {
       throw new IllegalArgumentException("Unsupported api " + api);
     }
-    if (api == Opcodes.ASM8_EXPERIMENTAL) {
-      Constants.checkAsm8Experimental(this);
-    }
+    // SPRING PATCH: no preview mode check for ASM 8 experimental
     this.api = api;
     this.cv = classVisitor;
   }
diff --git a/spring-core/src/main/java/org/springframework/asm/Constants.java b/spring-core/src/main/java/org/springframework/asm/Constants.java
@@ -27,11 +27,6 @@
 // THE POSSIBILITY OF SUCH DAMAGE.
 package org.springframework.asm;
 
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.regex.Pattern;
-
 /**
  * Defines additional JVM opcodes, access flags and constants which are not part of the ASM public
  * API.
@@ -61,8 +56,7 @@ final class Constants implements Opcodes {
   static final String RUNTIME_VISIBLE_ANNOTATIONS = "RuntimeVisibleAnnotations";
   static final String RUNTIME_INVISIBLE_ANNOTATIONS = "RuntimeInvisibleAnnotations";
   static final String RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS = "RuntimeVisibleParameterAnnotations";
-  static final String RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS =
-      "RuntimeInvisibleParameterAnnotations";
+  static final String RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = "RuntimeInvisibleParameterAnnotations";
   static final String RUNTIME_VISIBLE_TYPE_ANNOTATIONS = "RuntimeVisibleTypeAnnotations";
   static final String RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = "RuntimeInvisibleTypeAnnotations";
   static final String ANNOTATION_DEFAULT = "AnnotationDefault";
@@ -181,41 +175,4 @@ final class Constants implements Opcodes {
   static final int ASM_GOTO_W = 220;
 
   private Constants() {}
-
-  static void checkAsm8Experimental(final Object caller) {
-    Class<?> callerClass = caller.getClass();
-    String internalName = callerClass.getName().replace('.', '/');
-    if (!isWhitelisted(internalName)) {
-      checkIsPreview(callerClass.getClassLoader().getResourceAsStream(internalName + ".class"));
-    }
-  }
-
-  static boolean isWhitelisted(final String internalName) {
-    if (!internalName.startsWith("org/objectweb/asm/")) {
-      return false;
-    }
-    String member = "(Annotation|Class|Field|Method|Module|RecordComponent|Signature)";
-    return internalName.contains("Test$")
-        || Pattern.matches(
-            "org/objectweb/asm/util/Trace" + member + "Visitor(\\$.*)?", internalName)
-        || Pattern.matches(
-            "org/objectweb/asm/util/Check" + member + "Adapter(\\$.*)?", internalName);
-  }
-
-  static void checkIsPreview(final InputStream classInputStream) {
-    if (classInputStream == null) {
-      throw new IllegalStateException("Bytecode not available, can't check class version");
-    }
-    int minorVersion;
-    try (DataInputStream callerClassStream = new DataInputStream(classInputStream); ) {
-      callerClassStream.readInt();
-      minorVersion = callerClassStream.readUnsignedShort();
-    } catch (IOException ioe) {
-      throw new IllegalStateException("I/O error, can't check class version", ioe);
-    }
-    if (minorVersion != 0xFFFF) {
-      throw new IllegalStateException(
-          "ASM8_EXPERIMENTAL can only be used by classes compiled with --enable-preview");
-    }
-  }
 }
diff --git a/spring-core/src/main/java/org/springframework/asm/FieldVisitor.java b/spring-core/src/main/java/org/springframework/asm/FieldVisitor.java
@@ -72,9 +72,7 @@ public FieldVisitor(final int api, final FieldVisitor fieldVisitor) {
         && api != Opcodes.ASM8_EXPERIMENTAL) {
       throw new IllegalArgumentException("Unsupported api " + api);
     }
-    if (api == Opcodes.ASM8_EXPERIMENTAL) {
-      Constants.checkAsm8Experimental(this);
-    }
+    // SPRING PATCH: no preview mode check for ASM 8 experimental
     this.api = api;
     this.fv = fieldVisitor;
   }
diff --git a/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java b/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
@@ -88,9 +88,7 @@ public MethodVisitor(final int api, final MethodVisitor methodVisitor) {
         && api != Opcodes.ASM8_EXPERIMENTAL) {
       throw new IllegalArgumentException("Unsupported api " + api);
     }
-    if (api == Opcodes.ASM8_EXPERIMENTAL) {
-      Constants.checkAsm8Experimental(this);
-    }
+    // SPRING PATCH: no preview mode check for ASM 8 experimental
     this.api = api;
     this.mv = methodVisitor;
   }
diff --git a/spring-core/src/main/java/org/springframework/asm/ModuleVisitor.java b/spring-core/src/main/java/org/springframework/asm/ModuleVisitor.java
@@ -74,9 +74,7 @@ public ModuleVisitor(final int api, final ModuleVisitor moduleVisitor) {
         && api != Opcodes.ASM8_EXPERIMENTAL) {
       throw new IllegalArgumentException("Unsupported api " + api);
     }
-    if (api == Opcodes.ASM8_EXPERIMENTAL) {
-      Constants.checkAsm8Experimental(this);
-    }
+    // SPRING PATCH: no preview mode check for ASM 8 experimental
     this.api = api;
     this.mv = moduleVisitor;
   }
diff --git a/spring-core/src/main/java/org/springframework/asm/RecordComponentVisitor.java b/spring-core/src/main/java/org/springframework/asm/RecordComponentVisitor.java
@@ -80,9 +80,7 @@ public RecordComponentVisitor(
         && api != Opcodes.ASM8_EXPERIMENTAL) {
       throw new IllegalArgumentException("Unsupported api " + api);
     }
-    if (api == Opcodes.ASM8_EXPERIMENTAL) {
-      Constants.checkAsm8Experimental(this);
-    }
+    // SPRING PATCH: no preview mode check for ASM 8 experimental
     this.api = api;
     this.delegate = recordComponentVisitor;
   }
diff --git a/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java b/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,9 @@ public final class SpringAsmInfo {
 
 	/**
 	 * The ASM compatibility version for Spring's ASM visitor implementations:
-	 * currently {@link Opcodes#ASM7}, as of Spring Framework 5.1.
+	 * currently {@link Opcodes#ASM8_EXPERIMENTAL}, as of Spring Framework 5.2.5.
 	 */
-	public static final int ASM_VERSION = Opcodes.ASM7;
+	@SuppressWarnings("deprecation")
+	public static final int ASM_VERSION = Opcodes.ASM8_EXPERIMENTAL;
 
 }

Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,7 @@ public AnnotationVisitor(final int api, final AnnotationVisitor annotationVisito`
`76`	`76`	`&& api != Opcodes.ASM8_EXPERIMENTAL) {`
`77`	`77`	`throw new IllegalArgumentException("Unsupported api " + api);`
`78`	`78`	`}`
`79`		`- if (api == Opcodes.ASM8_EXPERIMENTAL) {`
`80`		`- Constants.checkAsm8Experimental(this);`
`81`		`- }`
	`79`	`+ // SPRING PATCH: no preview mode check for ASM 8 experimental`
`82`	`80`	`this.api = api;`
`83`	`81`	`this.av = annotationVisitor;`
`84`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,7 @@ public ClassVisitor(final int api, final ClassVisitor classVisitor) {`
`74`	`74`	`&& api != Opcodes.ASM8_EXPERIMENTAL) {`
`75`	`75`	`throw new IllegalArgumentException("Unsupported api " + api);`
`76`	`76`	`}`
`77`		`- if (api == Opcodes.ASM8_EXPERIMENTAL) {`
`78`		`- Constants.checkAsm8Experimental(this);`
`79`		`- }`
	`77`	`+ // SPRING PATCH: no preview mode check for ASM 8 experimental`
`80`	`78`	`this.api = api;`
`81`	`79`	`this.cv = classVisitor;`
`82`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,7 @@ public FieldVisitor(final int api, final FieldVisitor fieldVisitor) {`
`72`	`72`	`&& api != Opcodes.ASM8_EXPERIMENTAL) {`
`73`	`73`	`throw new IllegalArgumentException("Unsupported api " + api);`
`74`	`74`	`}`
`75`		`- if (api == Opcodes.ASM8_EXPERIMENTAL) {`
`76`		`- Constants.checkAsm8Experimental(this);`
`77`		`- }`
	`75`	`+ // SPRING PATCH: no preview mode check for ASM 8 experimental`
`78`	`76`	`this.api = api;`
`79`	`77`	`this.fv = fieldVisitor;`
`80`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,7 @@ public MethodVisitor(final int api, final MethodVisitor methodVisitor) {`
`88`	`88`	`&& api != Opcodes.ASM8_EXPERIMENTAL) {`
`89`	`89`	`throw new IllegalArgumentException("Unsupported api " + api);`
`90`	`90`	`}`
`91`		`- if (api == Opcodes.ASM8_EXPERIMENTAL) {`
`92`		`- Constants.checkAsm8Experimental(this);`
`93`		`- }`
	`91`	`+ // SPRING PATCH: no preview mode check for ASM 8 experimental`
`94`	`92`	`this.api = api;`
`95`	`93`	`this.mv = methodVisitor;`
`96`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,7 @@ public ModuleVisitor(final int api, final ModuleVisitor moduleVisitor) {`
`74`	`74`	`&& api != Opcodes.ASM8_EXPERIMENTAL) {`
`75`	`75`	`throw new IllegalArgumentException("Unsupported api " + api);`
`76`	`76`	`}`
`77`		`- if (api == Opcodes.ASM8_EXPERIMENTAL) {`
`78`		`- Constants.checkAsm8Experimental(this);`
`79`		`- }`
	`77`	`+ // SPRING PATCH: no preview mode check for ASM 8 experimental`
`80`	`78`	`this.api = api;`
`81`	`79`	`this.mv = moduleVisitor;`
`82`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,7 @@ public RecordComponentVisitor(`
`80`	`80`	`&& api != Opcodes.ASM8_EXPERIMENTAL) {`
`81`	`81`	`throw new IllegalArgumentException("Unsupported api " + api);`
`82`	`82`	`}`
`83`		`- if (api == Opcodes.ASM8_EXPERIMENTAL) {`
`84`		`- Constants.checkAsm8Experimental(this);`
`85`		`- }`
	`83`	`+ // SPRING PATCH: no preview mode check for ASM 8 experimental`
`86`	`84`	`this.api = api;`
`87`	`85`	`this.delegate = recordComponentVisitor;`
`88`	`86`	`}`