infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-15 17:30:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugs and verify loader leak

Browse Source
This commit is contained in:
Chen Liang 2025-12-07 20:00:20 -06:00
parent a52099abcf
commit eebb8ff755
3 changed files with 83 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/jdk/src/classes/build/tools/methodhandle/VarHandleGuardMethodGenerator.java
View File

@ -122,11 +122,14 @@ public final class VarHandleGuardMethodGenerator {
if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
<RESULT_ERASED>MethodHandle.linkToStatic(<LINK_TO_STATIC_ARGS>);<RETURN_ERASED>
} else {
MethodHandle mh = handle.getMethodHandle(ad.mode);
<RETURN>mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(<LINK_TO_INVOKER_ARGS>);
<RETURN>ad.adaptedMethodHandle(handle).invokeBasic(<LINK_TO_INVOKER_ARGS>);
}
}""";
// Currently this void version is needed because otherwise
// TestZGCBarrierElision.testAtomicThenAtomicAnotherField fails
// However, testArrayAtomicThenAtomic, testAtomicThenAtomic, and
// testArrayAtomicThenAtomicAtUnknownIndices works
static final String GUARD_METHOD_TEMPLATE_V =
"""
@ForceInline
@ -139,8 +142,7 @@ public final class VarHandleGuardMethodGenerator {
} else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
MethodHandle.linkToStatic(<LINK_TO_STATIC_ARGS>);
} else {
MethodHandle mh = handle.getMethodHandle(ad.mode);
mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(<LINK_TO_INVOKER_ARGS>);
<RETURN>ad.adaptedMethodHandle(handle).invokeBasic(<LINK_TO_INVOKER_ARGS>);
}
}""";

4
test/hotspot/jtreg/compiler/c2/irTests/constantFold/VarHandleMismatchedTypeFold.java
View File

@ -44,9 +44,7 @@ import compiler.lib.ir_framework.TestFramework;
public class VarHandleMismatchedTypeFold {
public static void main(String[] args) {
TestFramework.runWithFlags(
"-XX:+UnlockExperimentalVMOptions"
);
TestFramework.run();
}
static final int a = 5;

76
test/jdk/java/lang/invoke/VarHandles/PolymorphicCallSiteLeakTest.java Normal file
View File

@ -0,0 +1,76 @@
/*
* Copyright (c) 2025, 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 8160821
* @summary Ensures a polymorphic call site with non-exact invocation won't
* cause class loader leaks
* @library /test/lib
* @run junit PolymorphicCallSiteLeakTest
*/
import java.lang.classfile.ClassFile;
import java.lang.constant.ClassDesc;
import java.lang.invoke.MethodHandles;
import java.lang.ref.WeakReference;
import jdk.test.lib.ByteCodeLoader;
import jdk.test.lib.util.ForceGC;
import org.junit.jupiter.api.Test;
import static java.lang.classfile.ClassFile.ACC_PUBLIC;
import static java.lang.classfile.ClassFile.ACC_STATIC;
import static java.lang.constant.ConstantDescs.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
class PolymorphicCallSiteLeakTest {
@Test
void test() throws Throwable {
var dummyClass = ByteCodeLoader.load("Dummy", ClassFile.of().build(ClassDesc.of("Dummy"), clb -> clb
.withField("staticField", CD_long, ACC_PUBLIC | ACC_STATIC)
.withField("instanceField", CD_long, ACC_PUBLIC)
.withMethodBody(INIT_NAME, MTD_void, ACC_PUBLIC, cob -> cob
.aload(0).invokespecial(CD_Object, INIT_NAME, MTD_void).return_())));
var loaderRef = new WeakReference<>(dummyClass.getClassLoader());
var lookup = MethodHandles.publicLookup();
var instanceVar = lookup.findVarHandle(dummyClass, "instanceField", long.class);
var staticVar = lookup.findStaticVarHandle(dummyClass, "staticField", long.class);
var obj = dummyClass.getConstructor().newInstance();
// Non-exact invocations call sites - cache are strongly linked by this class like lambdas
assertEquals(0L, (long) instanceVar.getAndAdd(obj, 1));
assertEquals(0L, (long) staticVar.getAndAdd(2));
dummyClass = null;
instanceVar = null;
staticVar = null;
obj = null;
if (!ForceGC.wait(() -> loaderRef.refersTo(null))) {
fail("Loader leak through VH polymorphism cache");
}
}
}