# HG changeset patch # User iklam # Date 1520402910 28800 # Node ID 0b48f0aa79ec8070a6b977d6132efd236a397acc # Parent 8bb47943a8ddee896de5513412058123ab0c43f8 8191585: VM anonymous classes created during CDS dump time cause crash Reviewed-by: hseigel, mseledtsov, ccheung diff -r 8bb47943a8dd -r 0b48f0aa79ec src/hotspot/share/classfile/classLoaderData.hpp --- a/src/hotspot/share/classfile/classLoaderData.hpp Tue Mar 06 16:02:04 2018 -0800 +++ b/src/hotspot/share/classfile/classLoaderData.hpp Tue Mar 06 22:08:30 2018 -0800 @@ -331,7 +331,13 @@ bool is_the_null_class_loader_data() const { return this == _the_null_class_loader_data; } + + // Returns true if this class loader data is for the system class loader. + // (Note that the class loader data may be anonymous.) bool is_system_class_loader_data() const; + + // Returns true if this class loader data is for the platform class loader. + // (Note that the class loader data may be anonymous.) bool is_platform_class_loader_data() const; // Returns true if this class loader data is for the boot class loader. diff -r 8bb47943a8dd -r 0b48f0aa79ec src/hotspot/share/classfile/systemDictionary.cpp --- a/src/hotspot/share/classfile/systemDictionary.cpp Tue Mar 06 16:02:04 2018 -0800 +++ b/src/hotspot/share/classfile/systemDictionary.cpp Tue Mar 06 22:08:30 2018 -0800 @@ -3043,6 +3043,9 @@ _master_dictionary(master_dictionary) {} void do_cld(ClassLoaderData* cld) { ResourceMark rm; + if (cld->is_anonymous()) { + return; + } if (cld->is_system_class_loader_data() || cld->is_platform_class_loader_data()) { for (int i = 0; i < cld->dictionary()->table_size(); ++i) { Dictionary* curr_dictionary = cld->dictionary(); diff -r 8bb47943a8dd -r 0b48f0aa79ec test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDump.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDump.java Tue Mar 06 22:08:30 2018 -0800 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2018, 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 When dumping the CDS archive, try to load VM anonymous classes to make sure they + * are handled properly. Note: these are not "anonymous inner classes" in the Java source code, + * but rather classes that are not recorded in any ClassLoaderData::dictionary(), + * such as classes that are generated for Lambda expressions. + * See https://blogs.oracle.com/jrose/anonymous-classes-in-the-vm. + * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @requires vm.cds + * @requires vm.flavor != "minimal" + * @modules java.base/jdk.internal.misc + * jdk.jartool/sun.tools.jar + * java.management + * @build AnonVmClassesDuringDumpTransformer Hello + * @run main/othervm AnonVmClassesDuringDump + */ + +public class AnonVmClassesDuringDump { + public static String appClasses[] = { + "Hello", + }; + public static String agentClasses[] = { + "AnonVmClassesDuringDumpTransformer", + }; + + public static void main(String[] args) throws Throwable { + String agentJar = + ClassFileInstaller.writeJar("AnonVmClassesDuringDumpTransformer.jar", + ClassFileInstaller.Manifest.fromSourceFile("AnonVmClassesDuringDumpTransformer.mf"), + agentClasses); + + String appJar = + ClassFileInstaller.writeJar("AnonVmClassesDuringDumpApp.jar", appClasses); + + TestCommon.testDump(appJar, TestCommon.list("Hello"), + "-javaagent:" + agentJar, + // Set the following property to see logs for dynamically generated classes + // in STDOUT + "-Djava.lang.invoke.MethodHandle.DUMP_CLASS_FILES=true"); + TestCommon.run("-cp", appJar, "Hello") + .assertNormalExit(); + } +} + diff -r 8bb47943a8dd -r 0b48f0aa79ec test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDumpTransformer.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDumpTransformer.java Tue Mar 06 22:08:30 2018 -0800 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2018, 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. + * + */ + +import java.lang.instrument.ClassFileTransformer; +import java.lang.instrument.Instrumentation; +import java.lang.instrument.IllegalClassFormatException; +import java.security.ProtectionDomain; + +public class AnonVmClassesDuringDumpTransformer implements ClassFileTransformer { + public byte[] transform(ClassLoader loader, String name, Class classBeingRedefined, + ProtectionDomain pd, byte[] buffer) throws IllegalClassFormatException { + return null; + } + + private static Instrumentation savedInstrumentation; + + public static void premain(String agentArguments, Instrumentation instrumentation) { + System.out.println("ClassFileTransformer.premain() is called"); + instrumentation.addTransformer(new AnonVmClassesDuringDumpTransformer(), /*canRetransform=*/true); + savedInstrumentation = instrumentation; + + // This will create a Lambda, which will result in some Anonymous VM Classes + // being generated. + // + // Look for something like these in the STDOUT: + // ---------------- + // ClassFileTransformer.premain() is called + // Dumping class files to DUMP_CLASS_FILES/... + // dump: DUMP_CLASS_FILES/java/lang/invoke/LambdaForm$MH000.class + // dump: DUMP_CLASS_FILES/java/lang/invoke/LambdaForm$MH001.class + // Invoked inside a Lambda + // ---------------- + Runnable r = () -> { + System.out.println("Invoked inside a Lambda"); + }; + r.run(); + } + + public static Instrumentation getInstrumentation() { + return savedInstrumentation; + } + + public static void agentmain(String args, Instrumentation inst) throws Exception { + premain(args, inst); + } +} diff -r 8bb47943a8dd -r 0b48f0aa79ec test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDumpTransformer.mf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDumpTransformer.mf Tue Mar 06 22:08:30 2018 -0800 @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Premain-Class: AnonVmClassesDuringDumpTransformer +Agent-Class: AnonVmClassesDuringDumpTransformer +Can-Retransform-Classes: true +Can-Redefine-Classes: true