stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8271623: Omit enclosing instance fields from inner classes that don't use it

Browse Source 
Reviewed-by: vromero, jlahoda
This commit is contained in:
Liam Miller-Cushon 2021-11-23 18:14:47 +00:00
parent 032067264f
commit ea85e01a4c
17 changed files with 429 additions and 55 deletions

71
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java

@ -98,6 +98,7 @@ public class Lower extends TreeTranslator {
private final boolean debugLower;
private final boolean disableProtectedAccessors; // experimental
private final PkgInfo pkginfoOpt;
private final boolean optimizeOuterThis;
protected Lower(Context context) {
context.put(lowerKey, this);
@ -119,6 +120,9 @@ public class Lower extends TreeTranslator {
Options options = Options.instance(context);
debugLower = options.isSet("debuglower");
pkginfoOpt = PkgInfo.get(options);
optimizeOuterThis =
target.optimizeOuterThis() ||
options.getBoolean("optimizeOuterThis", false);
disableProtectedAccessors = options.isSet("disableProtectedAccessors");
}
@ -1480,8 +1484,12 @@ public class Lower extends TreeTranslator {
private VarSymbol makeOuterThisVarSymbol(Symbol owner, long flags) {
Type target = types.erasure(owner.enclClass().type.getEnclosingType());
// Set NOOUTERTHIS for all synthetic outer instance variables, and unset
// it when the variable is accessed. If the variable is never accessed,
// we skip creating an outer instance field and saving the constructor
// parameter to it.
VarSymbol outerThis =
new VarSymbol(flags, outerThisName(target, owner), target, owner);
new VarSymbol(flags | NOOUTERTHIS, outerThisName(target, owner), target, owner);
outerThisStack = outerThisStack.prepend(outerThis);
return outerThis;
}
@ -1728,6 +1736,7 @@ public class Lower extends TreeTranslator {
}
VarSymbol ot = ots.head;
JCExpression tree = access(make.at(pos).Ident(ot));
ot.flags_field &= ~NOOUTERTHIS;
TypeSymbol otc = ot.type.tsym;
while (otc != c) {
do {
@ -1745,6 +1754,7 @@ public class Lower extends TreeTranslator {
return makeNull();
}
tree = access(make.at(pos).Select(tree, ot));
ot.flags_field &= ~NOOUTERTHIS;
otc = ot.type.tsym;
}
return tree;
@ -1784,6 +1794,7 @@ public class Lower extends TreeTranslator {
}
VarSymbol ot = ots.head;
JCExpression tree = access(make.at(pos).Ident(ot));
ot.flags_field &= ~NOOUTERTHIS;
TypeSymbol otc = ot.type.tsym;
while (!(preciseMatch ? sym.isMemberOf(otc, types) : otc.isSubClass(sym.owner, types))) {
do {
@ -1796,6 +1807,7 @@ public class Lower extends TreeTranslator {
ot = ots.head;
} while (ot.owner != otc);
tree = access(make.at(pos).Select(tree, ot));
ot.flags_field &= ~NOOUTERTHIS;
otc = ot.type.tsym;
}
return tree;
@ -1817,10 +1829,9 @@ public class Lower extends TreeTranslator {
/** Return tree simulating the assignment {@code this.this$n = this$n}.
*/
JCStatement initOuterThis(int pos) {
VarSymbol rhs = outerThisStack.head;
JCStatement initOuterThis(int pos, VarSymbol rhs) {
Assert.check(rhs.owner.kind == MTH);
VarSymbol lhs = outerThisStack.tail.head;
VarSymbol lhs = outerThisStack.head;
Assert.check(rhs.owner.owner == lhs.owner);
make.at(pos);
return
@ -2224,15 +2235,25 @@ public class Lower extends TreeTranslator {
// Convert name to flat representation, replacing '.' by '$'.
tree.name = Convert.shortName(currentClass.flatName());
// Add this$n and free variables proxy definitions to class.
// Add free variables proxy definitions to class.
for (List<JCVariableDecl> l = fvdefs; l.nonEmpty(); l = l.tail) {
tree.defs = tree.defs.prepend(l.head);
enterSynthetic(tree.pos(), l.head.sym, currentClass.members());
}
if (currentClass.hasOuterInstance()) {
// If this$n was accessed, add the field definition and
// update initial constructors to initialize it
if (currentClass.hasOuterInstance() && shouldEmitOuterThis(currentClass)) {
tree.defs = tree.defs.prepend(otdef);
enterSynthetic(tree.pos(), otdef.sym, currentClass.members());
for (JCTree def : tree.defs) {
if (TreeInfo.isInitialConstructor(def)) {
JCMethodDecl mdef = (JCMethodDecl) def;
mdef.body.stats = mdef.body.stats.prepend(
initOuterThis(mdef.body.pos, mdef.params.head.sym));
}
}
}
proxies = prevProxies;
@ -2249,6 +2270,39 @@ public class Lower extends TreeTranslator {
result = make_at(tree.pos()).Block(SYNTHETIC, List.nil());
}
private boolean shouldEmitOuterThis(ClassSymbol sym) {
if (!optimizeOuterThis) {
// Optimization is disabled
return true;
}
if ((outerThisStack.head.flags_field & NOOUTERTHIS) == 0) {
// Enclosing instance field is used
return true;
}
if (rs.isSerializable(sym.type) && !hasSerialVersionUID(sym)) {
// Class is serializable and does not have a stable serialVersionUID
return true;
}
return false;
}
private boolean hasSerialVersionUID(ClassSymbol sym) {
VarSymbol svuid = (VarSymbol) sym.members().findFirst(names.serialVersionUID, f -> f.kind == VAR);
if (svuid == null) {
return false;
}
if ((svuid.flags() & (STATIC | FINAL)) != (STATIC | FINAL)) {
return false;
}
if (!svuid.type.hasTag(LONG)) {
return false;
}
if (svuid.getConstValue() == null) {
return false;
}
return true;
}
List<JCTree> generateMandatedAccessors(JCClassDecl tree) {
List<JCVariableDecl> fields = TreeInfo.recordFields(tree);
return tree.sym.getRecordComponents().stream()
@ -2703,11 +2757,6 @@ public class Lower extends TreeTranslator {
olderasure.getThrownTypes(),
syms.methodClass);
}
if (currentClass.hasOuterInstance() &&
TreeInfo.isInitialConstructor(tree))
{
added = added.prepend(initOuterThis(tree.body.pos));
}
// pop local variables from proxy stack
proxies = prevProxies;

7
src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java

@ -203,4 +203,11 @@ public enum Target {
public boolean obsoleteAccStrict() {
return compareTo(JDK1_17) >= 0;
}
/** Omit unused enclosing instance fields from inner classes that don't access enclosing
* instance state.
*/
public boolean optimizeOuterThis() {
return compareTo(JDK1_18) >= 0;
}
}

9
test/langtools/tools/javac/6521805/T6521805d.java

@ -7,6 +7,8 @@
* @compile/fail/ref=T6521805d.out T6521805d.java -XDrawDiagnostics
*/
import java.util.Objects;
class T6521805 {
static class Inner extends T6521805.Outer {
@ -22,6 +24,11 @@ class T6521805 {
}
}
class Outer {}
class Outer {
{
// access enclosing instance so this$0 field is generated
Objects.requireNonNull(T6521805.this);
}
}
}

2
test/langtools/tools/javac/6521805/T6521805d.out

@ -1,2 +1,2 @@
T6521805d.java:18:18: compiler.err.cannot.generate.class: T6521805.Inner, (compiler.misc.synthetic.name.conflict: this$0, T6521805.Inner)
T6521805d.java:20:18: compiler.err.cannot.generate.class: T6521805.Inner, (compiler.misc.synthetic.name.conflict: this$0, T6521805.Inner)
1 error

9
test/langtools/tools/javac/6521805/p/Outer.java

@ -2,6 +2,13 @@
package p;
import java.util.Objects;
class Outer {
class Super {}
class Super {
{
// access enclosing instance so this$0 field is generated
Objects.requireNonNull(Outer.this);
}
}
}

6
test/langtools/tools/javac/ClassFileModifiers/MemberModifiers.out

@ -1,8 +1,6 @@
CLASSFILE MemberModifiers.c
--- SUPER
FIELD this$0
--- FINAL
METHOD <init>
---
@ -20,8 +18,6 @@ METHOD m
CLASSFILE MemberModifiersAux.Foo.c
--- SUPER
FIELD this$1
--- FINAL
METHOD <init>
---
@ -29,8 +25,6 @@ CLASSFILE MemberModifiersAux.Foo
--- FINAL SUPER
FIELD f
---
FIELD this$0
--- FINAL
METHOD <init>
---
METHOD m

4
test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java

@ -59,7 +59,7 @@ public class AnnotatedExtendsTest {
.classes(classPath.toString())
.run()
.getOutput(Task.OutputKind.DIRECT);
if (!javapOut.contains("0: #22(): CLASS_EXTENDS, type_index=65535"))
if (!javapOut.contains("0: #20(): CLASS_EXTENDS, type_index=65535"))
throw new AssertionError("Expected output missing: " + javapOut);
}
}
}

7
test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassConstructorsTest.java

@ -44,14 +44,11 @@
"<init>(AccessToPrivateInnerClassConstructorsTest)",
"<init>(AccessToPrivateInnerClassConstructorsTest, " +
"AccessToPrivateInnerClassConstructorsTest$1)"},
expectedNumberOfSyntheticFields = 1,
expectedNumberOfSyntheticMethods = 0)
@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest$1Local",
expectedMethods = {"<init>(AccessToPrivateInnerClassConstructorsTest)"},
expectedNumberOfSyntheticFields = 1)
expectedMethods = {"<init>(AccessToPrivateInnerClassConstructorsTest)"})
@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest$2Local",
expectedMethods = {"<init>(AccessToPrivateInnerClassConstructorsTest)"},
expectedNumberOfSyntheticFields = 1)
expectedMethods = {"<init>(AccessToPrivateInnerClassConstructorsTest)"})
public class AccessToPrivateInnerClassConstructorsTest {
public static void main(String... args) {

6
test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassMembersTest.java

@ -43,15 +43,13 @@
* 3. access method for private method function().
* 4. getter/setter for private field staticVar.
* 5. access method for private method staticFunction().
* 6. field this in Inner1.
* 7. constructor for Inner*.
* 6. constructor for Inner*.
*/
@ExpectedClass(className = "AccessToPrivateInnerClassMembersTest",
expectedMethods = {"<init>()", "<clinit>()"})
@ExpectedClass(className = "AccessToPrivateInnerClassMembersTest$Inner1",
expectedMethods = {"<init>(AccessToPrivateInnerClassMembersTest)", "function()"},
expectedFields = "var",
expectedNumberOfSyntheticFields = 1)
expectedFields = "var")
@ExpectedClass(className = "AccessToPrivateInnerClassMembersTest$Inner2",
expectedMethods = {"function()", "staticFunction()", "<init>()"},
expectedFields = {"staticVar", "var"})

6
test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateSiblingsTest.java

@ -43,14 +43,12 @@
* 3. access method for private method function().
* 4. getter/setter for private field staticVar.
* 5. access method for private method staticFunction().
* 6. field this in Inner1.
* 7. constructor for Inner*.
* 6. constructor for Inner*.
*/
@ExpectedClass(className = "AccessToPrivateSiblingsTest", expectedMethods = "<init>()")
@ExpectedClass(className = "AccessToPrivateSiblingsTest$Inner1",
expectedMethods = {"function()", "<init>(AccessToPrivateSiblingsTest)"},
expectedFields = "var",
expectedNumberOfSyntheticFields = 1)
expectedFields = "var")
@ExpectedClass(className = "AccessToPrivateSiblingsTest$Inner2",
expectedMethods = "<init>(AccessToPrivateSiblingsTest)",
expectedNumberOfSyntheticFields = 1)

9
test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTest.java

@ -55,19 +55,16 @@ import java.util.stream.IntStream;
@ExpectedClass(className = "BridgeMethodsForLambdaTest$Inner1",
expectedMethods = {"<init>(BridgeMethodsForLambdaTest)", "function()", "run()"},
expectedFields = "lambda1",
expectedNumberOfSyntheticMethods = 1,
expectedNumberOfSyntheticFields = 1)
expectedNumberOfSyntheticMethods = 1)
@ExpectedClass(className = "BridgeMethodsForLambdaTest$Inner2",
expectedMethods = {"<init>()", "staticFunction()"},
expectedFields = "lambda1",
expectedNumberOfSyntheticMethods = 1)
@ExpectedClass(className = "BridgeMethodsForLambdaTest$Inner3",
expectedMethods = {"<init>(BridgeMethodsForLambdaTest)", "function()"},
expectedNumberOfSyntheticFields = 1)
expectedMethods = {"<init>(BridgeMethodsForLambdaTest)", "function()"})
@ExpectedClass(className = "BridgeMethodsForLambdaTest$Inner4",
expectedMethods = {"<init>(BridgeMethodsForLambdaTest)", "function()"},
expectedNumberOfSyntheticMethods = 1,
expectedNumberOfSyntheticFields = 1)
expectedNumberOfSyntheticMethods = 1)
public class BridgeMethodsForLambdaTest {
private class Inner1 implements Runnable {

10
test/langtools/tools/javac/classfiles/attributes/Synthetic/ThisFieldTest.java

@ -34,6 +34,8 @@
* @run main SyntheticTestDriver ThisFieldTest
*/
import java.util.Objects;
/**
* Synthetic members:
* 1. fields this$0 for local and anonymous classes.
@ -49,9 +51,17 @@
public class ThisFieldTest {
{
class Local {
{
// access enclosing instance so this$0 field is generated
Objects.requireNonNull(ThisFieldTest.this);
}
}
new Local() {
{
// access enclosing instance so this$0 field is generated
Objects.requireNonNull(ThisFieldTest.this);
}
};
}
}

9
test/langtools/tools/javac/diags/examples/ErrSyntheticNameConflict.java

@ -24,11 +24,18 @@
// key: compiler.err.cannot.generate.class
// key: compiler.misc.synthetic.name.conflict
import java.util.Objects;
class ErrSyntheticNameConflict {
static class Outer {
ErrSyntheticNameConflict this$0 = null;
}
public class Inner extends Outer { }
public class Inner extends Outer {
{
// access enclosing instance so this$0 field is generated
Objects.requireNonNull(ErrSyntheticNameConflict.this);
}
}
}

84
test/langtools/tools/javac/optimizeOuterThis/DontOptimizeOuterThis.java Normal file

@ -0,0 +1,84 @@
/*
* Copyright (c) 2021, Google LLC. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.Optional;
/**
* @test
* @bug 8271623
*
* @compile --release 17 DontOptimizeOuterThis.java InnerClasses.java
* @run main DontOptimizeOuterThis
*/
public class DontOptimizeOuterThis extends InnerClasses {
public static void main(String[] args) {
new DontOptimizeOuterThis().test();
}
public void test() {
checkInner(localCapturesParameter(0), true);
checkInner(localCapturesLocal(), true);
checkInner(localCapturesEnclosing(), true);
checkInner(anonCapturesParameter(0), true);
checkInner(anonCapturesLocal(), true);
checkInner(anonCapturesEnclosing(), true);
checkInner(StaticMemberClass.class, false); // static
checkInner(NonStaticMemberClass.class, true);
checkInner(NonStaticMemberClassCapturesEnclosing.class, true);
checkInner(N0.class, false); // static
checkInner(N0.N1.class, true);
checkInner(N0.N1.N2.class, true);
checkInner(N0.N1.N2.N3.class, true);
checkInner(N0.N1.N2.N3.N4.class, true);
checkInner(N0.N1.N2.N3.N4.N5.class, true);
checkInner(SerializableCapture.class, true);
checkInner(SerializableWithSerialVersionUID.class, true);
checkInner(SerializableWithInvalidSerialVersionUIDType.class, true);
checkInner(SerializableWithInvalidSerialVersionUIDNonFinal.class, true);
checkInner(SerializableWithInvalidSerialVersionUIDNonStatic.class, true);
}
private static void checkInner(Class<?> clazz, boolean expectOuterThis) {
Optional<Field> outerThis = Arrays.stream(clazz.getDeclaredFields())
.filter(f -> f.getName().startsWith("this$")).findFirst();
if (expectOuterThis) {
if (outerThis.isEmpty()) {
throw new AssertionError(
String.format(
"expected %s to have an enclosing instance", clazz.getName()));
}
} else {
if (outerThis.isPresent()) {
throw new AssertionError(
String.format("%s had an unexpected enclosing instance", clazz.getName()));
}
}
}
}

130
test/langtools/tools/javac/optimizeOuterThis/InnerClasses.java Normal file

@ -0,0 +1,130 @@
/*
* Copyright (c) 2021, Google LLC. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.io.Serializable;
public class InnerClasses {
public Class<?> localCapturesParameter(final int x) {
class Local {
public void f() {
System.err.println(x);
}
}
return Local.class;
}
public Class<?> localCapturesLocal() {
final int x = 0;
class Local {
public void f() {
System.err.println(x);
}
}
return Local.class;
}
public Class<?> localCapturesEnclosing() {
class Local {
public void f() {
System.err.println(InnerClasses.this);
}
}
return Local.class;
}
public Class<?> anonCapturesParameter(final int x) {
return new Object() {
public void f() {
System.err.println(x);
}
}.getClass();
}
public Class<?> anonCapturesLocal() {
final int x = 0;
return new Object() {
public void f() {
System.err.println(x);
}
}.getClass();
}
public Class<?> anonCapturesEnclosing() {
return new Object() {
public void f() {
System.err.println(InnerClasses.this);
}
}.getClass();
}
public static class StaticMemberClass {}
public class NonStaticMemberClass {}
public class NonStaticMemberClassCapturesEnclosing {
public void f() {
System.err.println(InnerClasses.this);
}
}
static class N0 {
int x;
class N1 {
class N2 {
class N3 {
void f() {
System.err.println(x);
}
class N4 {
class N5 {}
}
}
}
}
}
class SerializableCapture implements Serializable {
void f() {
System.err.println(InnerClasses.this);
}
}
class SerializableWithSerialVersionUID implements Serializable {
private static final long serialVersionUID = 0;
}
class SerializableWithInvalidSerialVersionUIDType implements Serializable {
private static final int serialVersionUID = 0;
}
class SerializableWithInvalidSerialVersionUIDNonFinal implements Serializable {
private static long serialVersionUID = 0;
}
class SerializableWithInvalidSerialVersionUIDNonStatic implements Serializable {
private final long serialVersionUID = 0;
}
}

89
test/langtools/tools/javac/optimizeOuterThis/OptimizeOuterThis.java Normal file

@ -0,0 +1,89 @@
/*
* Copyright (c) 2021, Google LLC. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.Optional;
/**
* @test
* @bug 8271623
*
* @clean *
* @compile OptimizeOuterThis.java InnerClasses.java
* @run main OptimizeOuterThis
*
* @clean *
* @compile -XDoptimizeOuterThis=true --release 17 OptimizeOuterThis.java InnerClasses.java
* @run main OptimizeOuterThis
*/
public class OptimizeOuterThis extends InnerClasses {
public static void main(String[] args) {
new OptimizeOuterThis().test();
}
public void test() {
checkInner(localCapturesParameter(0), false);
checkInner(localCapturesLocal(), false);
checkInner(localCapturesEnclosing(), true);
checkInner(anonCapturesParameter(0), false);
checkInner(anonCapturesLocal(), false);
checkInner(anonCapturesEnclosing(), true);
checkInner(StaticMemberClass.class, false);
checkInner(NonStaticMemberClass.class, false);
checkInner(NonStaticMemberClassCapturesEnclosing.class, true);
checkInner(N0.class, false);
checkInner(N0.N1.class, true);
checkInner(N0.N1.N2.class, true);
checkInner(N0.N1.N2.N3.class, true);
checkInner(N0.N1.N2.N3.N4.class, false);
checkInner(N0.N1.N2.N3.N4.N5.class, false);
checkInner(SerializableCapture.class, true);
checkInner(SerializableWithSerialVersionUID.class, false);
checkInner(SerializableWithInvalidSerialVersionUIDType.class, true);
checkInner(SerializableWithInvalidSerialVersionUIDNonFinal.class, true);
checkInner(SerializableWithInvalidSerialVersionUIDNonStatic.class, true);
}
private static void checkInner(Class<?> clazz, boolean expectOuterThis) {
Optional<Field> outerThis = Arrays.stream(clazz.getDeclaredFields())
.filter(f -> f.getName().startsWith("this$")).findFirst();
if (expectOuterThis) {
if (outerThis.isEmpty()) {
throw new AssertionError(
String.format(
"expected %s to have an enclosing instance", clazz.getName()));
}
} else {
if (outerThis.isPresent()) {
throw new AssertionError(
String.format("%s had an unexpected enclosing instance %s", clazz.getName(), outerThis.get()));
}
}
}
}

26
test/langtools/tools/javap/AnnoTest.java

@ -49,50 +49,50 @@ public class AnnoTest {
expect(out,
"RuntimeVisibleAnnotations:\n" +
" 0: #21(#22=B#23)\n" +
" 0: #17(#18=B#19)\n" +
" AnnoTest$ByteAnno(\n" +
" value=(byte) 42\n" +
" )\n" +
" 1: #24(#22=S#25)\n" +
" 1: #20(#18=S#21)\n" +
" AnnoTest$ShortAnno(\n" +
" value=(short) 3\n" +
" )");
expect(out,
"RuntimeInvisibleAnnotations:\n" +
" 0: #27(#22=[J#28,J#30,J#32,J#34,J#36])\n" +
" 0: #23(#18=[J#24,J#26,J#28,J#30,J#32])\n" +
" AnnoTest$ArrayAnno(\n" +
" value=[1l,2l,3l,4l,5l]\n" +
" )\n" +
" 1: #38(#22=Z#39)\n" +
" 1: #34(#18=Z#35)\n" +
" AnnoTest$BooleanAnno(\n" +
" value=false\n" +
" )\n" +
" 2: #40(#41=c#42)\n" +
" 2: #36(#37=c#38)\n" +
" AnnoTest$ClassAnno(\n" +
" type=class Ljava/lang/Object;\n" +
" )\n" +
" 3: #43(#44=e#45.#46)\n" +
" 3: #39(#40=e#41.#42)\n" +
" AnnoTest$EnumAnno(\n" +
" kind=Ljavax/lang/model/element/ElementKind;.PACKAGE\n" +
" )\n" +
" 4: #47(#22=I#48)\n" +
" 4: #43(#18=I#44)\n" +
" AnnoTest$IntAnno(\n" +
" value=2\n" +
" )\n" +
" 5: #49()\n" +
" 5: #45()\n" +
" AnnoTest$IntDefaultAnno\n" +
" 6: #50(#51=s#52)\n" +
" 6: #46(#47=s#48)\n" +
" AnnoTest$NameAnno(\n" +
" name=\"NAME\"\n" +
" )\n" +
" 7: #53(#54=D#55,#57=F#58)\n" +
" 7: #49(#50=D#51,#53=F#54)\n" +
" AnnoTest$MultiAnno(\n" +
" d=3.14159d\n" +
" f=2.71828f\n" +
" )\n" +
" 8: #59()\n" +
" 8: #55()\n" +
" AnnoTest$SimpleAnno\n" +
" 9: #60(#22=@#47(#22=I#61))\n" +
" 9: #56(#18=@#43(#18=I#57))\n" +
" AnnoTest$AnnoAnno(\n" +
" value=@AnnoTest$IntAnno(\n" +
" value=5\n" +
@ -100,7 +100,7 @@ public class AnnoTest {
" )");
expect(out,
"RuntimeInvisibleTypeAnnotations:\n" +
" 0: #63(): CLASS_EXTENDS, type_index=0\n" +
" 0: #59(): CLASS_EXTENDS, type_index=0\n" +
" AnnoTest$TypeAnno");
if (errors > 0)