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