hg: jdk9/dev/langtools: 2 new changesets
alan.bateman at oracle.com
alan.bateman at oracle.com
Thu Dec 1 11:36:17 UTC 2016
Changeset: d516975e8110
Author: alanb
Date: 2016-12-01 09:02 +0000
URL: http://hg.openjdk.java.net/jdk9/dev/langtools/rev/d516975e8110
8169069: Module system implementation refresh (11/2016)
Reviewed-by: mcimadamore, jjg, mchung, anazarov
Contributed-by: jonathan.gibbons at oracle.com, jan.lahoda at oracle.com, alan.bateman at oracle.com, mandy.chung at oracle.com, bhavesh.x.patel at oracle.com, andrey.x.nazarov at oracle.com
! src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java
! src/jdk.compiler/share/classes/com/sun/source/tree/ExportsTree.java
! src/jdk.compiler/share/classes/com/sun/source/tree/ModuleTree.java
+ src/jdk.compiler/share/classes/com/sun/source/tree/OpensTree.java
! src/jdk.compiler/share/classes/com/sun/source/tree/ProvidesTree.java
! src/jdk.compiler/share/classes/com/sun/source/tree/RequiresTree.java
! src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
! src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
! src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
! src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.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/comp/Annotate.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/Enter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.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/Locations.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
! src/jdk.compiler/share/classes/module-info.java
! src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
! src/jdk.javadoc/share/classes/module-info.java
! src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java
! src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java
- src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConcealedPackages_attribute.java
- src/jdk.jdeps/share/classes/com/sun/tools/classfile/Hashes_attribute.java
- src/jdk.jdeps/share/classes/com/sun/tools/classfile/MainClass_attribute.java
+ src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleHashes_attribute.java
+ src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleMainClass_attribute.java
+ src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java
+ src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java
+ src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleVersion_attribute.java
! src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java
- src/jdk.jdeps/share/classes/com/sun/tools/classfile/TargetPlatform_attribute.java
- src/jdk.jdeps/share/classes/com/sun/tools/classfile/Version_attribute.java
! src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java
! src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/TraverseProc.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleGraphBuilder.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties
! src/jdk.jdeps/share/classes/module-info.java
! src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
! src/jdk.jshell/share/classes/module-info.java
! test/TEST.ROOT
! test/jdk/javadoc/doclet/testModules/TestModules.java
! test/jdk/javadoc/doclet/testModules/module1/module-info.java
! test/jdk/javadoc/doclet/testModules/module2/module-info.java
+ test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationType.java
+ test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationTypeUndocumented.java
! test/jdk/javadoc/doclet/testModules/moduletags/module-info.java
! test/jdk/javadoc/tool/modules/Modules.java
! test/jdk/jshell/CompletionSuggestionTest.java
! test/jdk/jshell/ComputeFQNsTest.java
! test/jdk/jshell/HistoryTest.java
! test/jdk/jshell/JavadocTest.java
! test/jdk/jshell/PipeInputStreamTest.java
! test/lib/annotations/annotations/classfile/ClassfileInspector.java
! test/tools/javac/6304921/TestLog.java
! test/tools/javac/6410653/T6410653.java
! test/tools/javac/MethodParameters/AnnotationTest.java
! test/tools/javac/MethodParameters/AnonymousClass.java
! test/tools/javac/MethodParameters/AttributeVisitor.java
! test/tools/javac/MethodParameters/Constructors.java
! test/tools/javac/MethodParameters/EnumTest.java
! test/tools/javac/MethodParameters/InstanceMethods.java
! test/tools/javac/MethodParameters/LambdaTest.java
! test/tools/javac/MethodParameters/LocalClassTest.java
! test/tools/javac/MethodParameters/MemberClassTest.java
! test/tools/javac/MethodParameters/StaticMethods.java
! test/tools/javac/MethodParameters/UncommonParamNames.java
! test/tools/javac/T6435291/T6435291.java
! test/tools/javac/api/6400303/T6400303.java
! test/tools/javac/api/TestResolveIdent.java
! test/tools/javac/classfiles/attributes/Module/ModuleTest.java
! test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java
! test/tools/javac/defaultMethods/BadClassfile.java
! test/tools/javac/diags/examples.not-yet.txt
+ test/tools/javac/diags/examples/AddOpensIgnored.java
+ test/tools/javac/diags/examples/ConflictingExports/exported/Class.java
+ test/tools/javac/diags/examples/ConflictingExports/module-info.java
+ test/tools/javac/diags/examples/ConflictingExportsToModule/exported/Class.java
+ test/tools/javac/diags/examples/ConflictingExportsToModule/module-info.java
+ test/tools/javac/diags/examples/ConflictingOpens/exported/Class.java
+ test/tools/javac/diags/examples/ConflictingOpens/module-info.java
+ test/tools/javac/diags/examples/ConflictingOpensToModule/module-info.java
+ test/tools/javac/diags/examples/ConflictingOpensToModule/opened/Class.java
- test/tools/javac/diags/examples/DuplicateExports/exported/Class.java
- test/tools/javac/diags/examples/DuplicateExports/module-info.java
+ test/tools/javac/diags/examples/ExpectedModule.java
+ test/tools/javac/diags/examples/HasBeenDeprecatedModule/HasBeenDeprecatedModule.java
+ test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1/module-info.java
+ test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2/module-info.java
+ test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/HasBeenDeprecatedRemovalModule.java
+ test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1/module-info.java
+ test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2/module-info.java
- test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/LeaksNotAccessibleNotRequiredPublic.java
- test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m1/api1/Api1.java
- test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m1/module-info.java
- test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m2/api2/Api2.java
- test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m2/module-info.java
+ test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/LeaksNotAccessibleNotRequiredTransitive.java
+ test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/api1/Api1.java
+ test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/module-info.java
+ test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/api2/Api2.java
+ test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/module-info.java
+ test/tools/javac/diags/examples/NoOpensUnlessStrong/exported/Class.java
+ test/tools/javac/diags/examples/NoOpensUnlessStrong/module-info.java
+ test/tools/javac/diags/examples/NoPkgInModuleInfoJava/module-info.java
+ test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf.java
+ test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/impl/Impl.java
+ test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/module-info.java
! test/tools/javac/fatalErrors/NoJavaLangTest.java
! test/tools/javac/modules/AnnotationProcessing.java
+ test/tools/javac/modules/AnnotationsOnModules.java
! test/tools/javac/modules/AutomaticModules.java
! test/tools/javac/modules/EdgeCases.java
! test/tools/javac/modules/ExportsUnexported.java
! test/tools/javac/modules/GraphsTest.java
! test/tools/javac/modules/InvalidModuleDirective/module-info.java
! test/tools/javac/modules/ModuleInfoTest.java
! test/tools/javac/modules/ModuleInfoTreeAccess.java
! test/tools/javac/modules/ModulePathTest.java
+ test/tools/javac/modules/OpenModulesTest.java
! test/tools/javac/modules/PatchModulesTest.java
! test/tools/javac/modules/ProvidesTest.java
! test/tools/javac/modules/RepeatedUsesAndProvidesTest.java
! test/tools/javac/modules/ReportNonExistentPackageTest.java
- test/tools/javac/modules/RequiresPublicTest.java
+ test/tools/javac/modules/RequiresStaticTest.java
+ test/tools/javac/modules/RequiresTransitiveTest.java
! test/tools/javac/modules/T8158224/Processor.java
! test/tools/javac/modules/T8168854/pack1/Outer.java
! test/tools/javac/modules/T8168854/pack1/Outer1.java
! test/tools/javac/options/release/ReleaseOptionClashes.java
! test/tools/javac/parser/JavacParserTest.java
! test/tools/javac/platform/PlatformProviderTest.java
! test/tools/javac/processing/model/LocalClasses/LocalClassesModel.java
! test/tools/javac/processing/model/TestSymtabItems.java
! test/tools/javac/scope/DupUnsharedTest.java
! test/tools/javac/scope/HashCollisionTest.java
! test/tools/javac/scope/IterateAndRemove.java
! test/tools/javac/tree/SourceTreeScannerTest.java
! test/tools/javac/tree/TreeKindTest.java
! test/tools/javac/types/ScopeListenerTest.java
! test/tools/javap/4870651/T4870651.java
! test/tools/javap/MethodParameters.java
! test/tools/javap/T4975569.java
! test/tools/jdeps/lib/ModuleMetaData.java
! test/tools/jdeps/modules/CheckModuleTest.java
! test/tools/jdeps/modules/GenModuleInfo.java
+ test/tools/jdeps/modules/GenOpenModule.java
! test/tools/jdeps/modules/InverseDeps.java
! test/tools/jdeps/modules/ModuleTest.java
! test/tools/jdeps/modules/TransitiveDeps.java
- test/tools/jdeps/modules/src/m1/module-info.java
- test/tools/jdeps/modules/src/m1/p1/Goo.java
- test/tools/jdeps/modules/src/m1/p1/Lib.java
- test/tools/jdeps/modules/src/m1/p1/S.java
- test/tools/jdeps/modules/src/m1/p1/internal/Impl.java
- test/tools/jdeps/modules/src/m2/module-info.java
- test/tools/jdeps/modules/src/m2/p2/Bar.java
- test/tools/jdeps/modules/src/m2/p2/internal/T2.java
- test/tools/jdeps/modules/src/m3/module-info.java
- test/tools/jdeps/modules/src/m3/p3/Foo.java
- test/tools/jdeps/modules/src/m3/p3/Main.java
! test/tools/jdeps/modules/src/m4/module-info.java
! test/tools/jdeps/modules/src/m5/module-info.java
- test/tools/jdeps/modules/src/m6/module-info.java
- test/tools/jdeps/modules/src/m6/p6/indirect/UnsafeRef.java
- test/tools/jdeps/modules/src/m6/p6/safe/Lib.java
- test/tools/jdeps/modules/src/m7/module-info.java
- test/tools/jdeps/modules/src/m7/p7/Main.java
+ test/tools/jdeps/modules/src/mI/module-info.java
+ test/tools/jdeps/modules/src/mI/p1/Goo.java
+ test/tools/jdeps/modules/src/mI/p1/Lib.java
+ test/tools/jdeps/modules/src/mI/p1/S.java
+ test/tools/jdeps/modules/src/mI/p1/internal/Impl.java
+ test/tools/jdeps/modules/src/mII/module-info.java
+ test/tools/jdeps/modules/src/mII/p2/Bar.java
+ test/tools/jdeps/modules/src/mII/p2/internal/T2.java
+ test/tools/jdeps/modules/src/mIII/module-info.java
+ test/tools/jdeps/modules/src/mIII/p3/Foo.java
+ test/tools/jdeps/modules/src/mIII/p3/Main.java
+ test/tools/jdeps/modules/src/mVI/module-info.java
+ test/tools/jdeps/modules/src/mVI/p6/indirect/UnsafeRef.java
+ test/tools/jdeps/modules/src/mVI/p6/safe/Lib.java
+ test/tools/jdeps/modules/src/mVII/module-info.java
+ test/tools/jdeps/modules/src/mVII/p7/Main.java
+ test/tools/jdeps/modules/src/provider/META-INF/services/java.util.spi.ToolProvider
+ test/tools/jdeps/modules/src/provider/META-INF/services/p.Service$I$J
+ test/tools/jdeps/modules/src/provider/module-info.java
+ test/tools/jdeps/modules/src/provider/p/Provider.java
+ test/tools/jdeps/modules/src/provider/p/Service.java
+ test/tools/jdeps/modules/src/provider/q/ProviderImpl1.java
+ test/tools/jdeps/modules/src/provider/q/ProviderImpl2.java
+ test/tools/jdeps/modules/src/provider/q/ProviderImpl3.java
! test/tools/lib/toolbox/ModuleBuilder.java
! test/tools/sjavac/Serialization.java
Changeset: 5a2b9f22ba5d
Author: alanb
Date: 2016-12-01 11:16 +0000
URL: http://hg.openjdk.java.net/jdk9/dev/langtools/rev/5a2b9f22ba5d
Merge
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
- src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConcealedPackages_attribute.java
- src/jdk.jdeps/share/classes/com/sun/tools/classfile/Hashes_attribute.java
- src/jdk.jdeps/share/classes/com/sun/tools/classfile/MainClass_attribute.java
- src/jdk.jdeps/share/classes/com/sun/tools/classfile/TargetPlatform_attribute.java
- src/jdk.jdeps/share/classes/com/sun/tools/classfile/Version_attribute.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java
! src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties
! test/jdk/jshell/JavadocTest.java
! test/tools/javac/6410653/T6410653.java
- test/tools/javac/diags/examples/DuplicateExports/exported/Class.java
- test/tools/javac/diags/examples/DuplicateExports/module-info.java
- test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/LeaksNotAccessibleNotRequiredPublic.java
- test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m1/api1/Api1.java
- test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m1/module-info.java
- test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m2/api2/Api2.java
- test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m2/module-info.java
- test/tools/javac/modules/RequiresPublicTest.java
! test/tools/javac/options/release/ReleaseOptionClashes.java
- test/tools/jdeps/modules/src/m1/module-info.java
- test/tools/jdeps/modules/src/m1/p1/Goo.java
- test/tools/jdeps/modules/src/m1/p1/Lib.java
- test/tools/jdeps/modules/src/m1/p1/S.java
- test/tools/jdeps/modules/src/m1/p1/internal/Impl.java
- test/tools/jdeps/modules/src/m2/module-info.java
- test/tools/jdeps/modules/src/m2/p2/Bar.java
- test/tools/jdeps/modules/src/m2/p2/internal/T2.java
- test/tools/jdeps/modules/src/m3/module-info.java
- test/tools/jdeps/modules/src/m3/p3/Foo.java
- test/tools/jdeps/modules/src/m3/p3/Main.java
- test/tools/jdeps/modules/src/m6/module-info.java
- test/tools/jdeps/modules/src/m6/p6/indirect/UnsafeRef.java
- test/tools/jdeps/modules/src/m6/p6/safe/Lib.java
- test/tools/jdeps/modules/src/m7/module-info.java
- test/tools/jdeps/modules/src/m7/p7/Main.java
More information about the jdk9-dev-changes
mailing list