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

wdietl at gmail.com wdietl at gmail.com
Mon Dec 17 00:25:42 PST 2012 

Changeset: a43c94235366
Author:    wmdietl
Date:      2012-12-16 23:29 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a43c94235366

Big refactoring: one entry method, one class, don't modify parameters and return them, correctly count arrays and nested types, add some documentation, and smaller cleanups.

! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java

Changeset: 8fdf095581b0
Author:    wmdietl
Date:      2012-12-16 23:33 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/8fdf095581b0

Determine all type annotation positions once: at the end of attributing classes.

! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Enter.java

Changeset: 398d3d28610f
Author:    wmdietl
Date:      2012-12-16 23:41 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/398d3d28610f

methodDeclaratorRest no longer needs [Annotations] - those were for the receiver, which is now an extra parameter. Add a note about old-style arrays, which might need a change here.
insertAnnotationsToMostInner did not correctly handle nested types - make sure we move the annotation to the right spot in the AST.

! src/share/classes/com/sun/tools/javac/parser/JavacParser.java

Changeset: defd8146abbb
Author:    wmdietl
Date:      2012-12-16 23:43 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/defd8146abbb

Adapt test classes to changed bytecode format, in particular inner classes. Note that the test classes are nested one level within the surrounding class, requiring the extra {1, 0} in some places.

! test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.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

Changeset: fcf89720ae71
Author:    vromero
Date:      2012-12-10 16:21 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/fcf89720ae71

8003967: detect and remove all mutable implicit static enum fields in langtools
Reviewed-by: jjg

! src/share/classes/com/sun/tools/classfile/Opcode.java
! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java
! src/share/classes/com/sun/tools/javac/Server.java
! src/share/classes/com/sun/tools/javac/code/Flags.java
! src/share/classes/com/sun/tools/javac/code/Kinds.java
! src/share/classes/com/sun/tools/javac/code/Lint.java
! src/share/classes/com/sun/tools/javac/code/Source.java
! src/share/classes/com/sun/tools/javac/code/TargetType.java
! src/share/classes/com/sun/tools/javac/code/TypeTag.java
! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/ConstFold.java
! src/share/classes/com/sun/tools/javac/comp/Flow.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
! src/share/classes/com/sun/tools/javac/jvm/Code.java
! src/share/classes/com/sun/tools/javac/jvm/Target.java
! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/share/classes/com/sun/tools/javac/main/Option.java
! src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
! src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
! src/share/classes/com/sun/tools/javac/util/List.java
! src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java
! src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
! src/share/classes/com/sun/tools/javah/JavahTask.java
! src/share/classes/com/sun/tools/javap/JavapTask.java
! src/share/classes/javax/lang/model/element/Modifier.java
! src/share/classes/javax/lang/model/util/ElementFilter.java
! src/share/classes/javax/tools/StandardLocation.java
+ test/tools/javac/T8003967/DetectMutableStaticFields.java

Changeset: cfde9737131e
Author:    jjg
Date:      2012-12-11 15:05 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/cfde9737131e

8004828: refactor init of *DocImpl classes
Reviewed-by: darcy

! src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
! src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
! src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
! src/share/classes/com/sun/tools/javadoc/DocEnv.java
! src/share/classes/com/sun/tools/javadoc/DocImpl.java
! src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
! src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
! src/share/classes/com/sun/tools/javadoc/JavadocEnter.java
! src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
! src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
! src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
! src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
! src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
! src/share/classes/com/sun/tools/javadoc/RootDocImpl.java

Changeset: 170e486632d9
Author:    jlahoda
Date:      2012-12-12 20:26 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/170e486632d9

8004504: ListBuffer could reuse List.nil() as the sentinel element
Summary: ListBuffer.last now points to the last elements with client data, or null if none.
Reviewed-by: jjg, mcimadamore

! src/share/classes/com/sun/tools/javac/jvm/Code.java
! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/util/ListBuffer.java
+ test/tools/javac/util/list/ListBufferTest.java

Changeset: 376d6c1b49e5
Author:    jfranck
Date:      2012-12-03 11:16 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/376d6c1b49e5

8001114: Container annotation is not checked for semantic correctness
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Annotations.java
! src/share/classes/com/sun/tools/javac/comp/Annotate.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java
! test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out
! test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java
! test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out
! test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out
+ test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java
+ test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out
! test/tools/javac/diags/examples/ContainedByNonDefault.java
+ test/tools/javac/diags/examples/InvalidDuplicateAnnotation.java

Changeset: 37a5d7eccb87
Author:    vromero
Date:      2012-12-14 11:16 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/37a5d7eccb87

8004976: test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java can fail
Reviewed-by: jjg, mcimadamore

! test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java

Changeset: de1ec6fc93fe
Author:    vromero
Date:      2012-12-15 13:54 +0000
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/de1ec6fc93fe

8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
Reviewed-by: jjg, mcimadamore

! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/share/classes/com/sun/tools/javac/jvm/Code.java
! src/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/share/classes/com/sun/tools/javac/jvm/Pool.java
! src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java
+ test/tools/javac/8000518/DuplicateConstantPoolEntry.java
! test/tools/javac/lambda/TestInvokeDynamic.java

Changeset: 014a6a11dfe5
Author:    lana
Date:      2012-12-10 20:59 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/014a6a11dfe5

Merge

- test/tools/javac/defaultMethodExecution/DefaultMethodRegressionTests.java
- test/tools/javac/diags/examples/InvalidGenericDescInFunctionalInterface.java
- test/tools/javac/lambda/LambdaConversionTest.java

Changeset: 13ccb5269f3d
Author:    katleman
Date:      2012-12-13 09:05 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/13ccb5269f3d

Added tag jdk8-b68 for changeset 014a6a11dfe5

! .hgtags

Changeset: f72dc656a306
Author:    lana
Date:      2012-12-16 22:10 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f72dc656a306

Merge


Changeset: 2aa96a9a1bff
Author:    wmdietl
Date:      2012-12-17 00:11 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/2aa96a9a1bff

Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools

! .hgtags
! src/share/classes/com/sun/tools/javac/code/Annotations.java
! src/share/classes/com/sun/tools/javac/code/Flags.java
! src/share/classes/com/sun/tools/javac/code/Lint.java
! src/share/classes/com/sun/tools/javac/code/Source.java
! src/share/classes/com/sun/tools/javac/code/TargetType.java
! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Annotate.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/ConstFold.java
! src/share/classes/com/sun/tools/javac/comp/Flow.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/share/classes/com/sun/tools/javac/jvm/Code.java
! src/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/share/classes/com/sun/tools/javac/jvm/Target.java
! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
! src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
! src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
- test/tools/javac/typeAnnotations/newlocations/BasicTest.java
- test/tools/javac/typeAnnotations/newlocations/BasicTest.out

Changeset: 7ab2b5c3fef9
Author:    wmdietl
Date:      2012-12-17 00:24 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/7ab2b5c3fef9

Fix a simple merge error.

! src/share/classes/com/sun/tools/javac/comp/Annotate.java

Changeset: 16415bb3d5bd
Author:    wmdietl
Date:      2012-12-17 00:24 -0800
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/16415bb3d5bd

Adapt test cases to changed error format.

! test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out
! test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out
! test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out
! test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out
! test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out
! test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out
! test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out
! test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out
! test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out
! test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out

More information about the type-annotations-dev mailing list