GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Upgrade to ASM master (including early support for Java 23 bytecode) 

Closes gh-31929
pull/31930/head
Juergen Hoeller 2 years ago
parent
243ec88e95
commit
174eae377f
6 changed files with 66 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      spring-core/src/main/java/org/springframework/asm/AnnotationWriter.java
  2. 109
      spring-core/src/main/java/org/springframework/asm/ClassReader.java
  3. 2
      spring-core/src/main/java/org/springframework/asm/ClassWriter.java
  4. 6
      spring-core/src/main/java/org/springframework/asm/MethodWriter.java
  5. 1
      spring-core/src/main/java/org/springframework/asm/Opcodes.java
  6. 8
      spring-core/src/main/java/org/springframework/asm/SymbolTable.java

8
spring-core/src/main/java/org/springframework/asm/AnnotationWriter.java
Unescape View File

@ -144,7 +144,7 @@ final class AnnotationWriter extends AnnotationVisitor { @@ -144,7 +144,7 @@ final class AnnotationWriter extends AnnotationVisitor {
// Write type_index and reserve space for num_element_value_pairs.
annotation.putShort(symbolTable.addConstantUtf8(descriptor)).putShort(0);
return new AnnotationWriter(
symbolTable, /* useNamedValues = */ true, annotation, previousAnnotation);
symbolTable, /* useNamedValues= */ true, annotation, previousAnnotation);
}
/**
@ -179,7 +179,7 @@ final class AnnotationWriter extends AnnotationVisitor { @@ -179,7 +179,7 @@ final class AnnotationWriter extends AnnotationVisitor {
// Write type_index and reserve space for num_element_value_pairs.
typeAnnotation.putShort(symbolTable.addConstantUtf8(descriptor)).putShort(0);
return new AnnotationWriter(
symbolTable, /* useNamedValues = */ true, typeAnnotation, previousAnnotation);
symbolTable, /* useNamedValues= */ true, typeAnnotation, previousAnnotation);
}
// -----------------------------------------------------------------------------------------------
@ -284,7 +284,7 @@ final class AnnotationWriter extends AnnotationVisitor { @@ -284,7 +284,7 @@ final class AnnotationWriter extends AnnotationVisitor {
}
// Write tag and type_index, and reserve 2 bytes for num_element_value_pairs.
annotation.put12('@', symbolTable.addConstantUtf8(descriptor)).putShort(0);
return new AnnotationWriter(symbolTable, /* useNamedValues = */ true, annotation, null);
return new AnnotationWriter(symbolTable, /* useNamedValues= */ true, annotation, null);
}
@Override
@ -303,7 +303,7 @@ final class AnnotationWriter extends AnnotationVisitor { @@ -303,7 +303,7 @@ final class AnnotationWriter extends AnnotationVisitor {
// visit the array elements. Its num_element_value_pairs will correspond to the number of array
// elements and will be stored in what is in fact num_values.
annotation.put12('[', 0);
return new AnnotationWriter(symbolTable, /* useNamedValues = */ false, annotation, null);
return new AnnotationWriter(symbolTable, /* useNamedValues= */ false, annotation, null);
}
@Override

109
spring-core/src/main/java/org/springframework/asm/ClassReader.java
Unescape View File

@ -177,7 +177,7 @@ public class ClassReader { @@ -177,7 +177,7 @@ public class ClassReader {
final byte[] classFileBuffer,
final int classFileOffset,
final int classFileLength) { // NOPMD(UnusedFormalParameter) used for backward compatibility.
this(classFileBuffer, classFileOffset, /* checkClassVersion = */ true);
this(classFileBuffer, classFileOffset, /* checkClassVersion= */ true);
}
/**
@ -194,7 +194,7 @@ public class ClassReader { @@ -194,7 +194,7 @@ public class ClassReader {
this.b = classFileBuffer;
// Check the class' major_version. This field is after the magic and minor_version fields, which
// use 4 and 2 bytes respectively.
if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V22) {
if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V23) {
throw new IllegalArgumentException(
"Unsupported class file major version " + readShort(classFileOffset + 6));
}
@ -608,9 +608,9 @@ public class ClassReader { @@ -608,9 +608,9 @@ public class ClassReader {
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
classVisitor.visitAnnotation(annotationDescriptor, /* visible = */ true),
classVisitor.visitAnnotation(annotationDescriptor, /* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -626,9 +626,9 @@ public class ClassReader { @@ -626,9 +626,9 @@ public class ClassReader {
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
classVisitor.visitAnnotation(annotationDescriptor, /* visible = */ false),
classVisitor.visitAnnotation(annotationDescriptor, /* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -650,9 +650,9 @@ public class ClassReader { @@ -650,9 +650,9 @@ public class ClassReader {
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -674,9 +674,9 @@ public class ClassReader { @@ -674,9 +674,9 @@ public class ClassReader {
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -968,9 +968,9 @@ public class ClassReader { @@ -968,9 +968,9 @@ public class ClassReader {
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
recordComponentVisitor.visitAnnotation(annotationDescriptor, /* visible = */ true),
recordComponentVisitor.visitAnnotation(annotationDescriptor, /* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -986,9 +986,9 @@ public class ClassReader { @@ -986,9 +986,9 @@ public class ClassReader {
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
recordComponentVisitor.visitAnnotation(annotationDescriptor, /* visible = */ false),
recordComponentVisitor.visitAnnotation(annotationDescriptor, /* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1010,9 +1010,9 @@ public class ClassReader { @@ -1010,9 +1010,9 @@ public class ClassReader {
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1034,9 +1034,9 @@ public class ClassReader { @@ -1034,9 +1034,9 @@ public class ClassReader {
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1152,9 +1152,9 @@ public class ClassReader { @@ -1152,9 +1152,9 @@ public class ClassReader {
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
fieldVisitor.visitAnnotation(annotationDescriptor, /* visible = */ true),
fieldVisitor.visitAnnotation(annotationDescriptor, /* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1170,9 +1170,9 @@ public class ClassReader { @@ -1170,9 +1170,9 @@ public class ClassReader {
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
fieldVisitor.visitAnnotation(annotationDescriptor, /* visible = */ false),
fieldVisitor.visitAnnotation(annotationDescriptor, /* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1194,9 +1194,9 @@ public class ClassReader { @@ -1194,9 +1194,9 @@ public class ClassReader {
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1218,9 +1218,9 @@ public class ClassReader { @@ -1218,9 +1218,9 @@ public class ClassReader {
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1413,9 +1413,9 @@ public class ClassReader { @@ -1413,9 +1413,9 @@ public class ClassReader {
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
methodVisitor.visitAnnotation(annotationDescriptor, /* visible = */ true),
methodVisitor.visitAnnotation(annotationDescriptor, /* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1431,9 +1431,9 @@ public class ClassReader { @@ -1431,9 +1431,9 @@ public class ClassReader {
// Parse num_element_value_pairs and element_value_pairs and visit these values.
currentAnnotationOffset =
readElementValues(
methodVisitor.visitAnnotation(annotationDescriptor, /* visible = */ false),
methodVisitor.visitAnnotation(annotationDescriptor, /* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1455,9 +1455,9 @@ public class ClassReader { @@ -1455,9 +1455,9 @@ public class ClassReader {
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1479,9 +1479,9 @@ public class ClassReader { @@ -1479,9 +1479,9 @@ public class ClassReader {
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -1489,16 +1489,13 @@ public class ClassReader { @@ -1489,16 +1489,13 @@ public class ClassReader {
// Visit the RuntimeVisibleParameterAnnotations attribute.
if (runtimeVisibleParameterAnnotationsOffset != 0) {
readParameterAnnotations(
methodVisitor, context, runtimeVisibleParameterAnnotationsOffset, /* visible = */ true);
methodVisitor, context, runtimeVisibleParameterAnnotationsOffset, /* visible= */ true);
}
// Visit the RuntimeInvisibleParameterAnnotations attribute.
if (runtimeInvisibleParameterAnnotationsOffset != 0) {
readParameterAnnotations(
methodVisitor,
context,
runtimeInvisibleParameterAnnotationsOffset,
/* visible = */ false);
methodVisitor, context, runtimeInvisibleParameterAnnotationsOffset, /* visible= */ false);
}
// Visit the non standard attributes.
@ -1927,7 +1924,7 @@ public class ClassReader { @@ -1927,7 +1924,7 @@ public class ClassReader {
}
} else if (Constants.RUNTIME_VISIBLE_TYPE_ANNOTATIONS.equals(attributeName)) {
visibleTypeAnnotationOffsets =
readTypeAnnotations(methodVisitor, context, currentOffset, /* visible = */ true);
readTypeAnnotations(methodVisitor, context, currentOffset, /* visible= */ true);
// Here we do not extract the labels corresponding to the attribute content. This would
// require a full parsing of the attribute, which would need to be repeated when parsing
// the bytecode instructions (see below). Instead, the content of the attribute is read one
@ -1936,7 +1933,7 @@ public class ClassReader { @@ -1936,7 +1933,7 @@ public class ClassReader {
// time. This assumes that type annotations are ordered by increasing bytecode offset.
} else if (Constants.RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.equals(attributeName)) {
invisibleTypeAnnotationOffsets =
readTypeAnnotations(methodVisitor, context, currentOffset, /* visible = */ false);
readTypeAnnotations(methodVisitor, context, currentOffset, /* visible= */ false);
// Same comment as above for the RuntimeVisibleTypeAnnotations attribute.
} else if (Constants.STACK_MAP_TABLE.equals(attributeName)) {
if ((context.parsingOptions & SKIP_FRAMES) == 0) {
@ -2518,9 +2515,9 @@ public class ClassReader { @@ -2518,9 +2515,9 @@ public class ClassReader {
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
currentVisibleTypeAnnotationBytecodeOffset =
@ -2546,9 +2543,9 @@ public class ClassReader { @@ -2546,9 +2543,9 @@ public class ClassReader {
context.currentTypeAnnotationTarget,
context.currentTypeAnnotationTargetPath,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentAnnotationOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
currentInvisibleTypeAnnotationBytecodeOffset =
@ -2619,9 +2616,9 @@ public class ClassReader { @@ -2619,9 +2616,9 @@ public class ClassReader {
context.currentLocalVariableAnnotationRangeEnds,
context.currentLocalVariableAnnotationRangeIndices,
annotationDescriptor,
/* visible = */ true),
/* visible= */ true),
currentOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -2647,9 +2644,9 @@ public class ClassReader { @@ -2647,9 +2644,9 @@ public class ClassReader {
context.currentLocalVariableAnnotationRangeEnds,
context.currentLocalVariableAnnotationRangeIndices,
annotationDescriptor,
/* visible = */ false),
/* visible= */ false),
currentOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -2827,7 +2824,7 @@ public class ClassReader { @@ -2827,7 +2824,7 @@ public class ClassReader {
methodVisitor.visitTryCatchAnnotation(
targetType & 0xFFFFFF00, path, annotationDescriptor, visible),
currentOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
} else {
// We don't want to visit the other target_type annotations, so we just skip them (which
@ -2838,7 +2835,7 @@ public class ClassReader { @@ -2838,7 +2835,7 @@ public class ClassReader {
// with a null AnnotationVisitor).
currentOffset =
readElementValues(
/* annotationVisitor = */ null, currentOffset, /* named = */ true, charBuffer);
/* annotationVisitor= */ null, currentOffset, /* named= */ true, charBuffer);
}
}
return typeAnnotationsOffsets;
@ -2978,7 +2975,7 @@ public class ClassReader { @@ -2978,7 +2975,7 @@ public class ClassReader {
readElementValues(
methodVisitor.visitParameterAnnotation(i, annotationDescriptor, visible),
currentOffset,
/* named = */ true,
/* named= */ true,
charBuffer);
}
}
@ -3048,9 +3045,9 @@ public class ClassReader { @@ -3048,9 +3045,9 @@ public class ClassReader {
case 'e': // enum_const_value
return currentOffset + 5;
case '@': // annotation_value
return readElementValues(null, currentOffset + 3, /* named = */ true, charBuffer);
return readElementValues(null, currentOffset + 3, /* named= */ true, charBuffer);
case '[': // array_value
return readElementValues(null, currentOffset + 1, /* named = */ false, charBuffer);
return readElementValues(null, currentOffset + 1, /* named= */ false, charBuffer);
default:
return currentOffset + 3;
}
@ -3118,7 +3115,7 @@ public class ClassReader { @@ -3118,7 +3115,7 @@ public class ClassReader {
return readElementValues(
annotationVisitor.visitArray(elementName),
currentOffset - 2,
/* named = */ false,
/* named= */ false,
charBuffer);
}
switch (classFileBuffer[currentOffset] & 0xFF) {
@ -3195,7 +3192,7 @@ public class ClassReader { @@ -3195,7 +3192,7 @@ public class ClassReader {
readElementValues(
annotationVisitor.visitArray(elementName),
currentOffset - 2,
/* named = */ false,
/* named= */ false,
charBuffer);
break;
}

2
spring-core/src/main/java/org/springframework/asm/ClassWriter.java
Unescape View File

@ -774,7 +774,7 @@ public class ClassWriter extends ClassVisitor { @@ -774,7 +774,7 @@ public class ClassWriter extends ClassVisitor {
lastRecordComponent = null;
firstAttribute = null;
compute = hasFrames ? MethodWriter.COMPUTE_INSERTED_FRAMES : MethodWriter.COMPUTE_NOTHING;
new ClassReader(classFile, 0, /* checkClassVersion = */ false)
new ClassReader(classFile, 0, /* checkClassVersion= */ false)
.accept(
this,
attributes,

6
spring-core/src/main/java/org/springframework/asm/MethodWriter.java
Unescape View File

@ -651,7 +651,7 @@ final class MethodWriter extends MethodVisitor { @@ -651,7 +651,7 @@ final class MethodWriter extends MethodVisitor {
@Override
public AnnotationVisitor visitAnnotationDefault() {
defaultValue = new ByteVector();
return new AnnotationWriter(symbolTable, /* useNamedValues = */ false, defaultValue, null);
return new AnnotationWriter(symbolTable, /* useNamedValues= */ false, defaultValue, null);
}
@Override
@ -1519,14 +1519,14 @@ final class MethodWriter extends MethodVisitor { @@ -1519,14 +1519,14 @@ final class MethodWriter extends MethodVisitor {
return lastCodeRuntimeVisibleTypeAnnotation =
new AnnotationWriter(
symbolTable,
/* useNamedValues = */ true,
/* useNamedValues= */ true,
typeAnnotation,
lastCodeRuntimeVisibleTypeAnnotation);
} else {
return lastCodeRuntimeInvisibleTypeAnnotation =
new AnnotationWriter(
symbolTable,
/* useNamedValues = */ true,
/* useNamedValues= */ true,
typeAnnotation,
lastCodeRuntimeInvisibleTypeAnnotation);
}

1
spring-core/src/main/java/org/springframework/asm/Opcodes.java
Unescape View File

@ -287,6 +287,7 @@ public interface Opcodes { @@ -287,6 +287,7 @@ public interface Opcodes {
int V20 = 0 << 16 | 64;
int V21 = 0 << 16 | 65;
int V22 = 0 << 16 | 66;
int V23 = 0 << 16 | 67;
/**
* Version flag indicating that the class is using 'preview' features.

8
spring-core/src/main/java/org/springframework/asm/SymbolTable.java
Unescape View File

@ -1414,23 +1414,23 @@ final class SymbolTable { @@ -1414,23 +1414,23 @@ final class SymbolTable {
}
Entry(final int index, final int tag, final String value, final int hashCode) {
super(index, tag, /* owner = */ null, /* name = */ null, value, /* data = */ 0);
super(index, tag, /* owner= */ null, /* name= */ null, value, /* data= */ 0);
this.hashCode = hashCode;
}
Entry(final int index, final int tag, final String value, final long data, final int hashCode) {
super(index, tag, /* owner = */ null, /* name = */ null, value, data);
super(index, tag, /* owner= */ null, /* name= */ null, value, data);
this.hashCode = hashCode;
}
Entry(
final int index, final int tag, final String name, final String value, final int hashCode) {
super(index, tag, /* owner = */ null, name, value, /* data = */ 0);
super(index, tag, /* owner= */ null, name, value, /* data= */ 0);
this.hashCode = hashCode;
}
Entry(final int index, final int tag, final long data, final int hashCode) {
super(index, tag, /* owner = */ null, /* name = */ null, /* value = */ null, data);
super(index, tag, /* owner= */ null, /* name= */ null, /* value= */ null, data);
this.hashCode = hashCode;
}
}

Write Preview
Loading…
Cancel
Save