hg: jdk9/sandbox/langtools: Merge

Thu Aug 25 10:34:02 UTC 2016

Changeset: 9902264f6e5a
Author:    erikj
Date:      2016-08-25 12:28 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/9902264f6e5a

Merge

- src/jdk.compiler/share/classes/com/sun/tools/javac/sym/CreateSymbols.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/sym/Profiles.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/util/ServiceLoader.java
- src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/LinePrefixFilterWriter.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfilePackageSummaryBuilder.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfileSummaryBuilder.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotatedTypeImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Comment.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocEnv.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocLocale.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocletInvoker.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocClassFinder.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocEnter.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTodo.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Messager.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ModifierFilter.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ParamTagImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ParameterImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/PrimitiveType.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/RootDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SeeTagImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SerializedForm.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Start.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/TagImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/ToolOption.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/TypeMaker.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/api/JavadocTaskImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/api/JavadocTool.java
- src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModulesXmlReader.java
- src/jdk.jdeps/share/classes/com/sun/tools/jdeps/PlatformClassPath.java
- src/jdk.jshell/share/classes/jdk/internal/jshell/remote/RemoteAgent.java
- src/jdk.jshell/share/classes/jdk/internal/jshell/remote/RemoteClassLoader.java
- src/jdk.jshell/share/classes/jdk/internal/jshell/remote/RemoteCodes.java
- src/jdk.jshell/share/classes/jdk/internal/jshell/remote/RemoteResolutionException.java
- src/jdk.jshell/share/classes/jdk/internal/jshell/tool/EditingHistory.java
! src/jdk.jshell/share/classes/jdk/jshell/ClassTracker.java
- src/jdk.jshell/share/classes/jdk/jshell/ExecutionControl.java
- src/jdk.jshell/share/classes/jdk/jshell/JDIConnection.java
- src/jdk.jshell/share/classes/jdk/jshell/JDIEnv.java
- src/jdk.jshell/share/classes/jdk/jshell/JDIEventHandler.java
- src/jdk.jshell/share/classes/jdk/jshell/JDINotConnectedException.java
! test/Makefile
- test/com/sun/javadoc/testLinkOption/java/lang/StringBuilderChild.java
- test/com/sun/javadoc/testLinkOption/package-list
- test/com/sun/javadoc/testProfiles/TestProfiles.java
- test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java
- test/com/sun/javadoc/testProfiles/pkg1/Class1Pkg1.java
- test/com/sun/javadoc/testProfiles/pkg1/Class2Pkg1.java
- test/com/sun/javadoc/testProfiles/pkg1/Class3Pkg1.java
- test/com/sun/javadoc/testProfiles/pkg1/Interface1Pkg1.java
- test/com/sun/javadoc/testProfiles/pkg2/Anno1Pkg2.java
- test/com/sun/javadoc/testProfiles/pkg2/Anno2Pkg2.java
- test/com/sun/javadoc/testProfiles/pkg2/Class1Pkg2.java
- test/com/sun/javadoc/testProfiles/pkg2/ClassError.java
- test/com/sun/javadoc/testProfiles/pkg2/ClassException.java
- test/com/sun/javadoc/testProfiles/pkg3/Class1Pkg3.java
- test/com/sun/javadoc/testProfiles/pkg3/Class2Pkg3.java
- test/com/sun/javadoc/testProfiles/pkg3/Interface1Pkg3.java
- test/com/sun/javadoc/testProfiles/pkg4/Anno1Pkg4.java
- test/com/sun/javadoc/testProfiles/pkg4/Class1Pkg4.java
- test/com/sun/javadoc/testProfiles/pkg5/Class1Pkg5.java
- test/com/sun/javadoc/testProfiles/pkg5/Interface1Pkg5.java
- test/com/sun/javadoc/testProfiles/pkgDeprecated/Class1PkgDeprecated.java
- test/com/sun/javadoc/testProfiles/pkgDeprecated/package-info.java
- test/com/sun/javadoc/testProfiles/profile-rtjar-includes-nopkgs.txt
- test/com/sun/javadoc/testProfiles/profile-rtjar-includes.txt
- test/tools/javac/6521805/T6521805a.java
- test/tools/javac/6521805/T6521805a_1.out
- test/tools/javac/6521805/T6521805a_2.out
- test/tools/javac/6547131/p/Outer$I.class
- test/tools/javac/6547131/p/Outer.class
- test/tools/javac/InnerClassesAttribute/Outside$1$Inside.class
- test/tools/javac/InnerClassesAttribute/Outside.class
- test/tools/javac/MethodParameters/Tester.java
- test/tools/javac/Object1.java
- test/tools/javac/Object1.out
- test/tools/javac/Object2.java
- test/tools/javac/Object2.out
- test/tools/javac/SerialWarn.java
- test/tools/javac/SerialWarn.out
- test/tools/javac/T6435291/T.class
- test/tools/javac/T6873845.java
- test/tools/javac/api/T6430241.java
- test/tools/javac/cast/6219964/T6219964.out
- test/tools/javac/defaultMethods/static/StaticInvoke.java
- test/tools/javac/defaultMethods/static/StaticInvoke6.out
- test/tools/javac/defaultMethods/static/StaticInvoke7.out
- test/tools/javac/diags/examples/WarnSyntheticNameConflict.java
- test/tools/javac/file/BootClassPathPrepend.java
- test/tools/javac/generics/diamond/neg/Neg09.java
- test/tools/javac/generics/diamond/neg/Neg09.out
- test/tools/javac/missingSuperRecovery/impl.class
- test/tools/javac/options/modes/Tester.java
- test/tools/javac/positions/T6253161.java
- test/tools/javac/positions/T6253161.out
- test/tools/javac/positions/T6253161a.java
- test/tools/javac/positions/T6253161a.out
- test/tools/javac/profiles/ProfileTest.java
- test/tools/javac/proprietary/WarnClass.java
- test/tools/javac/proprietary/WarnClass.out
- test/tools/javac/proprietary/WarnImport.java
- test/tools/javac/proprietary/WarnImport.out
- test/tools/javac/proprietary/WarnMethod.java
- test/tools/javac/proprietary/WarnMethod.out
- test/tools/javac/proprietary/WarnStaticImport.java
- test/tools/javac/proprietary/WarnStaticImport.out
- test/tools/javac/proprietary/WarnVariable.java
- test/tools/javac/proprietary/WarnVariable.out
- test/tools/javac/proprietary/WarnWildcard.java
- test/tools/javac/proprietary/WarnWildcard.out
- test/tools/javac/synthesize/Boolean.java
- test/tools/javac/synthesize/Byte.java
- test/tools/javac/synthesize/Character.java
- test/tools/javac/synthesize/Cloneable.java
- test/tools/javac/synthesize/Double.java
- test/tools/javac/synthesize/Float.java
- test/tools/javac/synthesize/Integer.java
- test/tools/javac/synthesize/Long.java
- test/tools/javac/synthesize/Number.java
- test/tools/javac/synthesize/Object.java
- test/tools/javac/synthesize/Serializable.java
- test/tools/javac/synthesize/Short.java
- test/tools/javac/synthesize/Test.java
- test/tools/javac/synthesize/Void.java
- test/tools/javac/types/TypeHarness.java
- test/tools/javac/util/context/T7021650.java
- test/tools/javac/warnings/6594914/T6594914b.java
- test/tools/javadoc/api/basic/JavadocTaskImplTest.java
- test/tools/javadoc/api/basic/RunTest.java
- test/tools/javadoc/doclint/DocLintTest.java
- test/tools/javadoc/doclint/ImplicitHeadersTest.java
- test/tools/javadoc/lib/Tester.java
- test/tools/javadoc/sampleapi/README.txt
- test/tools/javadoc/sampleapi/lib/sampleapi/SampleApi.java
- test/tools/javadoc/sampleapi/lib/sampleapi/SampleApiDefaultRunner.java
- test/tools/javadoc/sampleapi/lib/sampleapi/generator/DocCommentGenerator.java
- test/tools/javadoc/sampleapi/lib/sampleapi/generator/Documentifier.java
- test/tools/javadoc/sampleapi/lib/sampleapi/generator/PackageGenerator.java
- test/tools/javadoc/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java
- test/tools/javadoc/sampleapi/lib/sampleapi/util/SimpleMultiplier.java
- test/tools/javadoc/sampleapi/res/xml/fx.xml
- test/tools/javadoc/sampleapi/res/xml/simple.xml
- test/tools/javadoc/sampleapi/res/xml/tiny.xml
- test/tools/javap/output/Tester.java
- test/tools/jdeps/VerboseFormat/use/indirect/DontUseUnsafe2.java
- test/tools/jdeps/VerboseFormat/use/indirect/UseUnsafeIndirectly.java
- test/tools/jdeps/VerboseFormat/use/indirect2/DontUseUnsafe3.java
- test/tools/jdeps/VerboseFormat/use/indirect2/UseUnsafeIndirectly2.java
- test/tools/jdeps/VerboseFormat/use/unsafe/DontUseUnsafe.java
- test/tools/jdeps/VerboseFormat/use/unsafe/UseClassWithUnsafe.java
- test/tools/jdeps/VerboseFormat/use/unsafe/UseUnsafeClass.java
- test/tools/jdeps/VerboseFormat/use/unsafe/UseUnsafeClass2.java
- test/tools/jdeps/javax/activity/NotCompactProfile.java
- test/tools/lib/ToolBox.java
- test/tools/sjavac/ExclPattern.java