hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Sun Nov 3 14:32:48 UTC 2019


Changeset: 81d8f438d66d
Author:    mcimadamore
Date:      2019-11-03 14:32 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/81d8f438d66d

Automatic merge with default

! make/hotspot/symbols/symbols-unix
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/include/jvm.h
- src/hotspot/share/jfr/recorder/repository/jfrChunkState.cpp
- src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp
! src/hotspot/share/logging/logTag.hpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/prims/jvm.cpp
- 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 amber-dev mailing list