From 001ebb3a7279d9a193acebc389cbbee867fa5eb3 Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Thu, 17 Mar 2016 19:04:28 +0000 Subject: [PATCH] 8142968: Module System implementation Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282 Co-authored-by: Alex Buckley Co-authored-by: Jonathan Gibbons Co-authored-by: Karen Kinnear Co-authored-by: Mandy Chung Co-authored-by: Mark Reinhold Co-authored-by: Jan Lahoda Co-authored-by: Vicente Romero Co-authored-by: Andreas Lundblad Co-authored-by: Andrey Nazarov Co-authored-by: Chris Hegarty Co-authored-by: Erik Joelsson Co-authored-by: Kumar Srinivasan Co-authored-by: Sundararajan Athijegannathan Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs --- langtools/make/CompileInterim.gmk | 50 +- langtools/make/build.properties | 66 +- langtools/make/build.xml | 1092 ++++----------- .../make/gendata/Gendata-jdk.compiler.gmk | 5 + langtools/make/intellij/ant.xml | 8 +- langtools/make/intellij/build.xml | 12 +- langtools/make/intellij/langtools.iml | 9 +- .../src/idea/LangtoolsIdeaAntLogger.java | 4 +- langtools/make/intellij/workspace.xml | 62 +- langtools/make/launcher.sh-template | 22 +- langtools/make/netbeans/langtools/build.xml | 100 +- .../netbeans/langtools/nbproject/project.xml | 20 +- .../make/tools/anttasks/SelectToolTask.java | 50 +- .../crules/CodingRulesAnalyzerPlugin.java | 24 +- .../propertiesparser/parser/MessageType.java | 3 +- .../javax/lang/model/element/Element.java | 18 +- .../javax/lang/model/element/ElementKind.java | 10 +- .../lang/model/element/ElementVisitor.java | 11 +- .../lang/model/element/ModuleElement.java | 191 +++ .../lang/model/element/PackageElement.java | 11 +- .../javax/lang/model/type/TypeKind.java | 11 +- .../model/util/AbstractElementVisitor6.java | 17 +- .../model/util/AbstractElementVisitor9.java | 14 +- .../javax/lang/model/util/ElementFilter.java | 91 +- .../lang/model/util/ElementKindVisitor9.java | 15 +- .../lang/model/util/ElementScanner9.java | 15 +- .../javax/lang/model/util/Elements.java | 22 +- .../model/util/SimpleElementVisitor9.java | 16 +- .../tools/ForwardingJavaFileManager.java | 23 +- .../classes/javax/tools/JavaFileManager.java | 95 +- .../classes/javax/tools/StandardLocation.java | 55 +- .../classes/javax/tools/ToolProvider.java | 112 +- .../share/classes/module-info.java} | 42 +- .../com/sun/source/tree/DirectiveTree.java | 31 + .../com/sun/source/tree/ExportsTree.java | 55 + .../com/sun/source/tree/ModuleTree.java | 55 + .../com/sun/source/tree/ProvidesTree.java | 50 + .../com/sun/source/tree/RequiresTree.java | 51 + .../classes/com/sun/source/tree/Tree.java | 31 +- .../com/sun/source/tree/TreeVisitor.java | 42 +- .../com/sun/source/tree/UsesTree.java} | 37 +- .../sun/source/util/SimpleTreeVisitor.java | 32 +- .../com/sun/source/util/TreeScanner.java | 28 +- .../com/sun/tools/doclint/DocLint.java | 3 + .../sun/tools/javac/api/BasicJavacTask.java | 7 +- .../tools/javac/api/ClientCodeWrapper.java | 106 +- .../sun/tools/javac/api/JavacTaskImpl.java | 86 +- .../com/sun/tools/javac/api/JavacTool.java | 14 +- .../com/sun/tools/javac/api/JavacTrees.java | 42 +- .../com/sun/tools/javac/code/ClassFinder.java | 116 +- .../com/sun/tools/javac/code/Directive.java | 239 ++++ .../com/sun/tools/javac/code/Flags.java | 19 +- .../com/sun/tools/javac/code/Kinds.java | 10 +- .../sun/tools/javac/code/ModuleFinder.java | 335 +++++ .../com/sun/tools/javac/code/Printer.java | 13 +- .../com/sun/tools/javac/code/Source.java | 3 + .../com/sun/tools/javac/code/Symbol.java | 144 +- .../com/sun/tools/javac/code/Symtab.java | 349 +++-- .../com/sun/tools/javac/code/Type.java | 46 +- .../sun/tools/javac/code/TypeAnnotations.java | 6 + .../com/sun/tools/javac/code/TypeTag.java | 6 +- .../com/sun/tools/javac/code/Types.java | 5 +- .../com/sun/tools/javac/comp/Attr.java | 65 +- .../com/sun/tools/javac/comp/Check.java | 38 +- .../sun/tools/javac/comp/DeferredAttr.java | 14 +- .../com/sun/tools/javac/comp/Enter.java | 151 +- .../com/sun/tools/javac/comp/Flow.java | 16 + .../com/sun/tools/javac/comp/Lower.java | 35 +- .../com/sun/tools/javac/comp/Modules.java | 1243 +++++++++++++++++ .../com/sun/tools/javac/comp/Resolve.java | 63 +- .../com/sun/tools/javac/comp/TypeEnter.java | 26 +- .../sun/tools/javac/file/BaseFileManager.java | 40 +- .../com/sun/tools/javac/file/JRTIndex.java | 2 + .../tools/javac/file/JavacFileManager.java | 94 +- .../com/sun/tools/javac/file/Locations.java | 1022 ++++++++++++-- .../tools/javac/file/ModuleNameReader.java | 228 +++ .../com/sun/tools/javac/jvm/ClassFile.java | 5 +- .../com/sun/tools/javac/jvm/ClassReader.java | 313 ++++- .../com/sun/tools/javac/jvm/ClassWriter.java | 91 +- .../com/sun/tools/javac/jvm/JNIWriter.java | 24 +- .../com/sun/tools/javac/main/Arguments.java | 200 ++- .../sun/tools/javac/main/JavaCompiler.java | 148 +- .../com/sun/tools/javac/main/Main.java | 48 +- .../com/sun/tools/javac/main/Option.java | 143 +- .../sun/tools/javac/model/JavacElements.java | 64 +- .../sun/tools/javac/parser/JavacParser.java | 179 ++- .../JavacProcessingEnvironment.java | 207 ++- .../tools/javac/resources/compiler.properties | 232 ++- .../tools/javac/resources/javac.properties | 49 + .../sun/tools/javac/sym/CreateSymbols.java | 522 ------- .../com/sun/tools/javac/sym/Profiles.java | 305 ---- .../com/sun/tools/javac/tree/JCTree.java | 224 ++- .../com/sun/tools/javac/tree/Pretty.java | 70 +- .../com/sun/tools/javac/tree/TreeCopier.java | 40 +- .../com/sun/tools/javac/tree/TreeInfo.java | 25 +- .../com/sun/tools/javac/tree/TreeMaker.java | 36 + .../com/sun/tools/javac/tree/TreeScanner.java | 30 +- .../sun/tools/javac/util/ModuleHelper.java | 112 ++ .../sun/tools/javac/util/ModuleWrappers.java | 284 ++++ .../com/sun/tools/javac/util/Name.java | 6 +- .../com/sun/tools/javac/util/Names.java | 30 +- .../sun/tools/javac/util/ServiceLoader.java | 436 ------ .../com/sun/tools/javah/JavahTask.java | 18 +- .../sun/tools/javah/resources/l10n.properties | 13 +- .../com/sun/tools/sjavac/PubApiExtractor.java | 5 +- .../classes/com/sun/tools/sjavac/Source.java | 2 +- .../com/sun/tools/sjavac/comp/SjavacImpl.java | 5 +- .../tools/sjavac/comp/SmartFileManager.java | 20 +- .../share/classes/module-info.java | 76 + .../html/AbstractPackageIndexWriter.java | 26 +- .../doclets/formats/html/ClassWriterImpl.java | 25 +- .../formats/html/ConfigurationImpl.java | 10 +- .../doclets/formats/html/HtmlDoclet.java | 49 +- .../formats/html/HtmlDocletWriter.java | 104 +- .../formats/html/PackageIndexFrameWriter.java | 15 +- .../formats/html/PackageIndexWriter.java | 29 - .../html/ProfilePackageFrameWriter.java | 199 --- .../html/ProfilePackageWriterImpl.java | 346 ----- .../formats/html/ProfileWriterImpl.java | 274 ---- .../formats/html/WriterFactoryImpl.java | 21 +- .../formats/html/markup/HtmlConstants.java | 7 +- .../formats/html/markup/HtmlStyle.java | 4 +- .../formats/html/markup/HtmlWriter.java | 26 - .../html/resources/standard.properties | 4 - .../internal/toolkit/AbstractDoclet.java | 14 +- .../internal/toolkit/Configuration.java | 109 +- .../toolkit/ProfilePackageSummaryWriter.java | 125 -- .../internal/toolkit/WriterFactory.java | 30 +- .../toolkit/builders/AbstractBuilder.java | 4 +- .../toolkit/builders/BuilderFactory.java | 33 +- .../ProfilePackageSummaryBuilder.java | 373 ----- .../builders/ProfileSummaryBuilder.java | 329 ----- .../internal/toolkit/resources/doclet.xml | 17 +- .../toolkit/resources/doclets.properties | 3 - .../internal/toolkit/resources/stylesheet.css | 6 +- .../toolkit/taglets/TagletManager.java | 72 +- .../internal/toolkit/util/DocFileFactory.java | 11 +- .../internal/toolkit/util/DocPaths.java | 22 +- .../doclets/internal/toolkit/util/Extern.java | 2 +- .../internal/toolkit/util/MetaKeywords.java | 17 +- .../toolkit/util/StandardDocFileFactory.java | 8 +- .../doclets/internal/toolkit/util/Utils.java | 12 +- .../toolkit/util/VisibleMemberMap.java | 11 +- .../com/sun/tools/javadoc/ClassDocImpl.java | 4 +- .../classes/com/sun/tools/javadoc/DocEnv.java | 16 +- .../com/sun/tools/javadoc/DocletInvoker.java | 85 +- .../com/sun/tools/javadoc/JavadocTool.java | 73 +- .../com/sun/tools/javadoc/PackageDocImpl.java | 4 +- .../classes/com/sun/tools/javadoc/Start.java | 39 +- .../com/sun/tools/javadoc/ToolOption.java | 44 +- .../javadoc/resources/javadoc.properties | 1 + .../html/AbstractModuleIndexWriter.java} | 161 +-- .../html/AbstractPackageIndexWriter.java | 11 + .../doclets/formats/html/ClassWriterImpl.java | 13 +- .../formats/html/ConfigurationImpl.java | 21 + .../html/ConstantsSummaryWriterImpl.java | 2 +- .../doclets/formats/html/HtmlDoclet.java | 34 + .../formats/html/HtmlDocletWriter.java | 42 + .../formats/html/ModuleIndexFrameWriter.java} | 91 +- .../html/ModulePackageIndexFrameWriter.java} | 118 +- .../formats/html/ModuleWriterImpl.java | 286 ++++ .../formats/html/PackageIndexFrameWriter.java | 13 + .../formats/html/PackageWriterImpl.java | 10 + .../formats/html/WriterFactoryImpl.java | 11 + .../formats/html/markup/HtmlConstants.java | 5 + .../formats/html/markup/HtmlStyle.java | 2 + .../formats/html/markup/HtmlWriter.java | 23 + .../html/resources/standard.properties | 4 + .../doclets/toolkit/AbstractDoclet.java | 8 +- .../doclets/toolkit/Configuration.java | 40 +- .../doclets/toolkit/ModuleSummaryWriter.java} | 56 +- .../internal/doclets/toolkit/WorkArounds.java | 20 + .../doclets/toolkit/WriterFactory.java | 14 + .../toolkit/builders/BuilderFactory.java | 15 + .../builders/ConstantsSummaryBuilder.java | 7 +- .../builders/ModuleSummaryBuilder.java | 188 +++ .../doclets/toolkit/resources/doclet.xml | 10 +- .../toolkit/resources/doclets.properties | 3 + .../doclets/toolkit/resources/stylesheet.css | 10 +- .../toolkit/taglets/TagletManager.java | 25 +- .../doclets/toolkit/util/DocPaths.java | 15 + .../doclets/toolkit/util/MetaKeywords.java | 14 + .../toolkit/util/StandardDocFileFactory.java | 8 +- .../internal/doclets/toolkit/util/Utils.java | 58 + .../jdk/javadoc/internal/tool/DocEnv.java | 9 +- .../internal/tool/JavadocClassFinder.java | 1 + .../javadoc/internal/tool/JavadocTool.java | 44 +- .../jdk/javadoc/internal/tool/Start.java | 29 +- .../jdk/javadoc/internal/tool/ToolOption.java | 44 +- .../tool/resources/javadoc.properties | 1 + .../share/classes/module-info.java} | 40 +- .../com/sun/tools/classfile/AccessFlags.java | 11 +- .../com/sun/tools/classfile/Attribute.java | 20 +- .../com/sun/tools/classfile/ClassWriter.java | 122 +- .../ConcealedPackages_attribute.java | 74 + .../sun/tools/classfile/Hashes_attribute.java | 83 ++ .../tools/classfile/MainClass_attribute.java | 64 + .../sun/tools/classfile/Module_attribute.java | 160 +++ .../classfile/TargetPlatform_attribute.java | 54 + .../tools/classfile/Version_attribute.java | 60 + .../com/sun/tools/javap/AttributeWriter.java | 282 +++- .../com/sun/tools/javap/ClassWriter.java | 94 +- .../com/sun/tools/javap/JavapTask.java | 64 +- .../classes/com/sun/tools/javap/Options.java | 3 +- .../tools/javap/resources/javap.properties | 14 + .../classes/com/sun/tools/jdeps/Analyzer.java | 206 +-- .../classes/com/sun/tools/jdeps/Archive.java | 61 +- .../com/sun/tools/jdeps/ClassFileReader.java | 123 +- .../com/sun/tools/jdeps/DependencyFinder.java | 383 +++++ .../com/sun/tools/jdeps/JdepsFilter.java | 249 ++++ .../com/sun/tools/jdeps/JdepsTask.java | 898 +++++------- .../com/sun/tools/jdeps/JdepsWriter.java | 347 +++++ .../classes/com/sun/tools/jdeps/Module.java | 357 +++-- .../com/sun/tools/jdeps/ModuleAnalyzer.java | 708 ++++++++++ .../sun/tools/jdeps/ModuleInfoBuilder.java | 207 +++ .../com/sun/tools/jdeps/ModulePaths.java | 206 +++ .../com/sun/tools/jdeps/ModulesXmlReader.java | 163 --- .../sun/tools/jdeps/PlatformClassPath.java | 180 --- .../classes/com/sun/tools/jdeps/Profile.java | 33 +- .../tools/jdeps/resources/jdeps.properties | 145 +- .../jdeps/resources/jdkinternals.properties | 5 +- .../jdk.jdeps/share/classes/module-info.java | 32 + .../internal/jshell/remote/RemoteAgent.java | 3 + .../classes/jdk/jshell/ExecutionControl.java | 3 +- .../jdk/jshell/SourceCodeAnalysisImpl.java | 4 +- .../share/classes/jdk/jshell/TaskFactory.java | 4 +- .../jdk.jshell/share/classes/module-info.java | 35 + langtools/test/Makefile | 13 +- langtools/test/ProblemList.txt | 8 +- langtools/test/TEST.ROOT | 4 +- .../javadoc/testCustomTag/TestCustomTag.java | 4 +- .../testCustomTag/taglets/CustomTag.java | 10 +- .../testHtmlVersion/TestHtmlVersion.java | 317 +---- .../testLinkOption/TestLinkOption.java | 19 +- .../extra/StringBuilder.java} | 12 +- .../testLinkOption/{ => jdk}/package-list | 0 .../lang/StringBuilderChild.java | 4 +- .../testNavigation/TestNavigation.java | 84 +- .../TestNestedInlineTag.java | 3 +- .../testtaglets/BoldTaglet.java | 11 +- .../testtaglets/GreenTaglet.java | 11 +- .../testtaglets/UnderlineTaglet.java | 12 +- .../javadoc/testProfiles/TestProfiles.java | 253 ---- .../TestProfilesConfiguration.java | 124 -- .../javadoc/testProfiles/pkg2/ClassError.java | 31 - .../testProfiles/pkg2/ClassException.java | 31 - .../javadoc/testProfiles/pkg3/Class2Pkg3.java | 32 - .../javadoc/testProfiles/pkg4/Anno1Pkg4.java | 38 - .../javadoc/testProfiles/pkg4/Class1Pkg4.java | 32 - .../javadoc/testProfiles/pkg5/Class1Pkg5.java | 32 - .../testProfiles/pkg5/Interface1Pkg5.java | 40 - .../pkgDeprecated/package-info.java | 29 - .../profile-rtjar-includes-nopkgs.txt | 41 - .../testProfiles/profile-rtjar-includes.txt | 43 - .../javadoc/testSubTitle/TestSubTitle.java | 3 +- .../sun/javadoc/testTaglets/TestTaglets.java | 3 +- .../sun/javadoc/testTaglets/taglets/Foo.java | 10 +- .../jdk/javadoc/doclet/5093723/T5093723.java | 2 +- .../doclet/AccessAsciiArt/AccessAsciiArt.java | 4 +- .../AccessFrameTitle/AccessFrameTitle.java | 4 +- .../jdk/javadoc/doclet/AccessH1/AccessH1.java | 4 +- .../doclet/AccessSkipNav/AccessSkipNav.java | 4 +- .../doclet/AccessSummary/AccessSummary.java | 4 +- .../jdk/javadoc/doclet/AuthorDD/AuthorDD.java | 4 +- .../doclet/DocRootSlash/DocRootSlash.java | 2 +- .../doclet/InheritDocForUserTags/DocTest.java | 4 +- .../JavascriptWinTitle.java | 4 +- .../jdk/javadoc/doclet/MetaTag/MetaTag.java | 4 +- .../doclet/PackagesHeader/PackagesHeader.java | 4 +- .../jdk/javadoc/doclet/T6735320/T6735320.java | 4 +- .../javadoc/doclet/ValidHtml/ValidHtml.java | 4 +- .../doclet/VersionNumber/VersionNumber.java | 4 +- .../doclet/WindowTitles/WindowTitles.java | 4 +- .../TestConstantValuesDriver.java | 4 +- .../dupThrowsTags/TestDupThrowsTags.java | 4 +- .../testAbsLinkPath/TestAbsLinkPath.java | 4 +- .../TestAbstractMethod.java | 4 +- .../testAnchorNames/TestAnchorNames.java | 4 +- .../TestAnnotationOptional.java | 4 +- .../TestAnnotationTypes.java | 2 +- .../TestBackSlashInLink.java | 4 +- .../TestBadPackageFileInJar.java | 4 +- .../testBadSourceFile/TestBadSourceFile.java | 4 +- .../doclet/testBaseClass/TestBaseClass.java | 4 +- .../testBreakIterator/TestBreakIterator.java | 4 +- .../TestCRLineSeparator.java | 4 +- .../doclet/testCharset/TestCharset.java | 4 +- .../TestClassCrossReferences.java | 4 +- .../doclet/testClassTree/TestClassTree.java | 4 +- .../testCmndLineClass/TestCmndLineClass.java | 4 +- .../TestCompletionFailure.java | 4 +- .../TestConstantValuesPage.java | 4 +- .../TestConstructorIndent.java | 4 +- .../testConstructors/TestConstructors.java | 4 +- .../TestDeprecatedDocs.java | 4 +- .../testDocEncoding/TestDocEncoding.java | 4 +- .../TestDocErrorReporter.java | 4 +- .../doclet/testDocFileDir/TestDocFileDir.java | 4 +- .../doclet/testDocFiles/TestDocFiles.java | 4 +- .../TestDocRootInlineTag.java | 4 +- .../testDocRootLink/TestDocRootLink.java | 4 +- .../testDupParamWarn/TestDupParamWarn.java | 4 +- .../doclet/testEmptyClass/TestEmptyClass.java | 4 +- .../TestEnclosingClass.java | 4 +- .../doclet/testEncoding/TestEncoding.java | 4 +- .../TestExternalOverridenMethod.java | 4 +- .../testGeneratedBy/TestGeneratedBy.java | 4 +- .../testGroupOption/TestGroupOption.java | 4 +- .../doclet/testHeadings/TestHeadings.java | 4 +- .../doclet/testHelpFile/TestHelpFile.java | 4 +- .../doclet/testHelpOption/TestHelpOption.java | 2 +- .../testHiddenMembers/TestHiddenMembers.java | 4 +- .../jdk/javadoc/doclet/testHref/TestHref.java | 4 +- .../TestHrefInDocComment.java | 4 +- .../testHtmlComments/TestHtmlComments.java | 4 +- .../TestHtmlDefinitionListTag.java | 4 +- .../testHtmlDocument/TestHtmlDocument.java | 7 +- .../testHtmlStrongTag/TestHtmlStrongTag.java | 4 +- .../TestHtmlTableStyles.java | 4 +- .../testHtmlTableTags/TestHtmlTableTags.java | 4 +- .../doclet/testHtmlTag/TestHtmlTag.java | 4 +- .../testHtmlVersion/TestHtmlVersion.java | 18 +- .../testIndentation/TestIndentation.java | 4 +- .../javadoc/doclet/testIndex/TestIndex.java | 4 +- .../TestInlineLinkLabel.java | 4 +- .../doclet/testInterface/TestInterface.java | 2 +- .../javadoc/doclet/testJavaFX/TestJavaFX.java | 2 +- .../doclet/testJavascript/TestJavascript.java | 2 +- .../testLambdaFeature/TestLambdaFeature.java | 4 +- .../testLeadingSpaces/LeadingSpaces.java | 4 +- .../testLegacyTaglet/TestLegacyTaglet.java | 4 +- .../testLinkOption/TestBadLinkOption.java | 4 +- .../doclet/testLinkOption/TestLinkOption.java | 23 +- .../testLinkOption/TestNewLineInLink.java | 4 +- .../testLinkOption/extra/StringBuilder.java | 28 + .../testLinkOption/{ => jdk}/package-list | 0 .../lang/StringBuilderChild.java | 4 +- .../doclet/testLinkTaglet/TestLinkTaglet.java | 4 +- .../TestLinkToSerialForm.java | 4 +- .../TestLiteralCodeInPre.java | 4 +- .../TestMemberInheritence.java | 4 +- .../testMemberSummary/TestMemberSummary.java | 4 +- .../testMethodTypes/TestMethodTypes.java | 4 +- .../doclet/testModifierEx/TestModifierEx.java | 3 +- .../doclet/testNavigation/TestNavigation.java | 86 +- .../TestNestedGenerics.java | 4 +- .../TestNewLanguageFeatures.java | 4 +- .../TestNoPackagesFile.java | 4 +- .../testNotifications/TestNotifications.java | 4 +- .../doclet/testOptions/TestOptions.java | 4 +- .../doclet/testOrdering/TestOrdering.java | 4 +- .../TestMultiInheritence.java | 4 +- .../TestOverridenMethodDocCopy.java | 4 +- .../TestOverridenPrivateMethods.java | 4 +- ...verridenPrivateMethodsWithPackageFlag.java | 4 +- ...verridenPrivateMethodsWithPrivateFlag.java | 4 +- .../TestPackageDeprecation.java | 4 +- .../testPackagePage/TestPackagePage.java | 4 +- .../testParamTaglet/TestParamTaglet.java | 4 +- .../TestPrivateClasses.java | 4 +- .../TestRecurseSubPackages.java | 4 +- .../testRelativeLinks/TestRelativeLinks.java | 4 +- .../TestRepeatedAnnotations.java | 4 +- .../doclet/testReturnTag/TestReturnTag.java | 4 +- .../javadoc/doclet/testSearch/TestSearch.java | 4 +- .../javadoc/doclet/testSeeTag/TestSeeTag.java | 4 +- .../TestSerialVersionUID.java | 4 +- .../TestSerializedForm.java | 4 +- .../TestSerializedFormDeprecationInfo.java | 4 +- .../doclet/testSimpleTag/TestSimpleTag.java | 4 +- .../TestSimpleTagExclude.java | 4 +- .../TestSimpleTagInherit.java | 4 +- .../doclet/testSinceTag/TestSinceTag.java | 4 +- .../TestSingleQuotedLink.java | 4 +- .../doclet/testSourceTab/TestSourceTab.java | 4 +- .../doclet/testStylesheet/TestStylesheet.java | 4 +- .../doclet/testSubTitle/TestSubTitle.java | 2 +- .../TestSummaryHeading.java | 4 +- .../TestSuperClassInSerialForm.java | 4 +- .../testSupplementary/TestSupplementary.java | 2 +- .../TestTagInheritence.java | 4 +- .../doclet/testTagMisuse/TestTagMisuse.java | 4 +- .../doclet/testTagOutput/TestTagOutput.java | 4 +- .../doclet/testThrowsHead/TestThrowsHead.java | 4 +- .../TestThrowsTagInheritence.java | 2 +- .../doclet/testThrowsTag/TestThrowsTag.java | 4 +- .../testTitleInHref/TestTitleInHref.java | 4 +- .../doclet/testTopOption/TestTopOption.java | 4 +- .../TestTypeAnnotations.java | 2 +- .../testTypeParams/TestTypeParameters.java | 4 +- .../TestUnnamedPackage.java | 4 +- .../doclet/testUseOption/TestUseOption.java | 4 +- .../doclet/testValueTag/TestValueTag.java | 4 +- .../TestWarnBadParamNames.java | 4 +- .../testWindowTitle/TestWindowTitle.java | 4 +- .../doclet/testXOption/TestXOption.java | 4 +- .../typeAnnotations/smoke/TestSmoke.java | 2 +- .../test/jdk/javadoc/tool/6227454/Test.java | 12 +- .../jdk/javadoc/tool/6942366/T6942366.java | 4 +- .../test/jdk/javadoc/tool/6958836/Test.java | 4 +- .../test/jdk/javadoc/tool/6964914/Test.java | 5 +- .../javadoc/tool/6964914/TestStdDoclet.java | 2 +- .../javadoc/tool/6964914/TestUserDoclet.java | 2 +- .../javadoc/tool/BreakIteratorWarning.java | 4 +- .../jdk/javadoc/tool/CheckResourceKeys.java | 10 +- .../jdk/javadoc/tool/EnsureNewOldDoclet.java | 4 +- .../test/jdk/javadoc/tool/FlagsTooEarly.java | 4 +- langtools/test/jdk/javadoc/tool/MaxWarns.java | 4 +- langtools/test/jdk/javadoc/tool/NoStar.java | 4 +- .../test/jdk/javadoc/tool/QuietOption.java | 4 +- .../test/jdk/javadoc/tool/ReleaseOption.java | 3 +- .../jdk/javadoc/tool/T4994049/T4994049.java | 4 +- langtools/test/jdk/javadoc/tool/T6551367.java | 11 +- langtools/test/jdk/javadoc/tool/T6968833.java | 4 +- .../test/jdk/javadoc/tool/VerifyLocale.java | 2 +- langtools/test/jdk/javadoc/tool/XWerror.java | 4 +- .../tool/api/basic/JavadocTaskImplTest.java | 5 +- .../completionFailure/CompletionFailure.java | 4 +- .../jdk/javadoc/tool/doclint/DocLintTest.java | 1 + .../tool/doclint/ImplicitHeadersTest.java | 4 +- .../test/jdk/javadoc/tool/dupOk/DupOk.java | 4 +- .../jdk/javadoc/tool/nonConstExprs/Test.java | 4 +- .../jdk/javadoc/tool/outputRedirect/Test.java | 4 +- .../javadoc/tool/parser/7091528/T7091528.java | 4 +- langtools/test/jdk/jshell/ClassPathTest.java | 3 +- .../jdk/jshell/CommandCompletionTest.java | 1 + .../jdk/jshell/CompletionSuggestionTest.java | 3 +- .../test/jdk/jshell/ComputeFQNsTest.java | 3 + .../test/jdk/jshell/ErrorTranslationTest.java | 3 +- langtools/test/jdk/jshell/ImportTest.java | 3 +- langtools/test/jdk/jshell/InferTypeTest.java | 3 + .../test/jdk/jshell/StartOptionTest.java | 3 +- .../T8146368/JShellToolTest8146368.java | 2 +- langtools/test/jdk/jshell/ToolFormatTest.java | 4 + langtools/test/jdk/jshell/ToolReloadTest.java | 1 + .../classfile/ClassfileInspector.java | 509 ++----- langtools/test/tools/all/RunCodingRules.java | 15 +- .../test/tools/doclint/tool/PathsTest.java | 18 +- .../javac/4846262/CheckEBCDICLocaleTest.java | 1 + ...ddenOptionsShouldUseGivenEncodingTest.java | 1 + .../test/tools/javac/6330997/T6330997.java | 12 +- .../test/tools/javac/6403424/T6403424.java | 3 +- .../javac/6508981/TestInferBinaryName.java | 1 + .../test/tools/javac/6589361/T6589361.java | 6 +- .../test/tools/javac/6627362/T6627362.java | 5 +- .../test/tools/javac/6889255/T6889255.java | 2 +- .../tools/javac/AnonymousSubclassTest.java | 1 + .../javac/ClassPathTest/ClassPathTest.java | 1 + langtools/test/tools/javac/ConstFoldTest.java | 3 +- .../javac/Diagnostics/6769027/T6769027.java | 3 +- .../test/tools/javac/ExtDirs/ExtDirTest.java | 16 +- .../IncorrectInheritanceTest.java | 1 + .../MethodParameters/AttributeVisitor.java | 8 +- .../tools/javac/MethodParametersTest.java | 6 +- .../MissingInclude/MissingIncludeTest.java | 3 +- langtools/test/tools/javac/Object1.out | 2 - langtools/test/tools/javac/Object2.out | 2 - .../tools/javac/Paths/AbsolutePathTest.java | 1 + .../test/tools/javac/Paths/Diagnostics.sh | 64 +- .../ProtectedInnerClassesTest.java | 1 + .../test/tools/javac/T4093617/T4093617.java | 32 +- .../test/tools/javac/T4093617/T4093617.out | 2 +- .../javac/T4093617/java.base/Object.java | 10 + .../T4965689/ClassLiteralWastesByteTest.java | 3 +- .../MethodRefDupInConstantPoolTest.java | 3 +- .../javac/T5090006/AssertionFailureTest.java | 1 + .../javac/T6181889/EmptyFinallyTest.java | 3 +- langtools/test/tools/javac/T6358024.java | 6 +- langtools/test/tools/javac/T6358166.java | 10 +- langtools/test/tools/javac/T6403466.java | 12 +- langtools/test/tools/javac/T6405099.java | 9 +- langtools/test/tools/javac/T6406771.java | 28 +- .../test/tools/javac/T6435291/T6435291.java | 9 +- langtools/test/tools/javac/T6558476.java | 1 + langtools/test/tools/javac/T6725036.java | 3 +- langtools/test/tools/javac/T6942649.java | 19 +- .../DebugPointerAtBadPositionTest.java | 3 +- langtools/test/tools/javac/T6972327.java | 5 +- langtools/test/tools/javac/T6985181.java | 3 +- langtools/test/tools/javac/T6993301.java | 7 +- .../InlinedFinallyConfuseDebuggersTest.java | 1 + .../test/tools/javac/T7040592/T7040592.java | 3 +- .../T8003967/DetectMutableStaticFields.java | 143 +- ...ctProfileBCPOptionsIfUsedTogetherTest.java | 1 + ...CrashWhenMixingBinariesAndSourcesTest.java | 3 +- ...rNamesAreNotCopiedToAnonymousInitTest.java | 12 +- .../CompileErrorWithIteratorTest.java | 3 +- .../javac/T8019486/WrongLNTForLambdaTest.java | 7 +- ...atureDeterminationForInnerClassesTest.java | 1 + .../NoDeadCodeGenerationOnTrySmtTest.java | 7 +- .../ExceptionInferenceFromClassFileTest.java | 1 + .../TryWithResources/TwrForVariable3.out | 2 +- langtools/test/tools/javac/VersionOpt.java | 22 +- .../annotations/SyntheticParameters.java | 1 + .../typeAnnotations/TypeProcOnly.java | 4 +- .../classfile/NestedLambdasCastedTest.java | 1 + .../packageanno/PackageProcessor.java | 2 +- .../tools/javac/api/6400303/T6400303.java | 9 +- .../tools/javac/api/6412656/T6412656.java | 5 +- .../tools/javac/api/6418694/T6418694.java | 3 +- .../tools/javac/api/6440528/T6440528.java | 2 +- .../tools/javac/api/6557752/T6557752.java | 1 - .../tools/javac/api/6852595/T6852595.java | 1 - langtools/test/tools/javac/api/T6358786.java | 19 +- langtools/test/tools/javac/api/T6397104.java | 11 +- langtools/test/tools/javac/api/T6412669.java | 6 +- .../javac/api/TestClientCodeWrapper.java | 41 +- .../javac/api/TestGetElementReference.java | 25 +- .../test/tools/javac/api/TestJavacTask.java | 5 +- .../tools/javac/api/TestJavacTaskScanner.java | 12 +- .../tools/javac/api/TestResolveError.java | 3 +- .../tools/javac/api/TestResolveIdent.java | 12 +- .../test/tools/javac/api/TestSearchPaths.java | 37 +- langtools/test/tools/javac/api/TestTrees.java | 34 +- .../api/ToolProvider/HelloWorldTest.java | 1 + .../api/ToolProvider/ToolProviderTest1.java | 1 + .../api/ToolProvider/ToolProviderTest2.java | 1 + .../api/mod/api/pkg/Api.java} | 10 +- .../test/tools/javac/api/mod/module-info.java | 30 + .../javac/api/taskListeners/CompileEvent.java | 4 +- .../javac/boxing/IncrementBoxedAndAccess.java | 3 + .../cast/intersection/model/Model01.java | 2 +- .../cast/intersection/model/ModelChecker.java | 3 +- .../classfiles/InnerClasses/T8068517.java | 23 +- .../AnnotationDefaultTest.java | 1 + .../EnclosingMethod/EnclosingMethodTest.java | 1 + .../LineNumberTable/LineNumberTest.java | 1 + .../LocalVariableTableTest.java | 1 + .../LocalVariableTypeTableTest.java | 3 +- .../attributes/Module/ModuleFlagTest.java | 63 + .../attributes/Module/ModuleTest.java | 207 +++ .../attributes/Module/ModuleTestBase.java | 223 +++ .../attributes/Signature/ConstructorTest.java | 1 + .../attributes/Signature/EnumTest.java | 3 +- .../attributes/Signature/ExceptionTest.java | 3 +- .../attributes/Signature/FieldTest.java | 1 + .../attributes/Signature/InnerClassTest.java | 1 + .../Signature/MethodParameterTest.java | 1 + .../Signature/MethodTypeBoundTest.java | 3 +- .../attributes/Signature/ReturnTypeTest.java | 1 + .../SourceFile/AnonymousClassTest.java | 1 + .../attributes/SourceFile/InnerClassTest.java | 3 +- .../attributes/SourceFile/LocalClassTest.java | 1 + .../attributes/SourceFile/MixTest.java | 3 +- .../attributes/SourceFile/ModuleInfoTest.java | 55 + .../SourceFile/NoSourceFileAttribute.java | 3 +- .../SourceFile/SourceFileTestBase.java | 13 +- .../SourceFile/SyntheticClassTest.java | 1 + .../TopLevelClassesOneFileTest.java | 1 + .../AccessToPrivateInnerClassMembersTest.java | 1 + .../AccessToPrivateSiblingsTest.java | 3 +- .../attributes/Synthetic/AssertFieldTest.java | 3 +- .../BridgeMethodForGenericMethodTest.java | 1 + .../Synthetic/BridgeMethodsForLambdaTest.java | 1 + .../attributes/Synthetic/EnumTest.java | 3 +- .../attributes/Synthetic/PackageInfoTest.java | 1 + .../attributes/Synthetic/ThisFieldTest.java | 1 + ...untimeAnnotationsForGenericMethodTest.java | 1 + ...timeAnnotationsForInnerAnnotationTest.java | 1 + .../RuntimeAnnotationsForInnerClassTest.java | 1 + .../RuntimeAnnotationsForInnerEnumTest.java | 1 + ...ntimeAnnotationsForInnerInterfaceTest.java | 1 + ...untimeAnnotationsForTopLevelClassTest.java | 1 + ...ameterAnnotationsForGenericMethodTest.java | 1 + ...timeParameterAnnotationsForLambdaTest.java | 1 + .../RuntimeParameterAnnotationsTest.java | 1 + .../deprecated/DeprecatedPackageTest.java | 1 + .../attributes/deprecated/DeprecatedTest.java | 1 + ...InnerAnnotationsInInnerAnnotationTest.java | 1 + .../InnerAnnotationsInInnerClassTest.java | 1 + .../InnerAnnotationsInInnerEnumTest.java | 1 + .../InnerAnnotationsInInnerInterfaceTest.java | 1 + .../InnerClassesHierarchyTest.java | 1 + .../InnerClassesInAnonymousClassTest.java | 1 + .../InnerClassesInInnerAnnotationTest.java | 1 + .../InnerClassesInInnerClassTest.java | 1 + .../InnerClassesInInnerEnumTest.java | 1 + .../InnerClassesInInnerInterfaceTest.java | 1 + .../InnerClassesInLocalClassTest.java | 1 + .../innerclasses/InnerClassesIndexTest.java | 1 + .../innerclasses/InnerClassesTest.java | 1 + .../InnerEnumInInnerAnnotationTest.java | 3 +- .../InnerEnumInInnerEnumTest.java | 1 + .../InnerEnumInInnerInterfaceTest.java | 1 + .../InnerEnumsInInnerClassTest.java | 3 +- .../InnerInterfacesInInnerAnnotationTest.java | 1 + .../InnerInterfacesInInnerClassTest.java | 3 +- .../InnerInterfacesInInnerEnumTest.java | 1 + .../InnerInterfacesInInnerInterfaceTest.java | 1 + .../innerclasses/NoInnerClassesTest.java | 3 +- .../classfiles/attributes/lib/TestResult.java | 2 +- .../test/tools/javac/code/ArrayClone.java | 3 +- .../javac/defaultMethods/AssertionsTest.java | 1 + .../javac/defaultMethods/BadClassfile.java | 10 +- ...thodsNotVisibleForSourceLessThan8Test.java | 1 + .../test/tools/javac/diags/CheckExamples.java | 5 +- .../tools/javac/diags/CheckResourceKeys.java | 14 +- .../javac/diags/DocCommentProcessor.java | 3 +- langtools/test/tools/javac/diags/Example.java | 23 +- .../test/tools/javac/diags/FileManager.java | 7 +- .../tools/javac/diags/examples.not-yet.txt | 64 + .../examples/DirPathElementNotFound.java | 5 +- .../InvalidDefaultInterface.java | 3 +- .../processors/CreateBadClassFile.java | 11 +- .../InvalidStaticInterface.java | 3 +- .../processors/CreateBadClassFile.java | 11 +- .../javac/diags/examples/NoJavaLang.java | 4 +- .../javac/diags/examples/NoSuperclass.java | 3 +- .../tools/javac/doctree/ReferenceTest.java | 2 + .../javac/fatalErrors/NoJavaLangTest.java | 50 +- .../test/tools/javac/file/ExplodedImage.java | 20 +- langtools/test/tools/javac/file/T7018098.java | 14 +- .../generics/diamond/neg/T8078473_2.java | 2 +- .../CompletionFailureDuringImport.java | 4 + .../importscope/ImportDependenciesTest.java | 1 + .../javac/importscope/ImportMembersTest.java | 3 +- .../NegativeCyclicDependencyTest.java | 1 + .../innerClassFile/InnerClassFileTest.java | 1 + .../test/tools/javac/javazip/JavaZipTest.java | 1 + .../lambda/AvoidInfiniteReattribution.java | 6 +- .../lambda/LambdaInnerTypeVarReflect.java | 3 +- .../SourceToSourceTranslationTest.java | 1 + .../lambda/TestBootstrapMethodsCount.java | 1 + .../lambda/bridge/TestMetafactoryBridges.java | 1 - .../bridge/template_tests/TEST.properties | 5 +- ...estNonSerializableLambdaNameStability.java | 1 + .../TestSerializedLambdaNameStability.java | 1 + .../tools/javac/lambdaShapes/TEST.properties | 3 + langtools/test/tools/javac/lib/DPrinter.java | 4 + .../lib/JavacTestingAbstractProcessor.java | 18 +- .../javac/lib/combo/ReusableContext.java | 2 +- .../test/tools/javac/limits/NumArgsTest.java | 3 +- .../test/tools/javac/links/LinksTest.java | 1 + .../AbstractOrInnerClassServiceImplTest.java | 107 ++ .../tools/javac/modules/AddLimitMods.java | 533 +++++++ .../tools/javac/modules/AddReadsTest.java | 305 ++++ .../javac/modules/AnnotationProcessing.java | 318 +++++ .../AnnotationProcessorsInModulesTest.java | 234 ++++ .../tools/javac/modules/AutomaticModules.java | 223 +++ .../javac/modules/DoclintOtherModules.java | 72 + .../javac/modules/DuplicateClassTest.java | 71 + .../test/tools/javac/modules/EdgeCases.java | 267 ++++ .../test/tools/javac/modules/GraphsTest.java | 202 +++ .../tools/javac/modules/HelloWorldTest.java | 147 ++ .../test/tools/javac/modules/MOptionTest.java | 263 ++++ .../tools/javac/modules/ModuleFinderTest.java | 87 ++ .../tools/javac/modules/ModuleInfoTest.java | 322 +++++ .../tools/javac/modules/ModulePathTest.java | 417 ++++++ .../javac/modules/ModuleSourcePathTest.java | 459 ++++++ .../tools/javac/modules/ModuleTestBase.java | 186 +++ .../modules/ModulesAndClassPathTest.java | 265 ++++ .../javac/modules/MultiModuleModeTest.java | 165 +++ .../tools/javac/modules/NPEEmptyFileTest.java | 56 + .../tools/javac/modules/OutputDirTest.java | 166 +++ .../javac/modules/PackageConflictTest.java | 274 ++++ .../javac/modules/PackageMultipleModules.java | 78 ++ .../javac/modules/PluginsInModulesTest.java | 142 ++ .../tools/javac/modules/ProvidesTest.java | 433 ++++++ .../tools/javac/modules/QueryBeforeEnter.java | 434 ++++++ .../modules/RepeatedUsesAndProvidesTest.java | 85 ++ .../modules/ReportNonExistentPackageTest.java | 103 ++ .../javac/modules/RequiresPublicTest.java | 202 +++ .../test/tools/javac/modules/ResolveTest.java | 217 +++ .../ServiceInStaticClassErrorTest.java | 65 + ...rviceProvidedButNotExportedOrUsedTest.java | 103 ++ .../javac/modules/SingleModuleModeTest.java | 174 +++ .../tools/javac/modules/SubpackageTest.java | 117 ++ .../javac/modules/UpgradeModulePathTest.java | 289 ++++ .../test/tools/javac/modules/UsesTest.java | 266 ++++ .../test/tools/javac/modules/XModuleTest.java | 297 ++++ .../tools/javac/newlines/NewLineTest.java | 3 +- .../tools/javac/options/modes/Tester.java | 4 +- .../javac/options/xprefer/XPreferTest.java | 3 +- .../javac/platform/PlatformProviderTest.java | 9 + .../tools/javac/plugin/showtype/Test.java | 13 +- .../test/tools/javac/processing/T8142931.java | 14 +- .../ProcessingEnvAnnoDiscovery.java | 2 +- .../Processor.java | 3 +- .../Source.java | 2 +- .../Processor.java | 4 +- .../EnsureMirroredTypeException/Source.java | 2 +- .../GenerateFunctionalInterface.java | 2 +- .../GenerateSuperInterfaceProcessor.java | 5 +- .../processing/errors/TestBadProcessor.java | 2 +- .../loader/testClose/TestClose.java | 14 +- .../loader/testClose/TestClose2.java | 4 + .../processing/messager/MessagerDiags.java | 11 +- .../processing/model/TestSymtabItems.java | 16 + .../8009367/TestQualifiedNameUsed.java | 5 +- .../model/element/TestEmptyContainer.java | 3 +- .../TestMissingElement.java | 2 +- .../model/element/TestNonInherited.java | 3 +- .../model/inheritedByType/EnsureOrder.java | 9 +- .../model/testgetallmembers/Main.java | 40 +- .../processing/model/type/BasicAnnoTests.java | 2 +- .../processing/model/type/BoundsTest.java | 3 - .../javac/processing/model/type/NoTypes.java | 17 +- .../rounds/BaseClassesNotReRead.java | 3 +- .../processing/rounds/CompleteOnClosed.java | 1 + .../rounds/OverwriteBetweenCompilations.java | 7 +- .../tools/javac/profiles/ProfileTest.java | 115 -- .../tools/javac/proprietary/WarnClass.java | 13 - .../tools/javac/proprietary/WarnClass.out | 4 - .../tools/javac/proprietary/WarnImport.java | 14 - .../tools/javac/proprietary/WarnImport.out | 4 - .../tools/javac/proprietary/WarnMethod.java | 17 - .../tools/javac/proprietary/WarnMethod.out | 4 - .../javac/proprietary/WarnStaticImport.java | 14 - .../javac/proprietary/WarnStaticImport.out | 4 - .../tools/javac/proprietary/WarnVariable.java | 17 - .../tools/javac/proprietary/WarnVariable.out | 4 - .../tools/javac/proprietary/WarnWildcard.java | 15 - .../tools/javac/proprietary/WarnWildcard.out | 4 - .../javac/redefineObject/Object1-test.java} | 22 +- .../tools/javac/redefineObject/Object1.out | 2 + .../javac/redefineObject/Object2-test.java | 31 + .../tools/javac/redefineObject/Object2.out | 2 + .../java.base}/Object1.java | 8 +- .../java.base}/Object2.java | 8 +- .../tools/javac/resolve/BitWiseOperators.java | 4 + .../tools/javac/scope/DupUnsharedTest.java | 10 +- .../tools/javac/scope/HashCollisionTest.java | 6 +- .../javac/scope/RemoveSymbolUnitTest.java | 2 +- .../tools/javac/scope/StarImportTest.java | 5 +- .../tools/javac/stackmap/StackMapTest.java | 3 +- .../tools/javac/sym/ElementStructureTest.java | 15 +- .../test/tools/javac/synthesize/Main.java | 19 +- .../javac/synthesize/{ => src}/Boolean.java | 2 +- .../javac/synthesize/{ => src}/Byte.java | 2 +- .../javac/synthesize/{ => src}/Character.java | 2 +- .../javac/synthesize/{ => src}/Cloneable.java | 2 +- .../javac/synthesize/{ => src}/Double.java | 0 .../javac/synthesize/{ => src}/Float.java | 0 .../javac/synthesize/{ => src}/Integer.java | 2 +- .../javac/synthesize/{ => src}/Long.java | 2 +- .../javac/synthesize/{ => src}/Number.java | 2 +- .../javac/synthesize/{ => src}/Object.java | 2 +- .../synthesize/{ => src}/Serializable.java | 2 +- .../javac/synthesize/{ => src}/Short.java | 2 +- .../javac/synthesize/{ => src}/Test.java | 2 +- .../javac/synthesize/{ => src}/Void.java | 2 +- .../javac/synthesize/src/module-info.java | 27 + .../javac/tree/8067914/NukeExtraCast.java | 1 + .../tools/javac/tree/ArrayTypeToString.java | 3 +- .../test/tools/javac/tree/MakeTypeTest.java | 5 +- .../test/tools/javac/tree/ScopeTest.java | 2 +- .../javac/treeannotests/AnnoTreeTests.java | 2 +- .../javac/treeannotests/TestProcessor.java | 4 +- .../tools/javac/types/ScopeListenerTest.java | 3 + .../tools/javac/types/TestComparisons.java | 4 +- langtools/test/tools/javac/util/T6597678.java | 7 +- .../javac/warnings/6594914/T6594914b.out | 3 +- .../warnings/VerifyLintDescriptions.java | 7 +- .../test/tools/javadoc/6227454/Test.java | 4 - .../test/tools/javadoc/6964914/Test.java | 1 - .../tools/javadoc/6964914/TestStdDoclet.java | 4 +- .../tools/javadoc/6964914/TestUserDoclet.java | 2 +- .../test/tools/javadoc/CheckResourceKeys.java | 5 +- .../test/tools/javadoc/CompletionError.java | 1 + .../javadoc/api/basic/TagletPathTest.java | 3 +- .../test/tools/javah/6257087/T6257087.java | 1 + langtools/test/tools/javah/ModuleClass.java | 62 + .../javah/T4942232/MissingParamClassTest.java | 1 + .../javah/constMacroTest/ConstMacroTest.java | 3 +- .../test/tools/javap/4111861/T4111861.java | 4 +- .../JavapShouldLoadClassesFromRTJarTest.java | 3 +- .../javap/4866831/PublicInterfaceTest.java | 3 +- .../test/tools/javap/4870651/T4870651.java | 4 +- .../test/tools/javap/6937244/T6937244.java | 4 +- .../test/tools/javap/6937244/T6937244A.java | 4 +- .../8006334/JavapTaskCtorFailWithNPE.java | 4 +- .../JavapReturns0AfterClassNotFoundTest.java | 4 +- .../test/tools/javap/AccessModifiers.java | 4 +- .../test/tools/javap/BadAttributeLength.java | 4 +- .../tools/javap/BoundsTypeVariableTest.java | 4 +- .../test/tools/javap/DescriptorTest.java | 4 +- langtools/test/tools/javap/ExtPath.java | 4 +- .../test/tools/javap/InvalidOptions.java | 4 +- .../test/tools/javap/MethodParameters.java | 4 +- .../test/tools/javap/StackMapTableTest.java | 4 +- langtools/test/tools/javap/T4075403.java | 4 +- langtools/test/tools/javap/T4459541.java | 4 +- langtools/test/tools/javap/T4501660.java | 4 +- langtools/test/tools/javap/T4501661.java | 4 +- langtools/test/tools/javap/T4777949.java | 15 +- langtools/test/tools/javap/T4876942.java | 4 +- langtools/test/tools/javap/T4880663.java | 4 +- langtools/test/tools/javap/T4880672.java | 4 +- langtools/test/tools/javap/T4884240.java | 4 +- langtools/test/tools/javap/T4975569.java | 4 +- langtools/test/tools/javap/T6271787.java | 4 +- langtools/test/tools/javap/T6474890.java | 4 +- langtools/test/tools/javap/T6587786.java | 4 +- langtools/test/tools/javap/T6622216.java | 4 +- langtools/test/tools/javap/T6622232.java | 4 +- langtools/test/tools/javap/T6622260.java | 4 +- langtools/test/tools/javap/T6715251.java | 10 +- langtools/test/tools/javap/T6715753.java | 8 +- langtools/test/tools/javap/T6715767.java | 4 +- langtools/test/tools/javap/T6729471.java | 3 +- langtools/test/tools/javap/T6824493.java | 4 +- langtools/test/tools/javap/T6863746.java | 4 +- langtools/test/tools/javap/T6866657.java | 3 +- langtools/test/tools/javap/T6868539.java | 4 +- langtools/test/tools/javap/T6879371.java | 4 +- langtools/test/tools/javap/T6980017.java | 3 +- langtools/test/tools/javap/T7004698.java | 9 +- langtools/test/tools/javap/T7186925.java | 3 +- langtools/test/tools/javap/T7190862.java | 2 +- langtools/test/tools/javap/T8032814.java | 4 +- langtools/test/tools/javap/T8032819.java | 4 +- langtools/test/tools/javap/T8033180.java | 4 +- langtools/test/tools/javap/T8033711.java | 5 +- langtools/test/tools/javap/T8035104.java | 4 +- langtools/test/tools/javap/T8038414.java | 15 +- .../test/tools/javap/TestSuperclass.java | 4 +- .../test/tools/javap/WhitespaceTest.java | 4 +- .../javap/classfile/6888367/T6888367.java | 3 +- .../tools/javap/stackmap/StackmapTest.java | 3 +- .../tools/javap/typeAnnotations/T6855990.java | 8 +- langtools/test/tools/jdeps/APIDeps.java | 51 +- langtools/test/tools/jdeps/Basic.java | 20 +- langtools/test/tools/jdeps/CompilerUtils.java | 139 ++ langtools/test/tools/jdeps/DotFileTest.java | 15 +- .../VerboseFormat/JdepsDependencyClosure.java | 53 +- ...eUnsafe2.java => DontUseJdkInternal2.java} | 4 +- ...tly.java => UseJdkInternalIndirectly.java} | 6 +- ...eUnsafe3.java => DontUseJdkInternal3.java} | 4 +- ...y2.java => UseJdkInternalIndirectly2.java} | 6 +- .../DontUseJdkInternal.java} | 4 +- .../use/internal/UseClassWithJdkInternal.java | 7 + .../UseJdkInternalClass.java} | 8 +- .../use/internal/UseJdkInternalClass2.java | 31 + .../use/unsafe/UseClassWithUnsafe.java | 7 - langtools/test/tools/jdeps/f/F.java | 5 +- .../test/tools/jdeps/jdk.unsupported/Foo.java | 31 + .../jdk.unsupported/JDKUnsupportedTest.java | 107 ++ .../tools/jdeps/modules/GenModuleInfo.java | 233 +++ .../test/tools/jdeps/modules/ModuleTest.java | 310 ++++ .../jdeps/modules/src/m1/module-info.java | 27 + .../tools/jdeps/modules/src/m1/p1/Goo.java | 29 + .../jdeps/modules/src/m1/p1/Lib.java} | 14 +- .../test/tools/jdeps/modules/src/m1/p1/S.java | 28 + .../modules/src/m1/p1/internal/Impl.java} | 20 +- .../jdeps/modules/src/m2/module-info.java | 28 + .../tools/jdeps/modules/src/m2/p2/Bar.java | 34 + .../jdeps/modules/src/m2/p2/internal/T2.java} | 14 +- .../jdeps/modules/src/m3/module-info.java | 30 + .../src/m3/p3/Foo.java} | 16 +- .../tools/jdeps/modules/src/m3/p3/Main.java | 37 + .../jdeps/modules/src/m4/module-info.java | 29 + .../jdeps/modules/src/m4/p4/Lib.java} | 14 +- .../modules/src/m4/p4/internal/Impl.java | 31 + .../modules/src/unsupported/module-info.java | 26 + .../modules/src/unsupported/q/Counter.java} | 15 +- langtools/test/tools/jdeps/p/Bar.java | 2 +- langtools/test/tools/lib/ToolBox.java | 28 +- .../test/tools/sjavac/ApiExtraction.java | 1 + .../tools/sjavac/ClasspathDependencies.java | 1 + .../tools/sjavac/CompileCircularSources.java | 1 + .../sjavac/CompileExcludingDependency.java | 1 + .../test/tools/sjavac/CompileWithAtFile.java | 1 + .../sjavac/CompileWithInvisibleSources.java | 1 + .../sjavac/CompileWithOverrideSources.java | 1 + langtools/test/tools/sjavac/HiddenFiles.java | 1 + .../test/tools/sjavac/IncCompInheritance.java | 1 + .../tools/sjavac/IncCompileChangeNative.java | 1 + .../tools/sjavac/IncCompileDropClasses.java | 1 + .../sjavac/IncCompileFullyQualifiedRef.java | 1 + .../tools/sjavac/IncCompileNoChanges.java | 1 + .../tools/sjavac/IncCompileUpdateNative.java | 1 + .../tools/sjavac/IncCompileWithChanges.java | 1 + .../tools/sjavac/IncludeExcludePatterns.java | 1 + langtools/test/tools/sjavac/NoState.java | 1 + .../test/tools/sjavac/OverlappingSrcDst.java | 1 + .../tools/sjavac/PackagePathMismatch.java | 1 + .../tools/sjavac/ParallelCompilations.java | 1 + .../test/tools/sjavac/PermittedArtifact.java | 1 + langtools/test/tools/sjavac/StateDir.java | 1 + 879 files changed, 26184 insertions(+), 9697 deletions(-) create mode 100644 langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java rename langtools/{test/com/sun/javadoc/testProfiles/pkg2/Class1Pkg2.java => src/java.compiler/share/classes/module-info.java} (61%) create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/source/tree/DirectiveTree.java create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExportsTree.java create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModuleTree.java create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ProvidesTree.java create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/source/tree/RequiresTree.java rename langtools/{test/com/sun/javadoc/testProfiles/pkg1/Interface1Pkg1.java => src/jdk.compiler/share/classes/com/sun/source/tree/UsesTree.java} (60%) create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ModuleNameReader.java delete mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/sym/CreateSymbols.java delete mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/sym/Profiles.java create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleWrappers.java delete mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ServiceLoader.java create mode 100644 langtools/src/jdk.compiler/share/classes/module-info.java delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfilePackageSummaryBuilder.java delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfileSummaryBuilder.java rename langtools/src/jdk.javadoc/share/classes/{com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java => jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java} (60%) rename langtools/src/jdk.javadoc/share/classes/{com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java => jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java} (61%) rename langtools/src/jdk.javadoc/share/classes/{com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java => jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java} (56%) create mode 100644 langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java rename langtools/src/jdk.javadoc/share/classes/{com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java => jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java} (60%) create mode 100644 langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java rename langtools/{test/com/sun/javadoc/testProfiles/pkg3/Interface1Pkg3.java => src/jdk.javadoc/share/classes/module-info.java} (58%) create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConcealedPackages_attribute.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Hashes_attribute.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/MainClass_attribute.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TargetPlatform_attribute.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Version_attribute.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsWriter.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java create mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModulePaths.java delete mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModulesXmlReader.java delete mode 100644 langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/PlatformClassPath.java create mode 100644 langtools/src/jdk.jdeps/share/classes/module-info.java create mode 100644 langtools/src/jdk.jshell/share/classes/module-info.java rename langtools/test/com/sun/javadoc/{testProfiles/pkg1/Class3Pkg1.java => testLinkOption/extra/StringBuilder.java} (86%) rename langtools/test/com/sun/javadoc/testLinkOption/{ => jdk}/package-list (100%) rename langtools/test/com/sun/javadoc/testLinkOption/{java => mylib}/lang/StringBuilderChild.java (91%) delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/pkg2/ClassError.java delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/pkg2/ClassException.java delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/pkg3/Class2Pkg3.java delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/pkg4/Anno1Pkg4.java delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/pkg4/Class1Pkg4.java delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/pkg5/Class1Pkg5.java delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/pkg5/Interface1Pkg5.java delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/pkgDeprecated/package-info.java delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/profile-rtjar-includes-nopkgs.txt delete mode 100644 langtools/test/com/sun/javadoc/testProfiles/profile-rtjar-includes.txt create mode 100644 langtools/test/jdk/javadoc/doclet/testLinkOption/extra/StringBuilder.java rename langtools/test/jdk/javadoc/doclet/testLinkOption/{ => jdk}/package-list (100%) rename langtools/test/jdk/javadoc/doclet/testLinkOption/{java => mylib}/lang/StringBuilderChild.java (91%) delete mode 100644 langtools/test/tools/javac/Object1.out delete mode 100644 langtools/test/tools/javac/Object2.out create mode 100644 langtools/test/tools/javac/T4093617/java.base/Object.java rename langtools/test/tools/{jdeps/VerboseFormat/use/unsafe/UseUnsafeClass.java => javac/api/mod/api/pkg/Api.java} (89%) create mode 100644 langtools/test/tools/javac/api/mod/module-info.java create mode 100644 langtools/test/tools/javac/classfiles/attributes/Module/ModuleFlagTest.java create mode 100644 langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java create mode 100644 langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java create mode 100644 langtools/test/tools/javac/classfiles/attributes/SourceFile/ModuleInfoTest.java create mode 100644 langtools/test/tools/javac/modules/AbstractOrInnerClassServiceImplTest.java create mode 100644 langtools/test/tools/javac/modules/AddLimitMods.java create mode 100644 langtools/test/tools/javac/modules/AddReadsTest.java create mode 100644 langtools/test/tools/javac/modules/AnnotationProcessing.java create mode 100644 langtools/test/tools/javac/modules/AnnotationProcessorsInModulesTest.java create mode 100644 langtools/test/tools/javac/modules/AutomaticModules.java create mode 100644 langtools/test/tools/javac/modules/DoclintOtherModules.java create mode 100644 langtools/test/tools/javac/modules/DuplicateClassTest.java create mode 100644 langtools/test/tools/javac/modules/EdgeCases.java create mode 100644 langtools/test/tools/javac/modules/GraphsTest.java create mode 100644 langtools/test/tools/javac/modules/HelloWorldTest.java create mode 100644 langtools/test/tools/javac/modules/MOptionTest.java create mode 100644 langtools/test/tools/javac/modules/ModuleFinderTest.java create mode 100644 langtools/test/tools/javac/modules/ModuleInfoTest.java create mode 100644 langtools/test/tools/javac/modules/ModulePathTest.java create mode 100644 langtools/test/tools/javac/modules/ModuleSourcePathTest.java create mode 100644 langtools/test/tools/javac/modules/ModuleTestBase.java create mode 100644 langtools/test/tools/javac/modules/ModulesAndClassPathTest.java create mode 100644 langtools/test/tools/javac/modules/MultiModuleModeTest.java create mode 100644 langtools/test/tools/javac/modules/NPEEmptyFileTest.java create mode 100644 langtools/test/tools/javac/modules/OutputDirTest.java create mode 100644 langtools/test/tools/javac/modules/PackageConflictTest.java create mode 100644 langtools/test/tools/javac/modules/PackageMultipleModules.java create mode 100644 langtools/test/tools/javac/modules/PluginsInModulesTest.java create mode 100644 langtools/test/tools/javac/modules/ProvidesTest.java create mode 100644 langtools/test/tools/javac/modules/QueryBeforeEnter.java create mode 100644 langtools/test/tools/javac/modules/RepeatedUsesAndProvidesTest.java create mode 100644 langtools/test/tools/javac/modules/ReportNonExistentPackageTest.java create mode 100644 langtools/test/tools/javac/modules/RequiresPublicTest.java create mode 100644 langtools/test/tools/javac/modules/ResolveTest.java create mode 100644 langtools/test/tools/javac/modules/ServiceInStaticClassErrorTest.java create mode 100644 langtools/test/tools/javac/modules/ServiceProvidedButNotExportedOrUsedTest.java create mode 100644 langtools/test/tools/javac/modules/SingleModuleModeTest.java create mode 100644 langtools/test/tools/javac/modules/SubpackageTest.java create mode 100644 langtools/test/tools/javac/modules/UpgradeModulePathTest.java create mode 100644 langtools/test/tools/javac/modules/UsesTest.java create mode 100644 langtools/test/tools/javac/modules/XModuleTest.java delete mode 100644 langtools/test/tools/javac/profiles/ProfileTest.java delete mode 100644 langtools/test/tools/javac/proprietary/WarnClass.java delete mode 100644 langtools/test/tools/javac/proprietary/WarnClass.out delete mode 100644 langtools/test/tools/javac/proprietary/WarnImport.java delete mode 100644 langtools/test/tools/javac/proprietary/WarnImport.out delete mode 100644 langtools/test/tools/javac/proprietary/WarnMethod.java delete mode 100644 langtools/test/tools/javac/proprietary/WarnMethod.out delete mode 100644 langtools/test/tools/javac/proprietary/WarnStaticImport.java delete mode 100644 langtools/test/tools/javac/proprietary/WarnStaticImport.out delete mode 100644 langtools/test/tools/javac/proprietary/WarnVariable.java delete mode 100644 langtools/test/tools/javac/proprietary/WarnVariable.out delete mode 100644 langtools/test/tools/javac/proprietary/WarnWildcard.java delete mode 100644 langtools/test/tools/javac/proprietary/WarnWildcard.out rename langtools/test/{com/sun/javadoc/testProfiles/pkg2/Anno1Pkg2.java => tools/javac/redefineObject/Object1-test.java} (78%) create mode 100644 langtools/test/tools/javac/redefineObject/Object1.out create mode 100644 langtools/test/tools/javac/redefineObject/Object2-test.java create mode 100644 langtools/test/tools/javac/redefineObject/Object2.out rename langtools/test/tools/javac/{ => redefineObject/java.base}/Object1.java (76%) rename langtools/test/tools/javac/{ => redefineObject/java.base}/Object2.java (76%) rename langtools/test/tools/javac/synthesize/{ => src}/Boolean.java (95%) rename langtools/test/tools/javac/synthesize/{ => src}/Byte.java (95%) rename langtools/test/tools/javac/synthesize/{ => src}/Character.java (95%) rename langtools/test/tools/javac/synthesize/{ => src}/Cloneable.java (94%) rename langtools/test/tools/javac/synthesize/{ => src}/Double.java (100%) rename langtools/test/tools/javac/synthesize/{ => src}/Float.java (100%) rename langtools/test/tools/javac/synthesize/{ => src}/Integer.java (95%) rename langtools/test/tools/javac/synthesize/{ => src}/Long.java (95%) rename langtools/test/tools/javac/synthesize/{ => src}/Number.java (94%) rename langtools/test/tools/javac/synthesize/{ => src}/Object.java (94%) rename langtools/test/tools/javac/synthesize/{ => src}/Serializable.java (94%) rename langtools/test/tools/javac/synthesize/{ => src}/Short.java (95%) rename langtools/test/tools/javac/synthesize/{ => src}/Test.java (95%) rename langtools/test/tools/javac/synthesize/{ => src}/Void.java (94%) create mode 100644 langtools/test/tools/javac/synthesize/src/module-info.java create mode 100644 langtools/test/tools/javah/ModuleClass.java create mode 100644 langtools/test/tools/jdeps/CompilerUtils.java rename langtools/test/tools/jdeps/VerboseFormat/use/indirect/{DontUseUnsafe2.java => DontUseJdkInternal2.java} (95%) rename langtools/test/tools/jdeps/VerboseFormat/use/indirect/{UseUnsafeIndirectly.java => UseJdkInternalIndirectly.java} (87%) rename langtools/test/tools/jdeps/VerboseFormat/use/indirect2/{DontUseUnsafe3.java => DontUseJdkInternal3.java} (95%) rename langtools/test/tools/jdeps/VerboseFormat/use/indirect2/{UseUnsafeIndirectly2.java => UseJdkInternalIndirectly2.java} (88%) rename langtools/test/tools/jdeps/VerboseFormat/use/{unsafe/DontUseUnsafe.java => internal/DontUseJdkInternal.java} (94%) create mode 100644 langtools/test/tools/jdeps/VerboseFormat/use/internal/UseClassWithJdkInternal.java rename langtools/test/tools/jdeps/VerboseFormat/use/{unsafe/UseUnsafeClass2.java => internal/UseJdkInternalClass.java} (87%) create mode 100644 langtools/test/tools/jdeps/VerboseFormat/use/internal/UseJdkInternalClass2.java delete mode 100644 langtools/test/tools/jdeps/VerboseFormat/use/unsafe/UseClassWithUnsafe.java create mode 100644 langtools/test/tools/jdeps/jdk.unsupported/Foo.java create mode 100644 langtools/test/tools/jdeps/jdk.unsupported/JDKUnsupportedTest.java create mode 100644 langtools/test/tools/jdeps/modules/GenModuleInfo.java create mode 100644 langtools/test/tools/jdeps/modules/ModuleTest.java create mode 100644 langtools/test/tools/jdeps/modules/src/m1/module-info.java create mode 100644 langtools/test/tools/jdeps/modules/src/m1/p1/Goo.java rename langtools/test/{com/sun/javadoc/testProfiles/pkg3/Class1Pkg3.java => tools/jdeps/modules/src/m1/p1/Lib.java} (85%) create mode 100644 langtools/test/tools/jdeps/modules/src/m1/p1/S.java rename langtools/test/{com/sun/javadoc/testProfiles/pkgDeprecated/Class1PkgDeprecated.java => tools/jdeps/modules/src/m1/p1/internal/Impl.java} (78%) create mode 100644 langtools/test/tools/jdeps/modules/src/m2/module-info.java create mode 100644 langtools/test/tools/jdeps/modules/src/m2/p2/Bar.java rename langtools/test/{com/sun/javadoc/testProfiles/pkg1/Class2Pkg1.java => tools/jdeps/modules/src/m2/p2/internal/T2.java} (84%) create mode 100644 langtools/test/tools/jdeps/modules/src/m3/module-info.java rename langtools/test/tools/jdeps/{javax/activity/NotCompactProfile.java => modules/src/m3/p3/Foo.java} (79%) create mode 100644 langtools/test/tools/jdeps/modules/src/m3/p3/Main.java create mode 100644 langtools/test/tools/jdeps/modules/src/m4/module-info.java rename langtools/test/{com/sun/javadoc/testProfiles/pkg1/Class1Pkg1.java => tools/jdeps/modules/src/m4/p4/Lib.java} (85%) create mode 100644 langtools/test/tools/jdeps/modules/src/m4/p4/internal/Impl.java create mode 100644 langtools/test/tools/jdeps/modules/src/unsupported/module-info.java rename langtools/test/{com/sun/javadoc/testProfiles/pkg2/Anno2Pkg2.java => tools/jdeps/modules/src/unsupported/q/Counter.java} (80%) diff --git a/langtools/make/CompileInterim.gmk b/langtools/make/CompileInterim.gmk index 2ccd58feaa2..06a13d92ba8 100644 --- a/langtools/make/CompileInterim.gmk +++ b/langtools/make/CompileInterim.gmk @@ -32,23 +32,35 @@ include JavaCompilation.gmk include SetupJavaCompilers.gmk ################################################################################ -# Setup the rules to build the interim langtools jar, which is compiled by -# the boot javac and can be run on the boot jdk. This will be used to compile -# the rest of the product. Include the Genstubs build tool in this compilation -# as it will be used together with the interim javac. -$(eval $(call SetupJavaCompilation,BUILD_INTERIM_LANGTOOLS, \ - SETUP := BOOT_JAVAC, \ - DISABLE_SJAVAC := true, \ - SRC := $(LANGTOOLS_TOPDIR)/src/java.compiler/share/classes \ - $(LANGTOOLS_TOPDIR)/src/jdk.compiler/share/classes \ - $(LANGTOOLS_TOPDIR)/src/jdk.javadoc/share/classes \ - $(LANGTOOLS_TOPDIR)/src/jdk.jdeps/share/classes \ - $(SUPPORT_OUTPUTDIR)/gensrc/jdk.compiler \ - $(SUPPORT_OUTPUTDIR)/gensrc/jdk.javadoc \ - $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdeps, \ - EXCLUDES := sun, \ - COPY := .gif .png .xml .css .js javax.tools.JavaCompilerTool, \ - BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_interim_classes, \ - JAR := $(INTERIM_LANGTOOLS_JAR))) +# Setup the rules to build interim langtools, which is compiled by the boot +# javac and can be run on the boot jdk. This will be used to compile +# the rest of the product. Each module is compiled separately to allow a modular +# boot jdk to override system classes using -Xoverride:. -all: $(BUILD_INTERIM_LANGTOOLS) +# Param 1 - Name of module to compile +# Param 2 - Name of modules to depend on +define SetupInterimModule + $$(eval $$(call SetupJavaCompilation,BUILD_INTERIM_$(strip $1), \ + SETUP := BOOT_JAVAC, \ + DISABLE_SJAVAC := true, \ + SRC := $(LANGTOOLS_TOPDIR)/src/$(strip $1)/share/classes \ + $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)), \ + EXCLUDES := sun com/sun/tools/jdeps com/sun/tools/javap, \ + EXCLUDE_FILES := module-info.java, \ + COPY := .gif .png .xml .css .js javax.tools.JavaCompilerTool, \ + BIN := $(BUILDTOOLS_OUTPUTDIR)/override_modules/$(strip $1), \ + ADD_JAVAC_FLAGS := -Xbootclasspath/p:$$(call PathList, \ + $$(foreach m, $2, $(BUILDTOOLS_OUTPUTDIR)/override_modules/$$m)), \ + )) + + $$(BUILD_INTERIM_$(strip $1)): $$(foreach m, $2, $$(BUILD_INTERIM_$(strip $$m))) + + TARGETS += $$(BUILD_INTERIM_$(strip $1)) +endef + +$(eval $(call SetupInterimModule, java.compiler)) +$(eval $(call SetupInterimModule, jdk.compiler, java.compiler)) +$(eval $(call SetupInterimModule, jdk.jdeps, jdk.compiler java.compiler)) +$(eval $(call SetupInterimModule, jdk.javadoc, java.compiler jdk.compiler)) + +all: $(TARGETS) diff --git a/langtools/make/build.properties b/langtools/make/build.properties index fdc1aa05c0b..38939fa856f 100644 --- a/langtools/make/build.properties +++ b/langtools/make/build.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2016, Oracle and/or its affiliates. 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 @@ -24,58 +24,13 @@ # #javac configuration for "normal build" (these will be passed to the bootstrap compiler): -javac.debug = true -javac.debuglevel = source,lines,vars -javac.extra.opts=-XDignore.symbol.file=true -javac.includes= -javac.lint.opts = -Xlint:all,-deprecation -Werror -javac.source = 8 -javac.target = 8 +javac.opts = -XDignore.symbol.file=true -Xlint:all,-deprecation,-options -Werror -g:source,lines,vars +javac.source = 9 +javac.target = 9 -#javac configuration for bootstrap build (these will be passed to the compiler from the given boot JDK): -boot.javac.extra.opts=-XDignore.symbol.file=true -boot.javac.includes = \ - javax/annotation/processing/ \ - javax/lang/model/ \ - javax/tools/ \ - jdk/ \ - com/sun/source/ \ - com/sun/tools/javac/ \ - com/sun/tools/doclint/ -boot.javac.lint.opts= -boot.javac.source = 8 -boot.javac.target = 8 - -#configuration of submodules (share by both the bootstrap and normal compilation): -langtools.modules=java.compiler:jdk.compiler:jdk.jdeps:jdk.javadoc:jdk.jshell:jdk.internal.le:jdk.jdi -java.compiler.dependencies= -jdk.compiler.dependencies=java.compiler -jdk.javadoc.dependencies=java.compiler:jdk.compiler -jdk.jdeps.dependencies=java.compiler:jdk.compiler -jdk.internal.le.dependencies= -jdk.jdi.dependencies= -jdk.jshell.dependencies=java.compiler:jdk.internal.le:jdk.compiler:jdk.jdi - -tool.javac.main.class=com.sun.tools.javac.Main -tool.javadoc.main.class=com.sun.tools.javadoc.Main -tool.javap.main.class=com.sun.tools.javap.Main -tool.javah.main.class=com.sun.tools.javah.Main -tool.sjavac.main.class=com.sun.tools.sjavac.Main -tool.jshell.main.class=jdk.internal.jshell.tool.JShellTool - -javac.resource.includes = \ +langtools.resource.includes = \ com/sun/tools/javac/resources/compiler.properties -#test configuration: -jtreg.tests= -boot.javac.tests = tools/javac -crules.tests = ../make/test/crules - -#javadoc configuration -javadoc.jls.cite=The Java™ Language Specification -javadoc.jls.option=-tag "jls:a:See <cite>${javadoc.jls.cite}</cite>:" \ - -tag "implNote:a:Implementation Note:" - # Version info -- override as needed jdk.version = 9 build.number = b00 @@ -89,3 +44,14 @@ milestone = internal # FIXME -- need to include openjdk as needed release = ${jdk.version}-${milestone} full.version = ${release}+${build.number} + +#tools configuration: +tool.javac.main.class=com.sun.tools.javac.Main +tool.javadoc.main.class=jdk.javadoc.internal.tool.Main +tool.javap.main.class=com.sun.tools.javap.Main +tool.javah.main.class=com.sun.tools.javah.Main +tool.sjavac.main.class=com.sun.tools.sjavac.Main +tool.jshell.main.class=jdk.internal.jshell.tool.JShellTool + +#test configuration: +jtreg.tests= diff --git a/langtools/make/build.xml b/langtools/make/build.xml index 051eae55c68..ee0c3281c49 100644 --- a/langtools/make/build.xml +++ b/langtools/make/build.xml @@ -1,28 +1,28 @@ + ~ Copyright (c) 2007, 2016, Oracle and/or its affiliates. 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. Oracle designates this + ~ particular file as subject to the "Classpath" exception as provided + ~ by Oracle in the LICENSE file that accompanied this code. + ~ + ~ 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. + --> @@ -80,25 +70,19 @@ - - - - - - - - - - + + - + + + + + + + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ant.home = ${ant.home} - boot.java.home = ${boot.java.home} - target.java.home = ${target.java.home} - jtreg.home = ${jtreg.home} - findbugs.home = ${findbugs.home} - checkstyle.home = ${checkstyle.home} - - - - - - - - - - - - - - - - - - crules.CodingRulesAnalyzerPlugin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Unofficial Javadoc generated from developer sources for preview purposes only]]>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -917,5 +143,207 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/langtools/make/gendata/Gendata-jdk.compiler.gmk b/langtools/make/gendata/Gendata-jdk.compiler.gmk index 2e89ce75b33..613e7133a05 100644 --- a/langtools/make/gendata/Gendata-jdk.compiler.gmk +++ b/langtools/make/gendata/Gendata-jdk.compiler.gmk @@ -39,6 +39,10 @@ $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \ BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols, \ )) +ifeq ($(BOOT_JDK_MODULAR), true) + COMPILECREATESYMBOLS_ADD_EXPORTS := -XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED,jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED,jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED +endif + $(SUPPORT_OUTPUTDIR)/symbols/ct.sym-files/_the.symbols: \ $(COMPILE_CREATE_SYMBOLS) \ $(wildcard $(LANGTOOLS_TOPDIR)/make/data/symbols/*) @@ -46,6 +50,7 @@ $(SUPPORT_OUTPUTDIR)/symbols/ct.sym-files/_the.symbols: \ $(MKDIR) -p $(@D) $(ECHO) Creating ct.sym classes $(JAVA) $(INTERIM_LANGTOOLS_ARGS) \ + $(COMPILECREATESYMBOLS_ADD_EXPORTS) \ -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \ build.tools.symbolgenerator.CreateSymbols \ build-ctsym \ diff --git a/langtools/make/intellij/ant.xml b/langtools/make/intellij/ant.xml index a0570d25d90..e052d8b04b1 100644 --- a/langtools/make/intellij/ant.xml +++ b/langtools/make/intellij/ant.xml @@ -3,16 +3,12 @@ - - + - - + - - diff --git a/langtools/make/intellij/build.xml b/langtools/make/intellij/build.xml index 2be2b302942..a6f1bd2fea8 100644 --- a/langtools/make/intellij/build.xml +++ b/langtools/make/intellij/build.xml @@ -15,8 +15,7 @@ - - + @@ -28,18 +27,13 @@ - - - - - + - + - diff --git a/langtools/make/intellij/langtools.iml b/langtools/make/intellij/langtools.iml index 582abf11192..29ff589f35c 100644 --- a/langtools/make/intellij/langtools.iml +++ b/langtools/make/intellij/langtools.iml @@ -8,12 +8,11 @@ - - - - - + + + + diff --git a/langtools/make/intellij/src/idea/LangtoolsIdeaAntLogger.java b/langtools/make/intellij/src/idea/LangtoolsIdeaAntLogger.java index 759e5bf7c28..ba4ce9500a6 100644 --- a/langtools/make/intellij/src/idea/LangtoolsIdeaAntLogger.java +++ b/langtools/make/intellij/src/idea/LangtoolsIdeaAntLogger.java @@ -124,8 +124,8 @@ public final class LangtoolsIdeaAntLogger extends DefaultLogger { * This enum is used to represent the list of tasks we need to keep track of during logging. */ enum Task { - /** javac task - invoked during compilation */ - JAVAC("javac", MessageKind.JAVAC_ERROR, MessageKind.JAVAC_WARNING, MessageKind.JAVAC_NOTE, + /** exec task - invoked during compilation */ + JAVAC("exec", MessageKind.JAVAC_ERROR, MessageKind.JAVAC_WARNING, MessageKind.JAVAC_NOTE, MessageKind.JAVAC_NESTED_DIAG, MessageKind.JAVAC_CRASH), /** jtreg task - invoked during test execution */ JTREG("jtreg", MessageKind.JTREG_TEST_PASSED, MessageKind.JTREG_TEST_FAILED, MessageKind.JTREG_TEST_ERROR, MessageKind.JTREG_TEST_REPORT), diff --git a/langtools/make/intellij/workspace.xml b/langtools/make/intellij/workspace.xml index c2d0742f23e..dc21405c632 100644 --- a/langtools/make/intellij/workspace.xml +++ b/langtools/make/intellij/workspace.xml @@ -7,14 +7,14 @@