stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8323950: Null CLD while loading shared lambda proxy class with javaagent active

Browse Source 
Reviewed-by: matsaave, iklam
This commit is contained in:
Calvin Cheung 2024-01-30 20:00:10 +00:00
parent f57c7223cf
commit d51aaf6304
3 changed files with 119 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/share/classfile/systemDictionary.cpp
View File

@ -1111,13 +1111,12 @@ InstanceKlass* SystemDictionary::load_shared_lambda_proxy_class(InstanceKlass* i
if (loaded_ik != nullptr) { if (loaded_ik != nullptr) {
assert(shared_nest_host->is_same_class_package(ik), assert(shared_nest_host->is_same_class_package(ik),
"lambda proxy class and its nest host must be in the same package"); "lambda proxy class and its nest host must be in the same package");
}
// The lambda proxy class and its nest host have the same class loader and class loader data, // The lambda proxy class and its nest host have the same class loader and class loader data,
// as verified in SystemDictionaryShared::add_lambda_proxy_class() // as verified in SystemDictionaryShared::add_lambda_proxy_class()
assert(shared_nest_host->class_loader() == class_loader(), "mismatched class loader"); assert(shared_nest_host->class_loader() == class_loader(), "mismatched class loader");
assert(shared_nest_host->class_loader_data() == class_loader_data(class_loader), "mismatched class loader data"); assert(shared_nest_host->class_loader_data() == class_loader_data(class_loader), "mismatched class loader data");
ik->set_nest_host(shared_nest_host); ik->set_nest_host(shared_nest_host);
}
return loaded_ik; return loaded_ik;
} }

79
test/hotspot/jtreg/runtime/cds/appcds/TransformInterfaceOfLambda.java Normal file
View File

@ -0,0 +1,79 @@
/*
* Copyright (c) 2024, 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 8323950
* @summary Transforming an interface of an archived lambda proxy class should not
* crash the VM. The lambda proxy class should be regenerated during runtime.
* @requires vm.cds
* @requires vm.jvmti
* @requires vm.flagless
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @compile test-classes/SimpleTest.java
* @compile test-classes/TransformBootClass.java
* @run driver TransformInterfaceOfLambda
*/
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.helpers.ClassFileInstaller;
public class TransformInterfaceOfLambda {
public static String agentClasses[] = {
TransformBootClass.class.getName(),
};
public static void main(String[] args) throws Exception {
String mainClass = SimpleTest.class.getName();
String namePrefix = "transform-interface-of-lambda";
JarBuilder.build(namePrefix, mainClass);
String appJar = TestCommon.getTestJar(namePrefix + ".jar");
String agentJar =
ClassFileInstaller.writeJar("TransformBootClass.jar",
ClassFileInstaller.Manifest.fromSourceFile("test-classes/TransformBootClass.mf"),
agentClasses);
String useJavaAgent = "-javaagent:" + agentJar + "=java/util/function/IntFunction";
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
"-cp", appJar, "-Xlog:class+load,cds=debug",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+AllowArchivingWithJavaAgent",
useJavaAgent,
mainClass);
OutputAnalyzer out = new OutputAnalyzer(pb.start());
System.out.println(out.getStdout());
out.shouldHaveExitValue(0)
// the class loaded by the SimpleTest should be from the archive
.shouldContain("[class,load] java.text.SimpleDateFormat source: shared objects file")
// the IntFunction is the interface which is being transformed. The
// interface is a super type of the following lambda proxy class.
.shouldContain("Transforming class java/util/function/IntFunction")
// the lambda proxy class should be regenerated
.shouldMatch(".class.load.*sun.util.locale.provider.LocaleProviderAdapter[$][$]Lambda/0x.*source:.*sun.util.locale.provider.LocaleProviderAdapter");
}
}

35
test/hotspot/jtreg/runtime/cds/appcds/test-classes/SimpleTest.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2024, 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.
*
*/
/*
* Loading the java.text.SimpleDateFormat class will in turn load the
* sun.util.locale.provider.LocaleProviderAdapter$$Lambda/0x... lambda proxy class
* which will also load its interface java.util.function.IntFunction.
* By default, all of the above classes should be in the default CDS archive.
*/
public class SimpleTest {
public static void main(String[] args) throws Exception {
new java.text.SimpleDateFormat();
}
}