hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 5e08dfa43d74
Author:    mcimadamore
Date:      2018-04-26 22:10 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/5e08dfa43d74

Automatic merge with default

- src/hotspot/share/gc/cms/commandLineFlagConstraintsCMS.cpp
- src/hotspot/share/gc/cms/commandLineFlagConstraintsCMS.hpp
- src/hotspot/share/gc/g1/commandLineFlagConstraintsG1.cpp
- src/hotspot/share/gc/g1/commandLineFlagConstraintsG1.hpp
- src/hotspot/share/gc/parallel/commandLineFlagConstraintsParallel.cpp
- src/hotspot/share/gc/parallel/commandLineFlagConstraintsParallel.hpp
- src/hotspot/share/gc/shared/commandLineFlagConstraintsGC.cpp
- src/hotspot/share/gc/shared/commandLineFlagConstraintsGC.hpp
- src/hotspot/share/runtime/commandLineFlagConstraintList.cpp
- src/hotspot/share/runtime/commandLineFlagConstraintList.hpp
- src/hotspot/share/runtime/commandLineFlagConstraintsCompiler.cpp
- src/hotspot/share/runtime/commandLineFlagConstraintsCompiler.hpp
- src/hotspot/share/runtime/commandLineFlagConstraintsRuntime.cpp
- src/hotspot/share/runtime/commandLineFlagConstraintsRuntime.hpp
- src/hotspot/share/runtime/commandLineFlagRangeList.cpp
- src/hotspot/share/runtime/commandLineFlagRangeList.hpp
- src/hotspot/share/runtime/commandLineFlagWriteableList.cpp
- src/hotspot/share/runtime/commandLineFlagWriteableList.hpp
- src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java
- src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c
- src/java.base/windows/native/libnet/portconfig.c
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections.test/src/org/graalvm/collections/test/EconomicMapImplTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections.test/src/org/graalvm/collections/test/EconomicMapLargeTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections.test/src/org/graalvm/collections/test/EconomicMapTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections.test/src/org/graalvm/collections/test/EconomicSetTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections.test/src/org/graalvm/collections/test/EquivalenceTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections.test/src/org/graalvm/collections/test/PairTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections/src/org/graalvm/collections/EconomicMap.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections/src/org/graalvm/collections/EconomicMapImpl.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections/src/org/graalvm/collections/EconomicSet.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections/src/org/graalvm/collections/Equivalence.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections/src/org/graalvm/collections/MapCursor.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections/src/org/graalvm/collections/Pair.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections/src/org/graalvm/collections/UnmodifiableEconomicMap.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections/src/org/graalvm/collections/UnmodifiableEconomicSet.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections/src/org/graalvm/collections/UnmodifiableMapCursor.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.collections/src/org/graalvm/collections/package-info.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/ModuleAPI.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/CoreCompilerConfiguration.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Management.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/.checkstyle_checks.xml
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSuitesProvider.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalMBeanTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CoreCompilerConfigurationFactory.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalMBean.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValuesAccess.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64ReadNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64ReadReplacementPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/JDK9Method.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual.bench/.checkstyle.exclude
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/.checkstyle_checks.xml
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/ComparableWord.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/LocationIdentity.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/Pointer.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/PointerBase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/SignedWord.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/UnsignedWord.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/WordBase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/WordFactory.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ImplementedMethods.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberMap.java
- test/hotspot/jtreg/runtime/SharedArchiveFile/org/omg/CORBA/Context.jasm
- test/hotspot/jtreg/runtime/appcds/javaldr/CheckAnonymousClass.java
- test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/Main2.jasm
- test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/javax/activation/UnsupportedDataTypeException2.jasm
- test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/java.activation/javax/activation/UnsupportedDataTypeException.java
- test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/java.activation/module-info.java
- test/hotspot/jtreg/runtime/appcds/test-classes/javax/activation/MimeType.jasm