hg: panama/dev: Fix merge issues

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Tue May 7 11:50:37 UTC 2019


Changeset: 1820595af53a
Author:    mcimadamore
Date:      2019-05-07 12:50 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/1820595af53a

Fix merge issues

! src/hotspot/cpu/x86/directUpcallHandler_x86.cpp
! src/java.base/share/classes/jdk/internal/foreign/abi/LinkToNativeInvoker.java



More information about the panama-dev mailing list