hg: panama/dev: manual merge with foreign

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Tue May 7 13:24:56 UTC 2019


Changeset: 58bf7ac38956
Author:    mcimadamore
Date:      2019-05-07 14:24 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/58bf7ac38956

manual merge with foreign

! make/CompileJavaModules.gmk
! src/hotspot/share/prims/nativeLookup.cpp
! src/java.base/share/classes/jdk/internal/foreign/abi/DirectSignatureShuffler.java
! src/java.base/share/classes/jdk/internal/foreign/abi/LinkToNativeSignatureShuffler.java
- src/java.base/share/classes/jdk/internal/foreign/abi/ShuffleRecipeFieldHelper.java
- src/java.base/share/classes/jdk/internal/foreign/abi/ShuffleRecipeOperationCollector.java
! src/java.base/share/classes/jdk/internal/foreign/abi/UniversalNativeInvoker.java
! src/java.base/share/classes/jdk/internal/foreign/abi/UniversalUpcallHandler.java
! src/java.base/share/classes/jdk/internal/foreign/abi/VarargsInvoker.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/CallingSequenceBuilder.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/SharedConstants.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/Constants.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/StandardCall.java
! src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVx64ABI.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/UniversalNativeInvokerImpl.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/UniversalUpcallHandlerImpl.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/VarargsInvokerImpl.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/Constants.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/UniversalNativeInvokerImpl.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/UniversalUpcallHandlerImpl.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/VarargsInvokerImpl.java
! src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/Windowsx64ABI.java
- src/jdk.jextract/share/classes/com/sun/tools/jextract/AsmCodeFactory.java
- src/jdk.jextract/share/classes/com/sun/tools/jextract/AsmCodeFactoryExt.java
+ test/jdk/java/foreign/abi/x64/sysv/CallingSequenceTest.java
- test/jdk/java/foreign/abi/x64/sysv/StandardCallTest.java



More information about the panama-dev mailing list