hg: type-annotations/type-annotations/langtools: 4 new changesets

wdietl at gmail.com wdietl at gmail.com
Mon Dec 10 04:32:31 PST 2012


Changeset: c055a422ccbf
Author:    wmdietl
Date:      2012-12-10 04:23 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/c055a422ccbf

Big changes to the bytecode representation of type annotations: renaming of enum constants, completely different storage of generic/arrays/wildcards/inner types, changed order of annotations/positions, and many other changes.

! src/share/classes/com/sun/tools/classfile/ClassWriter.java
! src/share/classes/com/sun/tools/classfile/TypeAnnotation.java
! src/share/classes/com/sun/tools/javac/code/TargetType.java
! src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java
! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java

Changeset: 4e24226764cb
Author:    wmdietl
Date:      2012-12-10 04:26 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/4e24226764cb

The syntax change from "@A java.lang.Object" to "java.lang. at A Object" allows us to remove the onRightType hackery in the tree.

! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/share/classes/com/sun/tools/javac/tree/Pretty.java
! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java

Changeset: c57767f264d6
Author:    wmdietl
Date:      2012-12-10 04:27 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/c57767f264d6

Adapt to changed constants.

! src/share/classes/com/sun/tools/javap/AnnotationWriter.java

Changeset: cb7b7f789075
Author:    wmdietl
Date:      2012-12-10 04:30 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/cb7b7f789075

Update bytecode test cases to changed format.
The genericLocation attribute contains the bytes directly, making the tests hard to read. Better testing infrastructure would be good.
Everything but inner types should work correctly. I updated the genericLocation in most places, except for inner/nested types.

! test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java
! test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java



More information about the type-annotations-dev mailing list