Upgrade to ASM master (7.0 beta) and CGLIB 3.2.8

Issue: SPR-17267

Author: jhoeller

spring-core/spring-core.gradle

@@ -7,11 +7,11 @@ dependencyManagement {
 	}
 }
 
-// As of Spring 5.0.3, spring-core includes asm 6.x and repackages cglib 3.2.6+, inlining
-// both into the spring-core jar. cglib 3.2.6+ itself depends on asm 6.x and is therefore
+// As of Spring 5.1, spring-core includes asm 7.0 and repackages cglib 3.2.8, inlining
+// both into the spring-core jar. cglib 3.2.8 itself depends on asm 6+ and is therefore
 // further transformed by the JarJar task to depend on org.springframework.asm; this
 // avoids including two different copies of asm unnecessarily.
-def cglibVersion = "3.2.7"
+def cglibVersion = "3.2.8"
 def objenesisVersion = "2.6"
 
 configurations {

spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java

@@ -29,8 +29,8 @@
 
 /**
  * A visitor to visit a Java annotation. The methods of this class must be called in the following
- * order: ( <tt>visit</tt> | <tt>visitEnum</tt> | <tt>visitAnnotation</tt> | <tt>visitArray</tt> )*
- * <tt>visitEnd</tt>.
+ * order: ( {@code visit} | {@code visitEnum} | {@code visitAnnotation} | {@code visitArray} )*
+ * {@code visitEnd}.
  *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
@@ -39,7 +39,7 @@ public abstract class AnnotationVisitor {
 
   /**
    * The ASM API version implemented by this visitor. The value of this field must be one of {@link
-   * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7_EXPERIMENTAL}.
+   * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
    */
   protected final int api;
 
@@ -50,8 +50,7 @@ public abstract class AnnotationVisitor {
    * Constructs a new {@link AnnotationVisitor}.
    *
    * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link
-   *     Opcodes#ASM7_EXPERIMENTAL}.
+   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
    */
   public AnnotationVisitor(final int api) {
     this(api, null);
@@ -61,16 +60,12 @@ public AnnotationVisitor(final int api) {
    * Constructs a new {@link AnnotationVisitor}.
    *
    * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link
-   *     Opcodes#ASM7_EXPERIMENTAL}.
+   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
    * @param annotationVisitor the annotation visitor to which this visitor must delegate method
    *     calls. May be null.
    */
   public AnnotationVisitor(final int api, final AnnotationVisitor annotationVisitor) {
-    if (api != Opcodes.ASM6
-        && api != Opcodes.ASM5
-        && api != Opcodes.ASM4
-        && api != Opcodes.ASM7_EXPERIMENTAL) {
+    if (api != Opcodes.ASM6 && api != Opcodes.ASM5 && api != Opcodes.ASM4 && api != Opcodes.ASM7) {
       throw new IllegalArgumentException();
     }
     this.api = api;
@@ -112,9 +107,9 @@ public void visitEnum(final String name, final String descriptor, final String v
    *
    * @param name the value name.
    * @param descriptor the class descriptor of the nested annotation class.
-   * @return a visitor to visit the actual nested annotation value, or <tt>null</tt> if this visitor
-   *     is not interested in visiting this nested annotation. <i>The nested annotation value must
-   *     be fully visited before calling other methods on this annotation visitor</i>.
+   * @return a visitor to visit the actual nested annotation value, or {@literal null} if this
+   *     visitor is not interested in visiting this nested annotation. <i>The nested annotation
+   *     value must be fully visited before calling other methods on this annotation visitor</i>.
    */
   public AnnotationVisitor visitAnnotation(final String name, final String descriptor) {
     if (av != null) {
@@ -129,8 +124,8 @@ public AnnotationVisitor visitAnnotation(final String name, final String descrip
    * visit}. This is what {@link ClassReader} does.
    *
    * @param name the value name.
-   * @return a visitor to visit the actual array value elements, or <tt>null</tt> if this visitor is
-   *     not interested in visiting these values. The 'name' parameters passed to the methods of
+   * @return a visitor to visit the actual array value elements, or {@literal null} if this visitor
+   *     is not interested in visiting these values. The 'name' parameters passed to the methods of
    *     this visitor are ignored. <i>All the array values must be visited before calling other
    *     methods on this annotation visitor</i>.
    */

spring-core/src/main/java/org/springframework/asm/AnnotationWriter.java

@@ -112,7 +112,7 @@ final class AnnotationWriter extends AnnotationVisitor {
       final boolean useNamedValues,
       final ByteVector annotation,
       final AnnotationWriter previousAnnotation) {
-    super(Opcodes.ASM6);
+    super(Opcodes.ASM7);
     this.symbolTable = symbolTable;
     this.useNamedValues = useNamedValues;
     this.annotation = annotation;

spring-core/src/main/java/org/springframework/asm/Attribute.java

@@ -31,9 +31,9 @@
  * A non standard class, field, method or code attribute, as defined in the Java Virtual Machine
  * Specification (JVMS).
  *
- * @see <a href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.7">JVMS
+ * @see <a href= "https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.7">JVMS
  *     4.7</a>
- * @see <a href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.7.3">JVMS
+ * @see <a href= "https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.7.3">JVMS
  *     4.7.3</a>
  * @author Eric Bruneton
  * @author Eugene Kuleshov
@@ -52,7 +52,7 @@ public class Attribute {
 
   /**
    * The next attribute in this attribute list (Attribute instances can be linked via this field to
-   * store a list of class, field, method or code attributes). May be <tt>null</tt>.
+   * store a list of class, field, method or code attributes). May be {@literal null}.
    */
   Attribute nextAttribute;
 
@@ -66,23 +66,23 @@ protected Attribute(final String type) {
   }
 
   /**
-   * Returns <tt>true</tt> if this type of attribute is unknown. This means that the attribute
+   * Returns {@literal true} if this type of attribute is unknown. This means that the attribute
    * content can't be parsed to extract constant pool references, labels, etc. Instead, the
    * attribute content is read as an opaque byte array, and written back as is. This can lead to
    * invalid attributes, if the content actually contains constant pool references, labels, or other
    * symbolic references that need to be updated when there are changes to the constant pool, the
-   * method bytecode, etc. The default implementation of this method always returns <tt>true</tt>.
+   * method bytecode, etc. The default implementation of this method always returns {@literal true}.
    *
-   * @return <tt>true</tt> if this type of attribute is unknown.
+   * @return {@literal true} if this type of attribute is unknown.
    */
   public boolean isUnknown() {
     return true;
   }
 
   /**
-   * Returns <tt>true</tt> if this type of attribute is a code attribute.
+   * Returns {@literal true} if this type of attribute is a code attribute.
    *
-   * @return <tt>true</tt> if this type of attribute is a code attribute.
+   * @return {@literal true} if this type of attribute is a code attribute.
    */
   public boolean isCodeAttribute() {
     return false;
@@ -91,8 +91,8 @@ public boolean isCodeAttribute() {
   /**
    * Returns the labels corresponding to this attribute.
    *
-   * @return the labels corresponding to this attribute, or <tt>null</tt> if this attribute is not a
-   *     code attribute that contains labels.
+   * @return the labels corresponding to this attribute, or {@literal null} if this attribute is not
+   *     a code attribute that contains labels.
    */
   protected Label[] getLabels() {
     return new Label[0];
@@ -114,8 +114,8 @@ protected Label[] getLabels() {
    *     in {@link ClassReader#b}, or -1 if the attribute to be read is not a code attribute. The 6
    *     attribute header bytes (attribute_name_index and attribute_length) are not taken into
    *     account here.
-   * @param labels the labels of the method's code, or <tt>null</tt> if the attribute to be read is
-   *     not a code attribute.
+   * @param labels the labels of the method's code, or {@literal null} if the attribute to be read
+   *     is not a code attribute.
    * @return a <i>new</i> {@link Attribute} object corresponding to the specified bytes.
    */
   protected Attribute read(
@@ -138,7 +138,7 @@ protected Attribute read(
    *
    * @param classWriter the class to which this attribute must be added. This parameter can be used
    *     to add the items that corresponds to this attribute to the constant pool of this class.
-   * @param code the bytecode of the method corresponding to this code attribute, or <tt>null</tt>
+   * @param code the bytecode of the method corresponding to this code attribute, or {@literal null}
    *     if this attribute is not a code attribute. Corresponds to the 'code' field of the Code
    *     attribute.
    * @param codeLength the length of the bytecode of the method corresponding to this code
@@ -197,8 +197,9 @@ final int computeAttributesSize(final SymbolTable symbolTable) {
    * attribute_length) per attribute. Also adds the attribute type names to the constant pool.
    *
    * @param symbolTable where the constants used in the attributes must be stored.
-   * @param code the bytecode of the method corresponding to these code attributes, or <tt>null</tt>
-   *     if they are not code attributes. Corresponds to the 'code' field of the Code attribute.
+   * @param code the bytecode of the method corresponding to these code attributes, or {@literal
+   *     null} if they are not code attributes. Corresponds to the 'code' field of the Code
+   *     attribute.
    * @param codeLength the length of the bytecode of the method corresponding to these code
    *     attributes, or 0 if they are not code attributes. Corresponds to the 'code_length' field of
    *     the Code attribute.
@@ -248,8 +249,9 @@ final void putAttributes(final SymbolTable symbolTable, final ByteVector output)
    * attribute.
    *
    * @param symbolTable where the constants used in the attributes must be stored.
-   * @param code the bytecode of the method corresponding to these code attributes, or <tt>null</tt>
-   *     if they are not code attributes. Corresponds to the 'code' field of the Code attribute.
+   * @param code the bytecode of the method corresponding to these code attributes, or {@literal
+   *     null} if they are not code attributes. Corresponds to the 'code' field of the Code
+   *     attribute.
    * @param codeLength the length of the bytecode of the method corresponding to these code
    *     attributes, or 0 if they are not code attributes. Corresponds to the 'code_length' field of
    *     the Code attribute.

spring-core/src/main/java/org/springframework/asm/ByteVector.java

@@ -327,7 +327,7 @@ final ByteVector encodeUTF8(final String stringValue, final int offset, final in
    * Puts an array of bytes into this byte vector. The byte vector is automatically enlarged if
    * necessary.
    *
-   * @param byteArrayValue an array of bytes. May be <tt>null</tt> to put <tt>byteLength</tt> null
+   * @param byteArrayValue an array of bytes. May be {@literal null} to put {@code byteLength} null
    *     bytes into this byte vector.
    * @param byteOffset index of the first byte of byteArrayValue that must be copied.
    * @param byteLength number of bytes of byteArrayValue that must be copied.

spring-core/src/main/java/org/springframework/asm/ClassReader.java

@@ -187,6 +187,7 @@ public ClassReader(
     int currentCpInfoIndex = 1;
     int currentCpInfoOffset = classFileOffset + 10;
     int currentMaxStringLength = 0;
+    boolean hasBootstrapMethods = false;
     // The offset of the other entries depend on the total size of all the previous entries.
     while (currentCpInfoIndex < constantPoolCount) {
       cpInfoOffsets[currentCpInfoIndex++] = currentCpInfoOffset + 1;
@@ -198,9 +199,12 @@ public ClassReader(
         case Symbol.CONSTANT_INTEGER_TAG:
         case Symbol.CONSTANT_FLOAT_TAG:
         case Symbol.CONSTANT_NAME_AND_TYPE_TAG:
+          cpInfoSize = 5;
+          break;
         case Symbol.CONSTANT_INVOKE_DYNAMIC_TAG:
         case Symbol.CONSTANT_DYNAMIC_TAG:
           cpInfoSize = 5;
+          hasBootstrapMethods = true;
           break;
         case Symbol.CONSTANT_LONG_TAG:
         case Symbol.CONSTANT_DOUBLE_TAG:
@@ -236,29 +240,8 @@ public ClassReader(
     this.header = currentCpInfoOffset;
 
     // Read the BootstrapMethods attribute, if any (only get the offset of each method).
-    int currentAttributeOffset = getFirstAttributeOffset();
-    int[] currentBootstrapMethodOffsets = null;
-    for (int i = readUnsignedShort(currentAttributeOffset - 2); i > 0; --i) {
-      // Read the attribute_info's attribute_name and attribute_length fields.
-      String attributeName = readUTF8(currentAttributeOffset, new char[maxStringLength]);
-      int attributeLength = readInt(currentAttributeOffset + 2);
-      currentAttributeOffset += 6;
-      if (Constants.BOOTSTRAP_METHODS.equals(attributeName)) {
-        // Read the num_bootstrap_methods field and create an array of this size.
-        currentBootstrapMethodOffsets = new int[readUnsignedShort(currentAttributeOffset)];
-        // Compute and store the offset of each 'bootstrap_methods' array field entry.
-        int currentBootstrapMethodOffset = currentAttributeOffset + 2;
-        for (int j = 0; j < currentBootstrapMethodOffsets.length; ++j) {
-          currentBootstrapMethodOffsets[j] = currentBootstrapMethodOffset;
-          // Skip the bootstrap_method_ref and num_bootstrap_arguments fields (2 bytes each),
-          // as well as the bootstrap_arguments array field (of size num_bootstrap_arguments * 2).
-          currentBootstrapMethodOffset +=
-              4 + readUnsignedShort(currentBootstrapMethodOffset + 2) * 2;
-        }
-      }
-      currentAttributeOffset += attributeLength;
-    }
-    this.bootstrapMethodOffsets = currentBootstrapMethodOffsets;
+    this.bootstrapMethodOffsets =
+        hasBootstrapMethods ? readBootstrapMethodsAttribute(currentMaxStringLength) : null;
   }
 
   /**
@@ -345,7 +328,7 @@ public String getClassName() {
    * Returns the internal of name of the super class (see {@link Type#getInternalName()}). For
    * interfaces, the super class is {@link Object}.
    *
-   * @return the internal name of the super class, or <tt>null</tt> for {@link Object} class.
+   * @return the internal name of the super class, or {@literal null} for {@link Object} class.
    * @see ClassVisitor#visit(int, int, String, String, String, String[])
    */
   public String getSuperName() {
@@ -538,7 +521,7 @@ public void accept(
 
     // Visit the NestHost attribute.
     if (nestHostClass != null) {
-      classVisitor.visitNestHostExperimental(nestHostClass);
+      classVisitor.visitNestHost(nestHostClass);
     }
 
     // Visit the EnclosingMethod attribute.
@@ -648,7 +631,7 @@ public void accept(
       int numberOfNestMembers = readUnsignedShort(nestMembersOffset);
       int currentNestMemberOffset = nestMembersOffset + 2;
       while (numberOfNestMembers-- > 0) {
-        classVisitor.visitNestMemberExperimental(readClass(currentNestMemberOffset, charBuffer));
+        classVisitor.visitNestMember(readClass(currentNestMemberOffset, charBuffer));
         currentNestMemberOffset += 2;
       }
     }
@@ -2775,7 +2758,7 @@ private int readElementValues(
    * @param annotationVisitor the visitor that must visit the element_value structure.
    * @param elementValueOffset the start offset in {@link #b} of the element_value structure to be
    *     read.
-   * @param elementName the name of the element_value structure to be read, or <tt>null</tt>.
+   * @param elementName the name of the element_value structure to be read, or {@literal null}.
    * @param charBuffer the buffer used to read strings in the constant pool.
    * @return the end offset of the JVMS 'element_value' structure.
    */
@@ -3222,6 +3205,41 @@ final int getFirstAttributeOffset() {
     return currentOffset + 2;
   }
 
+  /**
+   * Reads the BootstrapMethods attribute to compute the offset of each bootstrap method.
+   *
+   * @param maxStringLength a conservative estimate of the maximum length of the strings contained
+   *     in the constant pool of the class.
+   * @return the offsets of the bootstrap methods or null.
+   */
+  private int[] readBootstrapMethodsAttribute(final int maxStringLength) {
+    char[] charBuffer = new char[maxStringLength];
+    int currentAttributeOffset = getFirstAttributeOffset();
+    int[] currentBootstrapMethodOffsets = null;
+    for (int i = readUnsignedShort(currentAttributeOffset - 2); i > 0; --i) {
+      // Read the attribute_info's attribute_name and attribute_length fields.
+      String attributeName = readUTF8(currentAttributeOffset, charBuffer);
+      int attributeLength = readInt(currentAttributeOffset + 2);
+      currentAttributeOffset += 6;
+      if (Constants.BOOTSTRAP_METHODS.equals(attributeName)) {
+        // Read the num_bootstrap_methods field and create an array of this size.
+        currentBootstrapMethodOffsets = new int[readUnsignedShort(currentAttributeOffset)];
+        // Compute and store the offset of each 'bootstrap_methods' array field entry.
+        int currentBootstrapMethodOffset = currentAttributeOffset + 2;
+        for (int j = 0; j < currentBootstrapMethodOffsets.length; ++j) {
+          currentBootstrapMethodOffsets[j] = currentBootstrapMethodOffset;
+          // Skip the bootstrap_method_ref and num_bootstrap_arguments fields (2 bytes each),
+          // as well as the bootstrap_arguments array field (of size num_bootstrap_arguments * 2).
+          currentBootstrapMethodOffset +=
+              4 + readUnsignedShort(currentBootstrapMethodOffset + 2) * 2;
+        }
+        return currentBootstrapMethodOffsets;
+      }
+      currentAttributeOffset += attributeLength;
+    }
+    return null;
+  }
+
   /**
    * Reads a non standard JVMS 'attribute' structure in {@link #b}.
    *
@@ -3236,8 +3254,8 @@ final int getFirstAttributeOffset() {
    * @param codeAttributeOffset the start offset of the enclosing Code attribute in {@link #b}, or
    *     -1 if the attribute to be read is not a code attribute. The 6 attribute header bytes
    *     (attribute_name_index and attribute_length) are not taken into account here.
-   * @param labels the labels of the method's code, or <tt>null</tt> if the attribute to be read is
-   *     not a code attribute.
+   * @param labels the labels of the method's code, or {@literal null} if the attribute to be read
+   *     is not a code attribute.
    * @return the attribute that has been read.
    */
   private Attribute readAttribute(