hg: jdk/sandbox: Merge

alan.bateman at oracle.com alan.bateman at oracle.com
Sat Mar 16 22:40:01 UTC 2019


Changeset: adcdd45830a0
Author:    alanb
Date:      2019-03-16 21:00 +0000
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/adcdd45830a0

Merge

- src/hotspot/share/gc/z/zAddressRangeMap.hpp
- src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp
! src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
! src/java.base/share/classes/java/net/DelegatingSocketImpl.java
! src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
! src/java.base/share/classes/java/net/ServerSocket.java
! src/java.base/share/classes/java/net/Socket.java
! src/java.base/share/classes/java/net/SocketImpl.java
! src/java.base/share/classes/java/net/SocksSocketImpl.java
! src/java.base/share/classes/sun/net/PlatformSocketImpl.java
! src/java.base/share/classes/sun/nio/ch/Net.java
! src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
! src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
! src/java.base/unix/native/libnio/ch/Net.c
- src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c
- src/java.base/unix/native/libnio/ch/UnixAsynchronousServerSocketChannelImpl.c
- src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddressRangeMapForPageTable.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMaths.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ArrayRangeWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePostWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePreWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PostWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PreWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ReferentFieldReadBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ObjectWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialArrayRangeWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialWriteBarrier.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/IntegerExactOpSpeculation.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64MathSubstitutions.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulHighNode.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlVersion.java
! src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketInputStreamInstrumentor.java
! src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketOutputStreamInstrumentor.java
- src/jdk.sctp/unix/native/libsctp/SctpServerChannelImpl.c
- test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/libHeapMonitorTest.c
! test/jdk/ProblemList.txt
! test/jdk/java/net/SocketImpl/SocketImplCombinations.java
! test/jdk/jdk/jfr/event/io/TestInstrumentation.java
- test/jdk/vm/JniInvocationTest.java
- test/jdk/vm/exeJniInvocationTest.c
- test/jdk/vm/gc/ArraySize.java
- test/jdk/vm/gc/InfiniteList.java
- test/jdk/vm/jit/BadLogicCode.java
- test/jdk/vm/jit/ExceptionInInit.java
- test/jdk/vm/jit/JITClassInit.java
- test/jdk/vm/runtime/ExplicitArithmeticCheck.java
- test/jdk/vm/runtime/MonitorCacheMaybeExpand_DeadLock.java
- test/jdk/vm/runtime/ReflectStackOverflow.java
- test/jdk/vm/runtime/ShiftTest.java
- test/jdk/vm/runtime/WideStrictInline.java
- test/jdk/vm/verifier/TestStaticIF.java
- test/jdk/vm/verifier/VerifyProtectedConstructor.java
- test/jdk/vm/verifier/VerifyStackForExceptionHandlers.java
- test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTests.java
- test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java
- test/langtools/jdk/javadoc/tool/doclint/ImplicitHeadersTest.java
- test/langtools/jdk/javadoc/tool/removeOldDoclet/OldDoclet.jasm
- test/langtools/tools/javac/doclint/ImplicitHeadersTest.java



More information about the jdk-sandbox-changes mailing list