archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8195694: ConstantBootstraps.invoke does not preserve variable arity

Browse source 
Reviewed-by: jrose
This commit is contained in:
Paul Sandoz 2018-02-01 14:19:04 -08:00
parent 5dc2184391
commit 00b3f917ac
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -232,7 +232,10 @@ public final class ConstantBootstraps {
requireNonNull(args); requireNonNull(args);
if (type != handle.type().returnType()) { if (type != handle.type().returnType()) {
handle = handle.asType(handle.type().changeReturnType(type)); // Adjust the return type of the handle to be invoked while
// preserving variable arity if present
handle = handle.asType(handle.type().changeReturnType(type)).
withVarargs(handle.isVarargsCollector());
} }
return handle.invokeWithArguments(args); return handle.invokeWithArguments(args);

21
test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8186046 * @bug 8186046 8195694
* @summary Test dynamic constant bootstraps * @summary Test dynamic constant bootstraps
* @library /lib/testlibrary/bytecode /java/lang/invoke/common * @library /lib/testlibrary/bytecode /java/lang/invoke/common
* @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
@ -43,6 +43,7 @@ import java.lang.invoke.MethodType;
import java.lang.invoke.VarHandle; import java.lang.invoke.VarHandle;
import java.lang.invoke.WrongMethodTypeException; import java.lang.invoke.WrongMethodTypeException;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -189,6 +190,22 @@ public class ConstantBootstrapsTest {
assertEquals(handle.invoke(), 42); assertEquals(handle.invoke(), 42);
} }
public void testInvokeAsTypeVariableArity() throws Throwable {
// The constant type is Collection but the invoke return type is List
var handle = InstructionHelper.ldcDynamicConstant(
L, "_", Collection.class,
ConstantBootstraps.class, "invoke", lookupMT(Object.class, MethodHandle.class, Object[].class),
S -> {
S.add("", (P, Z) -> {
return P.putHandle(MethodHandleInfo.REF_invokeStatic, "java/util/List", "of",
MethodType.methodType(List.class, Object[].class).toMethodDescriptorString(),
true);
});
S.add(1).add(2).add(3).add(4);
});
assertEquals(handle.invoke(), List.of(1, 2, 3, 4));
}
@Test(expectedExceptions = ClassCastException.class) @Test(expectedExceptions = ClassCastException.class)
public void testInvokeAsTypeClassCast() throws Throwable { public void testInvokeAsTypeClassCast() throws Throwable {
ConstantBootstraps.invoke(MethodHandles.lookup(), "_", String.class, ConstantBootstraps.invoke(MethodHandles.lookup(), "_", String.class,