hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 1c1118deeedb
Author:    mcimadamore
Date:      2017-12-07 22:05 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/1c1118deeedb

Automatic merge with default

! make/CreateJmods.gmk
! make/autoconf/spec.gmk.in
! make/common/JarArchive.gmk
! make/common/MakeBase.gmk
! make/test/JtregNativeHotspot.gmk
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/hotspot/share/classfile/vmSymbols_ext.hpp
- src/hotspot/share/gc/g1/hSpaceCounters.cpp
- src/hotspot/share/gc/g1/hSpaceCounters.hpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/oops/constantPool.hpp
! src/hotspot/share/oops/generateOopMap.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvmtiRedefineClasses.cpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/hotspot/share/services/g1MemoryPool.cpp
- src/hotspot/share/services/g1MemoryPool.hpp
- src/hotspot/share/services/jmm.h
- src/hotspot/share/services/psMemoryPool.cpp
- src/hotspot/share/services/psMemoryPool.hpp
! src/hotspot/share/utilities/globalDefinitions.hpp
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
! src/java.base/share/native/include/classfile_constants.h
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64Thread.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadContext.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadFactory.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractPushPublisher.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncConnection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLDelegate.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BlockingPushPublisher.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/DefaultPublisher.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExecutorWrapper.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PseudoPublisher.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushPublisher.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestProcessors.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseHeaders.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseProcessors.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLConnection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLTunnelConnection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncDataReadQueue.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncWriteQueue.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/BufferHandler.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ExceptionallyCloseable.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Queue.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CooperativeHandler.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/RawAddressNode.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Constants.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java
- test/hotspot/jtreg/gc/metaspace/PerfCounter.java
- test/hotspot/jtreg/gc/metaspace/PerfCounters.java
- test/jdk/java/net/httpclient/APIErrors.java
- test/jdk/java/net/httpclient/Server.java
- test/jdk/java/net/httpclient/http2/HpackDriver.java
- test/jdk/java/net/httpclient/http2/HpackDriverHeaderTable.java
- test/jdk/java/net/httpclient/http2/NoBody.java
- test/jdk/java/net/httpclient/http2/server/RedirectHandler.java
- test/jdk/java/net/httpclient/websocket/LoggingHelper.java
- test/jdk/java/net/httpclient/websocket/WSDriver.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/CloseTest.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/DataProviders.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannel.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannelTest.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListenerTest.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/PingTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ResponseHeadersTest.java