8265079: Implement VarHandle invoker caching
Reviewed-by: redestad, vlivanov, psandoz, mchung
This commit is contained in:
parent
b64a3fb946
commit
c88714875d
@ -54,7 +54,9 @@ class Invokers {
|
|||||||
INV_EXACT = 0, // MethodHandles.exactInvoker
|
INV_EXACT = 0, // MethodHandles.exactInvoker
|
||||||
INV_GENERIC = 1, // MethodHandles.invoker (generic invocation)
|
INV_GENERIC = 1, // MethodHandles.invoker (generic invocation)
|
||||||
INV_BASIC = 2, // MethodHandles.basicInvoker
|
INV_BASIC = 2, // MethodHandles.basicInvoker
|
||||||
INV_LIMIT = 3;
|
VH_INV_EXACT = 3, // MethodHandles.varHandleExactInvoker
|
||||||
|
VH_INV_GENERIC = VH_INV_EXACT + VarHandle.AccessMode.values().length, // MethodHandles.varHandleInvoker
|
||||||
|
INV_LIMIT = VH_INV_GENERIC + VarHandle.AccessMode.values().length;
|
||||||
|
|
||||||
/** Compute and cache information common to all collecting adapters
|
/** Compute and cache information common to all collecting adapters
|
||||||
* that implement members of the erasure-family of the given erased type.
|
* that implement members of the erasure-family of the given erased type.
|
||||||
@ -101,14 +103,20 @@ class Invokers {
|
|||||||
|
|
||||||
/*non-public*/
|
/*non-public*/
|
||||||
MethodHandle varHandleMethodInvoker(VarHandle.AccessMode ak) {
|
MethodHandle varHandleMethodInvoker(VarHandle.AccessMode ak) {
|
||||||
// TODO cache invoker
|
boolean isExact = false;
|
||||||
return makeVarHandleMethodInvoker(ak, false);
|
MethodHandle invoker = cachedVHInvoker(isExact, ak);
|
||||||
|
if (invoker != null) return invoker;
|
||||||
|
invoker = makeVarHandleMethodInvoker(ak, isExact);
|
||||||
|
return setCachedVHInvoker(isExact, ak, invoker);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*non-public*/
|
/*non-public*/
|
||||||
MethodHandle varHandleMethodExactInvoker(VarHandle.AccessMode ak) {
|
MethodHandle varHandleMethodExactInvoker(VarHandle.AccessMode ak) {
|
||||||
// TODO cache invoker
|
boolean isExact = true;
|
||||||
return makeVarHandleMethodInvoker(ak, true);
|
MethodHandle invoker = cachedVHInvoker(isExact, ak);
|
||||||
|
if (invoker != null) return invoker;
|
||||||
|
invoker = makeVarHandleMethodInvoker(ak, isExact);
|
||||||
|
return setCachedVHInvoker(isExact, ak, invoker);
|
||||||
}
|
}
|
||||||
|
|
||||||
private MethodHandle cachedInvoker(int idx) {
|
private MethodHandle cachedInvoker(int idx) {
|
||||||
@ -122,6 +130,16 @@ class Invokers {
|
|||||||
return invokers[idx] = invoker;
|
return invokers[idx] = invoker;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private MethodHandle cachedVHInvoker(boolean isExact, VarHandle.AccessMode ak) {
|
||||||
|
int baseIndex = (isExact ? VH_INV_EXACT : VH_INV_GENERIC);
|
||||||
|
return cachedInvoker(baseIndex + ak.ordinal());
|
||||||
|
}
|
||||||
|
|
||||||
|
private MethodHandle setCachedVHInvoker(boolean isExact, VarHandle.AccessMode ak, final MethodHandle invoker) {
|
||||||
|
int baseIndex = (isExact ? VH_INV_EXACT : VH_INV_GENERIC);
|
||||||
|
return setCachedInvoker(baseIndex + ak.ordinal(), invoker);
|
||||||
|
}
|
||||||
|
|
||||||
private MethodHandle makeExactOrGeneralInvoker(boolean isExact) {
|
private MethodHandle makeExactOrGeneralInvoker(boolean isExact) {
|
||||||
MethodType mtype = targetType;
|
MethodType mtype = targetType;
|
||||||
MethodType invokerType = mtype.invokerType();
|
MethodType invokerType = mtype.invokerType();
|
||||||
|
88
test/jdk/java/lang/invoke/TestVHInvokerCaching.java
Normal file
88
test/jdk/java/lang/invoke/TestVHInvokerCaching.java
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2021, 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 8265079
|
||||||
|
* @run testng/othervm -Xverify:all TestVHInvokerCaching
|
||||||
|
*/
|
||||||
|
|
||||||
|
import org.testng.annotations.DataProvider;
|
||||||
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
|
import java.lang.invoke.MethodHandle;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
import java.lang.invoke.VarHandle;
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static java.lang.invoke.MethodHandles.lookup;
|
||||||
|
import static org.testng.Assert.assertSame;
|
||||||
|
|
||||||
|
public class TestVHInvokerCaching {
|
||||||
|
|
||||||
|
@Test(dataProvider = "testHandles")
|
||||||
|
public static void testVHIInvokerCaching(VarHandle testHandle) throws Throwable {
|
||||||
|
for (VarHandle.AccessMode mode : VarHandle.AccessMode.values()) {
|
||||||
|
MethodHandle handle1 = MethodHandles.varHandleInvoker(mode, testHandle.accessModeType(mode));
|
||||||
|
MethodHandle handle2 = MethodHandles.varHandleInvoker(mode, testHandle.accessModeType(mode));
|
||||||
|
assertSame(handle1, handle2);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (VarHandle.AccessMode mode : VarHandle.AccessMode.values()) {
|
||||||
|
MethodHandle handle1 = MethodHandles.varHandleExactInvoker(mode, testHandle.accessModeType(mode));
|
||||||
|
MethodHandle handle2 = MethodHandles.varHandleExactInvoker(mode, testHandle.accessModeType(mode));
|
||||||
|
assertSame(handle1, handle2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@DataProvider
|
||||||
|
public static Object[][] testHandles() throws NoSuchFieldException, IllegalAccessException {
|
||||||
|
List<VarHandle> testHandles = new ArrayList<>();
|
||||||
|
|
||||||
|
class Holder {
|
||||||
|
byte f_byte;
|
||||||
|
short f_short;
|
||||||
|
char f_char;
|
||||||
|
int f_int;
|
||||||
|
long f_long;
|
||||||
|
float f_float;
|
||||||
|
double f_double;
|
||||||
|
Object f_Object;
|
||||||
|
String f_String;
|
||||||
|
}
|
||||||
|
|
||||||
|
MethodHandles.Lookup lookup = lookup();
|
||||||
|
|
||||||
|
for (Field field : Holder.class.getFields()) {
|
||||||
|
String fieldName = field.getName();
|
||||||
|
Class<?> fieldType = field.getType();
|
||||||
|
|
||||||
|
testHandles.add(MethodHandles.arrayElementVarHandle(fieldType.arrayType()));
|
||||||
|
testHandles.add(lookup.findVarHandle(Holder.class, fieldName, fieldType));
|
||||||
|
}
|
||||||
|
|
||||||
|
return testHandles.stream().map(vh -> new Object[]{ vh }).toArray(Object[][]::new);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user