From 790c0ef24012b61437f914dfbd0c198ae5861ab2 Mon Sep 17 00:00:00 2001 From: Babneet Singh Date: Tue, 24 Nov 2020 12:25:46 -0800 Subject: [PATCH] Add a stub for NativeMethodHandle in JDK16 fixes: https://github.com/eclipse/openj9/issues/11255 Signed-off-by: Babneet Singh --- .../java/lang/invoke/NativeMethodHandle.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java index dada2303b77..137b227ad83 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java @@ -1,4 +1,4 @@ -/*[INCLUDE-IF Panama]*/ +/*[INCLUDE-IF Panama | (JAVA_SPEC_VERSION >= 16)]*/ /******************************************************************************* * Copyright (c) 2009, 2020 IBM Corp. and others * @@ -22,6 +22,7 @@ *******************************************************************************/ package java.lang.invoke; +/*[IF Panama]*/ import java.nicl.LibrarySymbol; import jdk.internal.nicl.types.PointerTokenImpl; @@ -112,3 +113,23 @@ void compareWithNative(NativeMethodHandle left, Comparator c) { c.compareStructuralParameter(left.vmSlot, this.vmSlot); } } +/*[ELSE] Panama */ +import java.util.List; +import jdk.internal.invoke.NativeEntryPoint; + +class NativeMethodHandle extends MethodHandle { + public static MethodHandle make(NativeEntryPoint entryPoint, MethodHandle mh) { + throw OpenJDKCompileStub.OpenJDKCompileStubThrowError(); + } + + private NativeMethodHandle(MethodType mt, LambdaForm lf, MethodHandle mh, NativeEntryPoint entryPoint) { + super(mt, lf); + throw OpenJDKCompileStub.OpenJDKCompileStubThrowError(); + } + + @Override + boolean addRelatedMHs(List relatedMHs) { + throw OpenJDKCompileStub.OpenJDKCompileStubThrowError(); + } +} +/*[ENDIF] Panama */