hg: amber/amber/langtools: manual merge

Thu Jun 15 23:44:44 UTC 2017

Changeset: cfdbb8e3f057
Author:    vromero
Date:      2017-06-15 19:20 -0400
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/cfdbb8e3f057

manual merge

! .hgtags
- make/src/classes/build/tools/listjdkinternals/ListJDKInternals.java
! make/tools/crules/CodingRulesAnalyzerPlugin.java
+ make/tools/crules/LegacyLogMethodAnalyzer.java
! make/tools/crules/resources/crules.properties
! make/tools/propertiesparser/parser/MessageFile.java
! make/tools/propertiesparser/parser/MessageLine.java
! make/tools/propertiesparser/parser/MessageType.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacMessager.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
! src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java
! src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/BuilderFactory.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/LayoutParser.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/XMLNode.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclet.xml
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
! src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
! src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
! test/jdk/jshell/MergedTabShiftTabCommandTest.java
! test/tools/javac/8002286/T8002286.out
! test/tools/javac/T5024091/T5024091.out
+ test/tools/javac/T8175794/MissingReturnConstraintTest.java
+ test/tools/javac/T8181464/Anno.java
+ test/tools/javac/T8181464/Anno2.java
+ test/tools/javac/T8181464/AnnoProcessor.java
+ test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.java
+ test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.out
+ test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.java
+ test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.out
+ test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest3.java
+ test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest3.out
! test/tools/javac/annotations/neg/AnonSubclass.out
! test/tools/javac/annotations/neg/Cycle1.out
! test/tools/javac/annotations/neg/Cycle2.out
! test/tools/javac/annotations/neg/Cycle3.out
! test/tools/javac/annotations/neg/Dup.out
! test/tools/javac/annotations/neg/Z14.out
! test/tools/javac/annotations/neg/Z15.out
! test/tools/javac/annotations/neg/pkg/package-info.out
! test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.out
! test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.out
! test/tools/javac/annotations/repeatingAnnotations/DuplicateErrors.out
! test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out
! 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
! test/tools/javac/diags/examples.not-yet.txt
! test/tools/javac/diags/examples/AnnoValueMustBeClassLiteral.java
+ test/tools/javac/diags/examples/AnnotationMustBeConstant.java
+ test/tools/javac/diags/examples/AnnotationMustBeConstant2.java
! test/tools/javac/diags/examples/AttrMustBeConstant.java
! test/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst.java
+ test/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst2.java
! test/tools/javac/importChecks/NoImportedNoClasses.out
! test/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.out
! test/tools/javac/staticImport/ImportPrivate.out