hg: panama/dev: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Nov 6 22:09:32 UTC 2019


Changeset: 231a30c20746
Author:    mcimadamore
Date:      2019-11-06 22:09 +0000
URL:       https://hg.openjdk.java.net/panama/dev/rev/231a30c20746

Automatic merge with default

- make/GensrcModuleInfo.gmk
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
- 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/method.cpp
! src/hotspot/share/opto/type.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
- src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.c
- 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/gtest/oops/test_markOop.cpp
- test/hotspot/jtreg/runtime/Thread/CountStackFramesAtExit.java
- test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.symbols.txt
- test/hotspot/jtreg/serviceability/jvmti/ClassStatus/ClassStatus.java
- test/hotspot/jtreg/serviceability/jvmti/ClassStatus/libClassStatus.c
- test/jdk/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java



More information about the panama-dev mailing list