hg: jdk9/sandbox/langtools: Merge from default.

[aleksey.shipilev at oracle.com]

Changeset: 143ba6f2d4e3
Author:    shade
Date:      2016-07-14 00:46 +0300
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/143ba6f2d4e3

Merge from default.

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleWrappers.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/jdk/javadoc/internal/doclets/standard/Standard.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/DocEnv.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/RootDocImpl.java
- src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModulePaths.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/jdk/javadoc/tool/sampleapi/res/xml/fx.xml
- test/jdk/javadoc/tool/sampleapi/res/xml/simple.xml
- test/jdk/javadoc/tool/sampleapi/res/xml/tiny.xml
- test/tools/javac/types/TypeHarness.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/jdeps/CompilerUtils.java