hg: panama/dev: Manual merge with default
jorn.vernee at oracle.com
jorn.vernee at oracle.com
Thu Jan 23 10:54:04 UTC 2020
Changeset: 30dc603e31c9
Author: jvernee
Date: 2020-01-23 11:18 +0100
URL: https://hg.openjdk.java.net/panama/dev/rev/30dc603e31c9
Manual merge with default
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.cpp
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.hpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.hpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.hpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.cpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.hpp
- src/hotspot/share/gc/parallel/psMarkSweep.cpp
- src/hotspot/share/gc/parallel/psMarkSweep.hpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.cpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp
- src/hotspot/share/gc/parallel/psMarkSweepProxy.hpp
- src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties
! src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/AbstractLayout.java
! src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryAddress.java
! src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayout.java
! src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayouts.java
! src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
! src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/SequenceLayout.java
! src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java
! src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/LayoutPath.java
! src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemoryAddressImpl.java
! src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemorySegmentImpl.java
- test/hotspot/jtreg/runtime/records/TEST.properties
! test/jdk/java/foreign/TestLayoutPaths.java
! test/jdk/java/foreign/TestLayouts.java
! test/jdk/java/foreign/TestMemoryAccess.java
! test/jdk/java/foreign/TestMemoryAlignment.java
! test/jdk/java/foreign/TestMemoryCopy.java
! test/jdk/java/foreign/TestSegments.java
! test/jdk/java/foreign/TestVarHandleCombinators.java
- test/jdk/java/io/Serializable/records/TEST.properties
- test/jdk/java/lang/instrument/TEST.properties
- test/jdk/java/lang/reflect/records/TEST.properties
- test/jdk/java/lang/runtime/TEST.properties
- test/jdk/sun/security/krb5/auto/SaslGSS.java
More information about the panama-dev
mailing list