hg: jdk/sandbox: Merge

michael.x.mcmahon at oracle.com michael.x.mcmahon at oracle.com
Mon Nov 4 11:26:25 UTC 2019


Changeset: 2c777f25cfff
Author:    michaelm
Date:      2019-11-04 11:25 +0000
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/2c777f25cfff

Merge

- make/GensrcModuleInfo.gmk
- src/hotspot/share/jfr/recorder/repository/jfrChunkState.cpp
- src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp
! src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
! src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/MemoryScheduleVerification.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ExportingClassLoader.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ModuleSupport.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/ChunkParser.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/ConstantMap.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/EventParser.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/LongMap.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/ObjectFactory.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/Parser.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/ParserFactory.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/TimeConverter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RecordingInternals.java
- test/hotspot/jtreg/runtime/Thread/CountStackFramesAtExit.java
- test/jdk/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java



More information about the jdk-sandbox-changes mailing list