Skip to content

Commit 1ebf2cf

Browse files
liachliach
committedAug 20, 2024
8336756: Improve ClassFile Annotation writing
Reviewed-by: asotona
1 parent 0267284 commit 1ebf2cf

File tree

3 files changed

+47
-99
lines changed

3 files changed

+47
-99
lines changed
 

‎src/java.base/share/classes/java/lang/classfile/AnnotationValue.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,7 @@ sealed interface OfArray extends AnnotationValue
9797
* @since 22
9898
*/
9999
@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
100-
sealed interface OfConstant
101-
extends AnnotationValue
102-
permits OfString, OfDouble, OfFloat, OfLong, OfInt, OfShort, OfChar, OfByte,
103-
OfBoolean, AnnotationImpl.OfConstantImpl {
100+
sealed interface OfConstant extends AnnotationValue {
104101
/**
105102
* {@return the constant pool entry backing this constant element}
106103
*

‎src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationImpl.java

+18-91
Original file line numberDiff line numberDiff line change
@@ -32,66 +32,34 @@
3232
import static java.lang.classfile.ClassFile.*;
3333

3434
public record AnnotationImpl(Utf8Entry className, List<AnnotationElement> elements)
35-
implements Annotation, Util.Writable {
35+
implements Annotation {
3636
public AnnotationImpl {
3737
elements = List.copyOf(elements);
3838
}
3939

40-
@Override
41-
public void writeTo(BufWriterImpl buf) {
42-
buf.writeIndex(className());
43-
buf.writeU2(elements().size());
44-
for (var e : elements) {
45-
buf.writeIndex(e.name());
46-
AnnotationReader.writeAnnotationValue(buf, e.value());
47-
}
48-
}
49-
5040
@Override
5141
public String toString() {
5242
StringBuilder sb = new StringBuilder("Annotation[");
5343
sb.append(className().stringValue());
5444
List<AnnotationElement> evps = elements();
55-
if (!evps.isEmpty())
56-
sb.append(" [");
57-
for (AnnotationElement evp : evps) {
58-
sb.append(evp.name().stringValue())
59-
.append("=")
60-
.append(evp.value().toString())
61-
.append(", ");
62-
}
6345
if (!evps.isEmpty()) {
64-
sb.delete(sb.length()-1, sb.length());
65-
sb.append("]");
46+
sb.append(' ').append(evps);
6647
}
6748
sb.append("]");
6849
return sb.toString();
6950
}
7051

7152
public record AnnotationElementImpl(Utf8Entry name,
7253
AnnotationValue value)
73-
implements AnnotationElement, Util.Writable {
74-
54+
implements AnnotationElement {
7555
@Override
76-
public void writeTo(BufWriterImpl buf) {
77-
buf.writeIndex(name());
78-
AnnotationReader.writeAnnotationValue(buf, value());
56+
public String toString() {
57+
return name + "=" + value;
7958
}
8059
}
8160

82-
public sealed interface OfConstantImpl extends AnnotationValue.OfConstant, Util.Writable {
83-
84-
@Override
85-
default void writeTo(BufWriterImpl buf) {
86-
buf.writeU1(tag());
87-
buf.writeIndex(constant());
88-
}
89-
90-
}
91-
9261
public record OfStringImpl(Utf8Entry constant)
93-
implements OfConstantImpl, AnnotationValue.OfString {
94-
62+
implements AnnotationValue.OfString {
9563
@Override
9664
public char tag() {
9765
return AEV_STRING;
@@ -104,8 +72,7 @@ public String stringValue() {
10472
}
10573

10674
public record OfDoubleImpl(DoubleEntry constant)
107-
implements OfConstantImpl, AnnotationValue.OfDouble {
108-
75+
implements AnnotationValue.OfDouble {
10976
@Override
11077
public char tag() {
11178
return AEV_DOUBLE;
@@ -118,8 +85,7 @@ public double doubleValue() {
11885
}
11986

12087
public record OfFloatImpl(FloatEntry constant)
121-
implements OfConstantImpl, AnnotationValue.OfFloat {
122-
88+
implements AnnotationValue.OfFloat {
12389
@Override
12490
public char tag() {
12591
return AEV_FLOAT;
@@ -132,8 +98,7 @@ public float floatValue() {
13298
}
13399

134100
public record OfLongImpl(LongEntry constant)
135-
implements OfConstantImpl, AnnotationValue.OfLong {
136-
101+
implements AnnotationValue.OfLong {
137102
@Override
138103
public char tag() {
139104
return AEV_LONG;
@@ -146,8 +111,7 @@ public long longValue() {
146111
}
147112

148113
public record OfIntImpl(IntegerEntry constant)
149-
implements OfConstantImpl, AnnotationValue.OfInt {
150-
114+
implements AnnotationValue.OfInt {
151115
@Override
152116
public char tag() {
153117
return AEV_INT;
@@ -160,8 +124,7 @@ public int intValue() {
160124
}
161125

162126
public record OfShortImpl(IntegerEntry constant)
163-
implements OfConstantImpl, AnnotationValue.OfShort {
164-
127+
implements AnnotationValue.OfShort {
165128
@Override
166129
public char tag() {
167130
return AEV_SHORT;
@@ -174,8 +137,7 @@ public short shortValue() {
174137
}
175138

176139
public record OfCharImpl(IntegerEntry constant)
177-
implements OfConstantImpl, AnnotationValue.OfChar {
178-
140+
implements AnnotationValue.OfChar {
179141
@Override
180142
public char tag() {
181143
return AEV_CHAR;
@@ -188,8 +150,7 @@ public char charValue() {
188150
}
189151

190152
public record OfByteImpl(IntegerEntry constant)
191-
implements OfConstantImpl, AnnotationValue.OfByte {
192-
153+
implements AnnotationValue.OfByte {
193154
@Override
194155
public char tag() {
195156
return AEV_BYTE;
@@ -202,8 +163,7 @@ public byte byteValue() {
202163
}
203164

204165
public record OfBooleanImpl(IntegerEntry constant)
205-
implements OfConstantImpl, AnnotationValue.OfBoolean {
206-
166+
implements AnnotationValue.OfBoolean {
207167
@Override
208168
public char tag() {
209169
return AEV_BOOLEAN;
@@ -216,8 +176,7 @@ public boolean booleanValue() {
216176
}
217177

218178
public record OfArrayImpl(List<AnnotationValue> values)
219-
implements AnnotationValue.OfArray, Util.Writable {
220-
179+
implements AnnotationValue.OfArray {
221180
public OfArrayImpl {
222181
values = List.copyOf(values);
223182
}
@@ -226,61 +185,29 @@ public record OfArrayImpl(List<AnnotationValue> values)
226185
public char tag() {
227186
return AEV_ARRAY;
228187
}
229-
230-
@Override
231-
public void writeTo(BufWriterImpl buf) {
232-
buf.writeU1(tag());
233-
buf.writeU2(values.size());
234-
for (var e : values) {
235-
AnnotationReader.writeAnnotationValue(buf, e);
236-
}
237-
}
238-
239188
}
240189

241190
public record OfEnumImpl(Utf8Entry className, Utf8Entry constantName)
242-
implements AnnotationValue.OfEnum, Util.Writable {
191+
implements AnnotationValue.OfEnum {
243192
@Override
244193
public char tag() {
245194
return AEV_ENUM;
246195
}
247-
248-
@Override
249-
public void writeTo(BufWriterImpl buf) {
250-
buf.writeU1(tag());
251-
buf.writeIndex(className);
252-
buf.writeIndex(constantName);
253-
}
254-
255196
}
256197

257198
public record OfAnnotationImpl(Annotation annotation)
258-
implements AnnotationValue.OfAnnotation, Util.Writable {
199+
implements AnnotationValue.OfAnnotation {
259200
@Override
260201
public char tag() {
261202
return AEV_ANNOTATION;
262203
}
263-
264-
@Override
265-
public void writeTo(BufWriterImpl buf) {
266-
buf.writeU1(tag());
267-
AnnotationReader.writeAnnotation(buf, annotation);
268-
}
269-
270204
}
271205

272206
public record OfClassImpl(Utf8Entry className)
273-
implements AnnotationValue.OfClass, Util.Writable {
207+
implements AnnotationValue.OfClass {
274208
@Override
275209
public char tag() {
276210
return AEV_CLASS;
277211
}
278-
279-
@Override
280-
public void writeTo(BufWriterImpl buf) {
281-
buf.writeU1(tag());
282-
buf.writeIndex(className);
283-
}
284-
285212
}
286213
}

‎src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java

+28-4
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,13 @@ private static int skipTypeAnnotation(ClassReader classReader, int p) {
281281
}
282282

283283
public static void writeAnnotation(BufWriterImpl buf, Annotation annotation) {
284-
// TODO annotation cleanup later
285-
((Util.Writable) annotation).writeTo(buf);
284+
buf.writeIndex(annotation.className());
285+
var elements = annotation.elements();
286+
buf.writeU2(elements.size());
287+
for (var e : elements) {
288+
buf.writeIndex(e.name());
289+
AnnotationReader.writeAnnotationValue(buf, e.value());
290+
}
286291
}
287292

288293
public static void writeAnnotations(BufWriter buf, List<Annotation> list) {
@@ -354,7 +359,26 @@ public static void writeTypeAnnotations(BufWriter buf, List<TypeAnnotation> list
354359
}
355360

356361
public static void writeAnnotationValue(BufWriterImpl buf, AnnotationValue value) {
357-
// TODO annotation cleanup later
358-
((Util.Writable) value).writeTo(buf);
362+
var tag = value.tag();
363+
buf.writeU1(tag);
364+
switch (value.tag()) {
365+
case AEV_BOOLEAN, AEV_BYTE, AEV_CHAR, AEV_DOUBLE, AEV_FLOAT, AEV_INT, AEV_LONG, AEV_SHORT, AEV_STRING ->
366+
buf.writeIndex(((AnnotationValue.OfConstant) value).constant());
367+
case AEV_CLASS -> buf.writeIndex(((AnnotationValue.OfClass) value).className());
368+
case AEV_ENUM -> {
369+
var enumValue = (AnnotationValue.OfEnum) value;
370+
buf.writeIndex(enumValue.className());
371+
buf.writeIndex(enumValue.constantName());
372+
}
373+
case AEV_ANNOTATION -> writeAnnotation(buf, ((AnnotationValue.OfAnnotation) value).annotation());
374+
case AEV_ARRAY -> {
375+
var array = ((AnnotationValue.OfArray) value).values();
376+
buf.writeU2(array.size());
377+
for (var e : array) {
378+
writeAnnotationValue(buf, e);
379+
}
380+
}
381+
default -> throw new InternalError("Unknown value " + value);
382+
}
359383
}
360384
}

0 commit comments

Comments
 (0)
Please sign in to comment.