mirror of
https://github.com/openjdk/jdk.git
synced 2026-03-02 04:00:16 +00:00
8173587: LambdaMetafactory needs to validate descriptors and method name
Reviewed-by: psandoz
This commit is contained in:
parent
9582e0be97
commit
125d4ea7d0
@ -141,6 +141,18 @@ import static sun.invoke.util.Wrapper.isWrapperType;
|
||||
this.markerInterfaces = markerInterfaces;
|
||||
this.additionalBridges = additionalBridges;
|
||||
|
||||
if (samMethodName.isEmpty() ||
|
||||
samMethodName.indexOf('.') >= 0 ||
|
||||
samMethodName.indexOf(';') >= 0 ||
|
||||
samMethodName.indexOf('[') >= 0 ||
|
||||
samMethodName.indexOf('/') >= 0 ||
|
||||
samMethodName.indexOf('<') >= 0 ||
|
||||
samMethodName.indexOf('>') >= 0) {
|
||||
throw new LambdaConversionException(String.format(
|
||||
"Method name '%s' is not legal",
|
||||
samMethodName));
|
||||
}
|
||||
|
||||
if (!samBase.isInterface()) {
|
||||
throw new LambdaConversionException(String.format(
|
||||
"Functional interface %s is not an interface",
|
||||
@ -275,25 +287,39 @@ import static sun.invoke.util.Wrapper.isWrapperType;
|
||||
(implKind == MethodHandleInfo.REF_newInvokeSpecial)
|
||||
? implDefiningClass
|
||||
: implMethodType.returnType();
|
||||
Class<?> samReturnType = samMethodType.returnType();
|
||||
if (!isAdaptableToAsReturn(actualReturnType, expectedType)) {
|
||||
throw new LambdaConversionException(
|
||||
String.format("Type mismatch for lambda return: %s is not convertible to %s",
|
||||
actualReturnType, expectedType));
|
||||
}
|
||||
if (!isAdaptableToAsReturnStrict(expectedType, samReturnType)) {
|
||||
throw new LambdaConversionException(
|
||||
String.format("Type mismatch for lambda expected return: %s is not convertible to %s",
|
||||
expectedType, samReturnType));
|
||||
}
|
||||
|
||||
// Check descriptors of generated methods
|
||||
checkDescriptor(samMethodType);
|
||||
for (MethodType bridgeMT : additionalBridges) {
|
||||
if (!isAdaptableToAsReturnStrict(expectedType, bridgeMT.returnType())) {
|
||||
throw new LambdaConversionException(
|
||||
String.format("Type mismatch for lambda expected return: %s is not convertible to %s",
|
||||
expectedType, bridgeMT.returnType()));
|
||||
checkDescriptor(bridgeMT);
|
||||
}
|
||||
}
|
||||
|
||||
/** Validate that the given descriptor's types are compatible with {@code instantiatedMethodType} **/
|
||||
private void checkDescriptor(MethodType descriptor) throws LambdaConversionException {
|
||||
for (int i = 0; i < instantiatedMethodType.parameterCount(); i++) {
|
||||
Class<?> instantiatedParamType = instantiatedMethodType.parameterType(i);
|
||||
Class<?> descriptorParamType = descriptor.parameterType(i);
|
||||
if (!descriptorParamType.isAssignableFrom(instantiatedParamType)) {
|
||||
String msg = String.format("Type mismatch for instantiated parameter %d: %s is not a subtype of %s",
|
||||
i, instantiatedParamType, descriptorParamType);
|
||||
throw new LambdaConversionException(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Class<?> instantiatedReturnType = instantiatedMethodType.returnType();
|
||||
Class<?> descriptorReturnType = descriptor.returnType();
|
||||
if (!isAdaptableToAsReturnStrict(instantiatedReturnType, descriptorReturnType)) {
|
||||
String msg = String.format("Type mismatch for lambda expected return: %s is not convertible to %s",
|
||||
instantiatedReturnType, descriptorReturnType);
|
||||
throw new LambdaConversionException(msg);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check type adaptability for parameter types.
|
||||
@ -345,8 +371,8 @@ import static sun.invoke.util.Wrapper.isWrapperType;
|
||||
|| !fromType.equals(void.class) && isAdaptableTo(fromType, toType, false);
|
||||
}
|
||||
private boolean isAdaptableToAsReturnStrict(Class<?> fromType, Class<?> toType) {
|
||||
if (fromType.equals(void.class)) return toType.equals(void.class);
|
||||
return isAdaptableTo(fromType, toType, true);
|
||||
if (fromType.equals(void.class) || toType.equals(void.class)) return fromType.equals(toType);
|
||||
else return isAdaptableTo(fromType, toType, true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
269
jdk/test/java/lang/invoke/lambda/MetafactoryDescriptorTest.java
Normal file
269
jdk/test/java/lang/invoke/lambda/MetafactoryDescriptorTest.java
Normal file
@ -0,0 +1,269 @@
|
||||
/*
|
||||
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8035776 8173587
|
||||
* @summary metafactory should fail if instantiatedMethodType does not match sam/bridge descriptors
|
||||
*/
|
||||
import java.lang.invoke.*;
|
||||
import java.util.*;
|
||||
|
||||
public class MetafactoryDescriptorTest {
|
||||
|
||||
static final MethodHandles.Lookup lookup = MethodHandles.lookup();
|
||||
|
||||
static MethodType mt(Class<?> ret, Class<?>... params) {
|
||||
return MethodType.methodType(ret, params);
|
||||
}
|
||||
|
||||
public interface I {}
|
||||
|
||||
public static class C {
|
||||
public static void m_void(String arg) {}
|
||||
public static boolean m_boolean(String arg) { return true; }
|
||||
public static char m_char(String arg) { return 'x'; }
|
||||
public static byte m_byte(String arg) { return 12; }
|
||||
public static short m_short(String arg) { return 12; }
|
||||
public static int m_int(String arg) { return 12; }
|
||||
public static long m_long(String arg) { return 12; }
|
||||
public static float m_float(String arg) { return 12; }
|
||||
public static double m_double(String arg) { return 12; }
|
||||
public static String m_String(String arg) { return ""; }
|
||||
public static Integer m_Integer(String arg) { return 23; }
|
||||
public static Object m_Object(String arg) { return new Object(); }
|
||||
|
||||
public static String n_boolean(boolean arg) { return ""; }
|
||||
public static String n_char(char arg) { return ""; }
|
||||
public static String n_byte(byte arg) { return ""; }
|
||||
public static String n_short(short arg) { return ""; }
|
||||
public static String n_int(int arg) { return ""; }
|
||||
public static String n_long(long arg) { return ""; }
|
||||
public static String n_float(float arg) { return ""; }
|
||||
public static String n_double(double arg) { return ""; }
|
||||
public static String n_String(String arg) { return ""; }
|
||||
public static String n_Integer(Integer arg) { return ""; }
|
||||
public static String n_Object(Object arg) { return ""; }
|
||||
|
||||
public static MethodHandle getM(Class<?> c) {
|
||||
try {
|
||||
return lookup.findStatic(C.class, "m_" + c.getSimpleName(), mt(c, String.class));
|
||||
}
|
||||
catch (NoSuchMethodException | IllegalAccessException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public static MethodHandle getN(Class<?> c) {
|
||||
if (c == void.class) return null;
|
||||
try {
|
||||
return lookup.findStatic(C.class, "n_" + c.getSimpleName(), mt(String.class, c));
|
||||
}
|
||||
catch (NoSuchMethodException | IllegalAccessException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void main(String... args) {
|
||||
Class<?>[] t = { void.class, boolean.class, char.class,
|
||||
byte.class, short.class, int.class, long.class, float.class, double.class,
|
||||
String.class, Integer.class, Object.class };
|
||||
|
||||
for (int i = 0; i < t.length; i++) {
|
||||
MethodHandle m = C.getM(t[i]);
|
||||
MethodHandle n = C.getN(t[i]); // null for void.class
|
||||
for (int j = 0; j < t.length; j++) {
|
||||
boolean correctRet = t[j].isAssignableFrom(t[i]) || conversions.contains(t[i], t[j]);
|
||||
test(correctRet, m, mt(t[i], String.class), mt(t[j], String.class));
|
||||
testBridge(correctRet, m, mt(t[i], String.class), mt(t[i], String.class),
|
||||
mt(t[j], Object.class));
|
||||
testBridge(correctRet, m, mt(t[i], String.class), mt(t[i], String.class),
|
||||
mt(t[i], CharSequence.class), mt(t[j], Object.class));
|
||||
|
||||
if (t[i] != void.class && t[j] != void.class) {
|
||||
boolean correctParam = t[j].isAssignableFrom(t[i]);
|
||||
test(correctParam, n, mt(String.class, t[i]), mt(String.class, t[j]));
|
||||
testBridge(correctParam, n, mt(String.class, t[i]), mt(String.class, t[i]),
|
||||
mt(Object.class, t[j]));
|
||||
testBridge(correctParam, n, mt(String.class, t[i]), mt(String.class, t[i]),
|
||||
mt(CharSequence.class, t[i]), mt(Object.class, t[j]));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void test(boolean correct, MethodHandle mh, MethodType instMT, MethodType samMT) {
|
||||
tryMetafactory(correct, mh, instMT, samMT);
|
||||
tryAltMetafactory(correct, mh, instMT, samMT);
|
||||
}
|
||||
|
||||
static void testBridge(boolean correct, MethodHandle mh, MethodType instMT, MethodType samMT, MethodType... bridgeMTs) {
|
||||
tryAltMetafactory(correct, mh, instMT, samMT, bridgeMTs);
|
||||
}
|
||||
|
||||
static void tryMetafactory(boolean correct, MethodHandle mh, MethodType instMT, MethodType samMT) {
|
||||
try {
|
||||
LambdaMetafactory.metafactory(lookup, "run", mt(I.class),
|
||||
samMT, mh, instMT);
|
||||
if (!correct) {
|
||||
throw new AssertionError("Unexpected linkage without error:" +
|
||||
" impl=" + mh +
|
||||
", inst=" + instMT +
|
||||
", sam=" + samMT);
|
||||
}
|
||||
}
|
||||
catch (LambdaConversionException e) {
|
||||
if (correct) {
|
||||
throw new AssertionError("Unexpected linkage error:" +
|
||||
" e=" + e +
|
||||
", impl=" + mh +
|
||||
", inst=" + instMT +
|
||||
", sam=" + samMT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void tryAltMetafactory(boolean correct, MethodHandle mh, MethodType instMT, MethodType samMT,
|
||||
MethodType... bridgeMTs) {
|
||||
boolean bridge = bridgeMTs.length > 0;
|
||||
Object[] args = new Object[bridge ? 5+bridgeMTs.length : 4];
|
||||
args[0] = samMT;
|
||||
args[1] = mh;
|
||||
args[2] = instMT;
|
||||
args[3] = bridge ? LambdaMetafactory.FLAG_BRIDGES : 0;
|
||||
if (bridge) {
|
||||
args[4] = bridgeMTs.length;
|
||||
for (int i = 0; i < bridgeMTs.length; i++) args[5+i] = bridgeMTs[i];
|
||||
}
|
||||
try {
|
||||
LambdaMetafactory.altMetafactory(lookup, "run", mt(I.class), args);
|
||||
if (!correct) {
|
||||
throw new AssertionError("Unexpected linkage without error:" +
|
||||
" impl=" + mh +
|
||||
", inst=" + instMT +
|
||||
", sam=" + samMT +
|
||||
", bridges=" + Arrays.toString(bridgeMTs));
|
||||
}
|
||||
}
|
||||
catch (LambdaConversionException e) {
|
||||
if (correct) {
|
||||
throw new AssertionError("Unexpected linkage error:" +
|
||||
" e=" + e +
|
||||
", impl=" + mh +
|
||||
", inst=" + instMT +
|
||||
", sam=" + samMT +
|
||||
", bridges=" + Arrays.toString(bridgeMTs));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static class ConversionTable {
|
||||
private final Map<Class<?>, Set<Class<?>>> pairs = new HashMap<>();
|
||||
|
||||
public void put(Class<?> from, Class<?> to) {
|
||||
Set<Class<?>> set = pairs.computeIfAbsent(from, f -> new HashSet<>());
|
||||
set.add(to);
|
||||
}
|
||||
|
||||
public boolean contains(Class<?> from, Class<?> to) {
|
||||
return pairs.containsKey(from) && pairs.get(from).contains(to);
|
||||
}
|
||||
}
|
||||
|
||||
private static ConversionTable conversions = new ConversionTable();
|
||||
static {
|
||||
conversions.put(char.class, int.class);
|
||||
conversions.put(char.class, long.class);
|
||||
conversions.put(char.class, float.class);
|
||||
conversions.put(char.class, double.class);
|
||||
conversions.put(char.class, Character.class);
|
||||
conversions.put(char.class, Object.class);
|
||||
conversions.put(Character.class, char.class);
|
||||
conversions.put(Character.class, int.class);
|
||||
conversions.put(Character.class, long.class);
|
||||
conversions.put(Character.class, float.class);
|
||||
conversions.put(Character.class, double.class);
|
||||
|
||||
conversions.put(byte.class, short.class);
|
||||
conversions.put(byte.class, int.class);
|
||||
conversions.put(byte.class, long.class);
|
||||
conversions.put(byte.class, float.class);
|
||||
conversions.put(byte.class, double.class);
|
||||
conversions.put(byte.class, Byte.class);
|
||||
conversions.put(byte.class, Object.class);
|
||||
conversions.put(Byte.class, byte.class);
|
||||
conversions.put(Byte.class, short.class);
|
||||
conversions.put(Byte.class, int.class);
|
||||
conversions.put(Byte.class, long.class);
|
||||
conversions.put(Byte.class, float.class);
|
||||
conversions.put(Byte.class, double.class);
|
||||
|
||||
conversions.put(short.class, int.class);
|
||||
conversions.put(short.class, long.class);
|
||||
conversions.put(short.class, float.class);
|
||||
conversions.put(short.class, double.class);
|
||||
conversions.put(short.class, Short.class);
|
||||
conversions.put(short.class, Object.class);
|
||||
conversions.put(Short.class, short.class);
|
||||
conversions.put(Short.class, int.class);
|
||||
conversions.put(Short.class, long.class);
|
||||
conversions.put(Short.class, float.class);
|
||||
conversions.put(Short.class, double.class);
|
||||
|
||||
conversions.put(int.class, long.class);
|
||||
conversions.put(int.class, float.class);
|
||||
conversions.put(int.class, double.class);
|
||||
conversions.put(int.class, Integer.class);
|
||||
conversions.put(int.class, Object.class);
|
||||
conversions.put(Integer.class, int.class);
|
||||
conversions.put(Integer.class, long.class);
|
||||
conversions.put(Integer.class, float.class);
|
||||
conversions.put(Integer.class, double.class);
|
||||
|
||||
conversions.put(long.class, float.class);
|
||||
conversions.put(long.class, double.class);
|
||||
conversions.put(long.class, Long.class);
|
||||
conversions.put(long.class, Object.class);
|
||||
conversions.put(Long.class, long.class);
|
||||
conversions.put(Long.class, float.class);
|
||||
conversions.put(Long.class, double.class);
|
||||
|
||||
conversions.put(float.class, double.class);
|
||||
conversions.put(float.class, Float.class);
|
||||
conversions.put(float.class, Object.class);
|
||||
conversions.put(Float.class, float.class);
|
||||
conversions.put(Float.class, double.class);
|
||||
|
||||
conversions.put(double.class, Double.class);
|
||||
conversions.put(double.class, Object.class);
|
||||
conversions.put(Double.class, double.class);
|
||||
|
||||
conversions.put(boolean.class, Boolean.class);
|
||||
conversions.put(boolean.class, Object.class);
|
||||
conversions.put(Boolean.class, boolean.class);
|
||||
}
|
||||
|
||||
}
|
||||
197
jdk/test/java/lang/invoke/lambda/MetafactoryMethodNameTest.java
Normal file
197
jdk/test/java/lang/invoke/lambda/MetafactoryMethodNameTest.java
Normal file
@ -0,0 +1,197 @@
|
||||
/*
|
||||
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8173587
|
||||
* @summary metafactory should fail if the method name is not legal
|
||||
*/
|
||||
import java.lang.invoke.*;
|
||||
import java.util.*;
|
||||
|
||||
public class MetafactoryMethodNameTest {
|
||||
|
||||
public static void main(String... args) {
|
||||
goodName("x");
|
||||
goodName("xy");
|
||||
|
||||
goodName("]");
|
||||
goodName("x]");
|
||||
goodName("]y");
|
||||
goodName("x]y");
|
||||
|
||||
goodName("&");
|
||||
goodName("x&");
|
||||
goodName("&y");
|
||||
goodName("x&y");
|
||||
|
||||
badName(".");
|
||||
badName("x.");
|
||||
badName(".y");
|
||||
badName("x.y");
|
||||
|
||||
badName(";");
|
||||
badName("x;");
|
||||
badName(";y");
|
||||
badName("x;y");
|
||||
|
||||
badName("[");
|
||||
badName("x[");
|
||||
badName("[y");
|
||||
badName("x[y");
|
||||
|
||||
badName("/");
|
||||
badName("x/");
|
||||
badName("/y");
|
||||
badName("x/y");
|
||||
|
||||
badName("<");
|
||||
badName("x<");
|
||||
badName("<y");
|
||||
badName("x<y");
|
||||
|
||||
badName(">");
|
||||
badName("x>");
|
||||
badName(">y");
|
||||
badName("x>y");
|
||||
|
||||
badName("");
|
||||
badName("<init>");
|
||||
badName("<clinit>");
|
||||
}
|
||||
|
||||
static MethodType mt(Class<?> ret, Class<?>... params) {
|
||||
return MethodType.methodType(ret, params);
|
||||
}
|
||||
|
||||
static MethodHandle smh(Class<?> c, String name, MethodType desc) {
|
||||
try {
|
||||
return MethodHandles.lookup().findStatic(c, name, desc);
|
||||
} catch (ReflectiveOperationException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
static Object[] arr(Object... args) {
|
||||
return args;
|
||||
}
|
||||
|
||||
public static class C {
|
||||
public static void m() {}
|
||||
}
|
||||
|
||||
public interface I {}
|
||||
|
||||
private static MethodHandles.Lookup lookup = MethodHandles.lookup();
|
||||
private static MethodType toI = mt(I.class);
|
||||
private static MethodType toVoid = mt(void.class);
|
||||
private static MethodHandle mh = smh(C.class, "m", toVoid);
|
||||
private static Class<?> lce = LambdaConversionException.class;
|
||||
|
||||
static void goodName(String name) {
|
||||
succeedMFLinkage(lookup, name, toI, toVoid, mh, toVoid);
|
||||
succeedAltMFLinkage(lookup, name, toI, arr(toVoid, mh, toVoid, LambdaMetafactory.FLAG_SERIALIZABLE));
|
||||
}
|
||||
|
||||
static void badName(String name) {
|
||||
failMFLinkage(lookup, name, toI, toVoid, mh, toVoid, lce);
|
||||
failAltMFLinkage(lookup, name, toI, arr(toVoid, mh, toVoid, LambdaMetafactory.FLAG_SERIALIZABLE), lce);
|
||||
}
|
||||
|
||||
static CallSite succeedMFLinkage(MethodHandles.Lookup lookup,
|
||||
String name,
|
||||
MethodType capType,
|
||||
MethodType desc,
|
||||
MethodHandle impl,
|
||||
MethodType checked) {
|
||||
try {
|
||||
return LambdaMetafactory.metafactory(lookup, name, capType, desc, impl, checked);
|
||||
} catch (Throwable t) {
|
||||
String msg = String.format("Unexpected exception during linkage for metafactory(%s, %s, %s, %s, %s, %s)",
|
||||
lookup, name, capType, desc, impl, checked);
|
||||
throw new AssertionError(msg, t);
|
||||
}
|
||||
}
|
||||
|
||||
static void failMFLinkage(MethodHandles.Lookup lookup,
|
||||
String name,
|
||||
MethodType capType,
|
||||
MethodType desc,
|
||||
MethodHandle impl,
|
||||
MethodType checked,
|
||||
Class<?> expectedExceptionType) {
|
||||
try {
|
||||
LambdaMetafactory.metafactory(lookup, name, capType, desc, impl, checked);
|
||||
} catch (Throwable t) {
|
||||
if (expectedExceptionType.isInstance(t)) {
|
||||
return;
|
||||
} else {
|
||||
String msg = String.format("Unexpected exception: expected %s during linkage for metafactory(%s, %s, %s, %s, %s, %s)",
|
||||
expectedExceptionType.getName(),
|
||||
lookup, name, capType, desc, impl, checked);
|
||||
throw new AssertionError(msg, t);
|
||||
}
|
||||
}
|
||||
String msg = String.format("Unexpected success: expected %s during linkage for metafactory(%s, %s, %s, %s, %s, %s)",
|
||||
expectedExceptionType.getName(),
|
||||
lookup, name, capType, desc, impl, checked);
|
||||
throw new AssertionError(msg);
|
||||
}
|
||||
|
||||
static CallSite succeedAltMFLinkage(MethodHandles.Lookup lookup,
|
||||
String name,
|
||||
MethodType capType,
|
||||
Object[] args) {
|
||||
try {
|
||||
return LambdaMetafactory.altMetafactory(lookup, name, capType, args);
|
||||
} catch (Throwable t) {
|
||||
String msg = String.format("Unexpected exception during linkage for metafactory(%s, %s, %s, %s)",
|
||||
lookup, name, capType, Arrays.asList(args));
|
||||
throw new AssertionError(msg, t);
|
||||
}
|
||||
}
|
||||
|
||||
static void failAltMFLinkage(MethodHandles.Lookup lookup,
|
||||
String name,
|
||||
MethodType capType,
|
||||
Object[] args,
|
||||
Class<?> expectedExceptionType) {
|
||||
try {
|
||||
LambdaMetafactory.altMetafactory(lookup, name, capType, args);
|
||||
} catch (Throwable t) {
|
||||
if (expectedExceptionType.isInstance(t)) {
|
||||
return;
|
||||
} else {
|
||||
String msg = String.format("Unexpected exception: expected %s during linkage for metafactory(%s, %s, %s, %s)",
|
||||
expectedExceptionType.getName(),
|
||||
lookup, name, capType, Arrays.asList(args));
|
||||
throw new AssertionError(msg, t);
|
||||
}
|
||||
}
|
||||
String msg = String.format("Unexpected success: expected %s during linkage for metafactory(%s, %s, %s, %s)",
|
||||
expectedExceptionType.getName(),
|
||||
lookup, name, capType, Arrays.asList(args));
|
||||
throw new AssertionError(msg);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,167 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8035776
|
||||
* @summary metafactory should fail if impl return does not match sam/bridge returns
|
||||
*/
|
||||
import java.lang.invoke.*;
|
||||
import java.util.Arrays;
|
||||
import static java.lang.invoke.MethodType.methodType;
|
||||
|
||||
public class MetafactorySamReturnTest {
|
||||
|
||||
static final MethodHandles.Lookup lookup = MethodHandles.lookup();
|
||||
|
||||
public interface I {}
|
||||
|
||||
public static class C {
|
||||
public static void m_void(String arg) {}
|
||||
public static boolean m_boolean(String arg) { return true; }
|
||||
public static char m_char(String arg) { return 'x'; }
|
||||
public static byte m_byte(String arg) { return 12; }
|
||||
public static short m_short(String arg) { return 12; }
|
||||
public static int m_int(String arg) { return 12; }
|
||||
public static long m_long(String arg) { return 12; }
|
||||
public static float m_float(String arg) { return 12; }
|
||||
public static double m_double(String arg) { return 12; }
|
||||
public static String m_String(String arg) { return ""; }
|
||||
public static Integer m_Integer(String arg) { return 23; }
|
||||
public static Object m_Object(String arg) { return new Object(); }
|
||||
|
||||
public static MethodHandle getMH(Class<?> c) {
|
||||
try {
|
||||
return lookup.findStatic(C.class, "m_" + c.getSimpleName(), methodType(c, String.class));
|
||||
}
|
||||
catch (NoSuchMethodException | IllegalAccessException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String... args) {
|
||||
Class<?>[] t = { void.class, boolean.class, char.class,
|
||||
byte.class, short.class, int.class, long.class, float.class, double.class,
|
||||
String.class, Integer.class, Object.class };
|
||||
|
||||
for (int i = 0; i < t.length; i++) {
|
||||
MethodHandle mh = C.getMH(t[i]);
|
||||
for (int j = 0; j < t.length; j++) {
|
||||
// TEMPORARY EXCEPTIONS
|
||||
if (t[j] == void.class) continue;
|
||||
if (t[i].isPrimitive() && t[j] == Object.class) continue;
|
||||
if (t[i] == char.class && (t[j] == int.class || t[j] == long.class || t[j] == float.class || t[j] == double.class)) continue;
|
||||
if (t[i] == byte.class && (t[j] == short.class || t[j] == int.class || t[j] == long.class || t[j] == float.class || t[j] == double.class)) continue;
|
||||
if (t[i] == short.class && (t[j] == int.class || t[j] == long.class || t[j] == float.class || t[j] == double.class)) continue;
|
||||
if (t[i] == int.class && (t[j] == long.class || t[j] == float.class || t[j] == double.class)) continue;
|
||||
if (t[i] == long.class && (t[j] == float.class || t[j] == double.class)) continue;
|
||||
if (t[i] == float.class && t[j] == double.class) continue;
|
||||
if (t[i] == int.class && t[j] == Integer.class) continue;
|
||||
if (t[i] == Integer.class && (t[j] == int.class || t[j] == long.class || t[j] == float.class || t[j] == double.class)) continue;
|
||||
// END TEMPORARY EXCEPTIONS
|
||||
boolean correct = (t[i].isPrimitive() || t[j].isPrimitive())
|
||||
? t[i] == t[j]
|
||||
: t[j].isAssignableFrom(t[i]);
|
||||
MethodType mti = methodType(t[i], String.class);
|
||||
MethodType mtiCS = methodType(t[i], CharSequence.class);
|
||||
MethodType mtj = methodType(t[j], String.class);
|
||||
MethodType mtjObj = methodType(t[j], Object.class);
|
||||
test(correct, mh, mti, mtj);
|
||||
testBridge(correct, mh, mti, mti, mtjObj);
|
||||
testBridge(correct, mh, mti, mti, mtiCS, mtjObj);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void test(boolean correct, MethodHandle mh, MethodType instMT, MethodType samMT) {
|
||||
tryMetafactory(correct, mh, new Class<?>[]{}, instMT, samMT);
|
||||
tryAltMetafactory(correct, mh, new Class<?>[]{}, instMT, samMT);
|
||||
}
|
||||
|
||||
static void testBridge(boolean correct, MethodHandle mh, MethodType instMT, MethodType samMT, MethodType... bridgeMTs) {
|
||||
tryAltMetafactory(correct, mh, new Class<?>[]{}, instMT, samMT, bridgeMTs);
|
||||
}
|
||||
|
||||
static void tryMetafactory(boolean correct, MethodHandle mh, Class<?>[] captured,
|
||||
MethodType instMT, MethodType samMT) {
|
||||
try {
|
||||
LambdaMetafactory.metafactory(lookup, "run", methodType(I.class, captured),
|
||||
samMT, mh, instMT);
|
||||
if (!correct) {
|
||||
throw new AssertionError("Uncaught linkage error:" +
|
||||
" impl=" + mh +
|
||||
", captured=" + Arrays.toString(captured) +
|
||||
", inst=" + instMT +
|
||||
", sam=" + samMT);
|
||||
}
|
||||
}
|
||||
catch (LambdaConversionException e) {
|
||||
if (correct) {
|
||||
throw new AssertionError("Unexpected linkage error:" +
|
||||
" e=" + e +
|
||||
", impl=" + mh +
|
||||
", captured=" + Arrays.toString(captured) +
|
||||
", inst=" + instMT +
|
||||
", sam=" + samMT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void tryAltMetafactory(boolean correct, MethodHandle mh, Class<?>[] captured,
|
||||
MethodType instMT, MethodType samMT, MethodType... bridgeMTs) {
|
||||
boolean bridge = bridgeMTs.length > 0;
|
||||
Object[] args = new Object[bridge ? 5+bridgeMTs.length : 4];
|
||||
args[0] = samMT;
|
||||
args[1] = mh;
|
||||
args[2] = instMT;
|
||||
args[3] = bridge ? LambdaMetafactory.FLAG_BRIDGES : 0;
|
||||
if (bridge) {
|
||||
args[4] = bridgeMTs.length;
|
||||
for (int i = 0; i < bridgeMTs.length; i++) args[5+i] = bridgeMTs[i];
|
||||
}
|
||||
try {
|
||||
LambdaMetafactory.altMetafactory(lookup, "run", methodType(I.class, captured), args);
|
||||
if (!correct) {
|
||||
throw new AssertionError("Uncaught linkage error:" +
|
||||
" impl=" + mh +
|
||||
", captured=" + Arrays.toString(captured) +
|
||||
", inst=" + instMT +
|
||||
", sam=" + samMT +
|
||||
", bridges=" + Arrays.toString(bridgeMTs));
|
||||
}
|
||||
}
|
||||
catch (LambdaConversionException e) {
|
||||
if (correct) {
|
||||
throw new AssertionError("Unexpected linkage error:" +
|
||||
" e=" + e +
|
||||
", impl=" + mh +
|
||||
", captured=" + Arrays.toString(captured) +
|
||||
", inst=" + instMT +
|
||||
", sam=" + samMT +
|
||||
", bridges=" + Arrays.toString(bridgeMTs));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user