847a3baca8
Added archving of hidden classes of type lambda proxy classes. Co-authored-by: Ioi Lam <ioi.lam@oracle.com> Reviewed-by: mchung, iklam, dholmes
102 lines
4.5 KiB
Java
102 lines
4.5 KiB
Java
/*
|
|
* Copyright (c) 2020, 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
|
|
* @summary Archive an base app class in a base archive and its lambda proxy
|
|
* class in a dynamic archive. During runtime, the base app class
|
|
* should be loaded from the base archive and the lambda proxy class
|
|
* should be loaded from the dynamic archive.
|
|
* @requires vm.cds
|
|
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes
|
|
* @build SimpleApp sun.hotspot.WhiteBox
|
|
* @run driver ClassFileInstaller -jar simpleApp.jar SimpleApp MyClass MyInterface
|
|
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
|
|
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. LambdaForClassInBaseArchive
|
|
*/
|
|
|
|
import java.io.File;
|
|
import jdk.test.lib.process.OutputAnalyzer;
|
|
import jdk.test.lib.process.ProcessTools;
|
|
|
|
public class LambdaForClassInBaseArchive extends DynamicArchiveTestBase {
|
|
static final String classList = System.getProperty("test.classes") +
|
|
File.separator + "LambdaForClassInBaseArchive.list";
|
|
static final String appClass = "SimpleApp";
|
|
|
|
public static void main(String[] args) throws Exception {
|
|
runTest(LambdaForClassInBaseArchive::testCustomBase);
|
|
}
|
|
|
|
static void testCustomBase() throws Exception {
|
|
String topArchiveName = getNewArchiveName("top");
|
|
String baseArchiveName = getNewArchiveName("base");
|
|
doTestCustomBase(baseArchiveName, topArchiveName);
|
|
}
|
|
|
|
private static void doTestCustomBase(String baseArchiveName, String topArchiveName) throws Exception {
|
|
String appJar = ClassFileInstaller.getJarPath("simpleApp.jar");
|
|
// dump class list by running the SimpleApp
|
|
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
|
|
"-XX:DumpLoadedClassList=" + classList,
|
|
"-cp",
|
|
appJar,
|
|
appClass);
|
|
OutputAnalyzer output = TestCommon.executeAndLog(pb, "dumpClassList");
|
|
TestCommon.checkExecReturn(output, 0, true);
|
|
|
|
// create a custom base archive based on the class list
|
|
TestCommon.dumpBaseArchive(baseArchiveName,
|
|
"-XX:SharedClassListFile=" + classList,
|
|
"-cp", appJar, appClass);
|
|
|
|
// create a dynamic archive with the custom base archive.
|
|
// The SimpleApp class is in the base archive. Its interface
|
|
// will be accessed using a lambda expression and the lambda
|
|
// proxy class will be archived in the dynamic archive.
|
|
dump2(baseArchiveName, topArchiveName,
|
|
"-Xlog:cds,cds+dynamic",
|
|
"-cp", appJar,
|
|
appClass, "lambda")
|
|
.assertNormalExit(out -> {
|
|
out.shouldHaveExitValue(0)
|
|
.shouldContain("Archiving hidden SimpleApp$$Lambda$1");
|
|
});
|
|
|
|
// Run with both base and dynamic archives. The SimpleApp class
|
|
// should be loaded from the base archive. Its lambda proxy class
|
|
// should be loaded from the dynamic archive.
|
|
run2(baseArchiveName, topArchiveName,
|
|
"-Xlog:cds,cds+dynamic",
|
|
"-Xlog:class+load=trace",
|
|
"-cp", appJar,
|
|
appClass, "lambda")
|
|
.assertNormalExit(out -> {
|
|
out.shouldHaveExitValue(0)
|
|
.shouldContain("SimpleApp source: shared objects file")
|
|
.shouldMatch(".class.load. SimpleApp[$][$]Lambda[$]1/0x.*source:.*shared.*objects.*file.*(top)");
|
|
});
|
|
}
|
|
}
|