--- old/make/GenerateLinkOptData.gmk 2018-04-25 23:39:34.268935620 -0400 +++ new/make/GenerateLinkOptData.gmk 2018-04-25 23:39:32.840853054 -0400 @@ -61,13 +61,12 @@ $(call MakeDir, $(LINK_OPT_DIR)) $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@)) $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE))) - $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.tmp \ + $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \ -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \ -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \ build.tools.classlist.HelloClasslist \ $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE) - $(GREP) -v HelloClasslist $@.tmp > $@ - $(RM) -r $@.tmp + $(GREP) -v HelloClasslist $@.raw > $@ # The jli trace is created by the same recipe as classlist. By declaring these # dependencies, make will correctly rebuild both jli trace and classlist --- old/src/hotspot/share/classfile/classLoader.cpp 2018-04-25 23:39:38.621187251 -0400 +++ new/src/hotspot/share/classfile/classLoader.cpp 2018-04-25 23:39:36.797081788 -0400 @@ -636,25 +636,6 @@ } } -#if INCLUDE_CDS -void ClassLoader::check_shared_classpath(const char *path) { - if (strcmp(path, "") == 0) { - exit_with_path_failure("Cannot have empty path in archived classpaths", NULL); - } - - struct stat st; - if (os::stat(path, &st) == 0) { - if ((st.st_mode & S_IFMT) != S_IFREG) { // is not a regular file - if (!os::dir_is_empty(path)) { - tty->print_cr("Error: non-empty directory '%s'", path); - exit_with_path_failure("CDS allows only empty directories in archived classpaths", -NULL); - } - } - } -} -#endif - void ClassLoader::setup_bootstrap_search_path() { const char* sys_class_path = Arguments::get_sysclasspath(); if (PrintSharedArchiveAndExit) { --- old/src/hotspot/share/classfile/classLoader.hpp 2018-04-25 23:39:43.025441889 -0400 +++ new/src/hotspot/share/classfile/classLoader.hpp 2018-04-25 23:39:41.645362096 -0400 @@ -422,7 +422,6 @@ } return num_entries; } - static void check_shared_classpath(const char *path); static void finalize_shared_paths_misc_info(); static int get_shared_paths_misc_info_size(); static void* get_shared_paths_misc_info(); --- old/src/hotspot/share/memory/filemap.cpp 2018-04-25 23:39:47.057675018 -0400 +++ new/src/hotspot/share/memory/filemap.cpp 2018-04-25 23:39:45.661594300 -0400 @@ -335,21 +335,29 @@ void FileMapInfo::check_nonempty_dir_in_shared_path_table() { assert(DumpSharedSpaces, "dump time only"); + + bool has_nonempty_dir = false; + int end = _shared_path_table_size; if (!ClassLoaderExt::has_platform_or_app_classes()) { // only check the boot path if no app class is loaded end = ClassLoaderExt::app_class_paths_start_index(); } + for (int i = 0; i < end; i++) { SharedClassPathEntry *e = shared_path(i); if (e->is_dir()) { const char* path = e->name(); if (!os::dir_is_empty(path)) { tty->print_cr("Error: non-empty directory '%s'", path); - ClassLoader::exit_with_path_failure("Cannot have non-empty directory in paths", NULL); + has_nonempty_dir = true; } } } + + if (has_nonempty_dir) { + ClassLoader::exit_with_path_failure("Cannot have non-empty directory in paths", NULL); + } } bool FileMapInfo::validate_shared_path_table() { --- old/test/hotspot/jtreg/compiler/aot/fingerprint/CDSDumper.java 2018-04-25 23:39:51.473930349 -0400 +++ new/test/hotspot/jtreg/compiler/aot/fingerprint/CDSDumper.java 2018-04-25 23:39:50.069849170 -0400 @@ -53,7 +53,6 @@ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( heapsize, "-XX:+IgnoreUnrecognizedVMOptions", - "-XX:+UseAppCDS", "-cp", classpath, "-XX:ExtraSharedClassListFile=" + classlist, "-XX:SharedArchiveFile=" + archive, --- old/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java 2018-04-25 23:39:55.722175968 -0400 +++ new/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java 2018-04-25 23:39:54.206088313 -0400 @@ -45,7 +45,7 @@ * -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so * -XX:SharedArchiveFile=SelfChangedCDS.jsa * -XX:+IgnoreUnrecognizedVMOptions - * -Xshare:auto -XX:+UseAppCDS -showversion + * -Xshare:auto -showversion * -Xlog:cds -Xlog:gc+heap+coops * -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace * compiler.aot.fingerprint.Blah TEST-UNMODIFIED @@ -61,7 +61,7 @@ * -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so * -XX:SharedArchiveFile=SelfChangedCDS.jsa * -XX:+IgnoreUnrecognizedVMOptions - * -Xshare:auto -XX:+UseAppCDS -showversion + * -Xshare:auto -showversion * -Xlog:cds -Xlog:gc+heap+coops * -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace * compiler.aot.fingerprint.Blah TEST-MODIFIED @@ -80,7 +80,7 @@ * -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so * -XX:SharedArchiveFile=SelfChangedCDS.jsa * -XX:+IgnoreUnrecognizedVMOptions - * -Xshare:auto -XX:+UseAppCDS -showversion + * -Xshare:auto -showversion * -Xlog:cds -Xlog:gc+heap+coops * -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace * compiler.aot.fingerprint.Blah TEST-UNMODIFIED --- old/test/hotspot/jtreg/runtime/appcds/GraalWithLimitedMetaspace.java 2018-04-25 23:39:59.974421820 -0400 +++ new/test/hotspot/jtreg/runtime/appcds/GraalWithLimitedMetaspace.java 2018-04-25 23:39:58.670346421 -0400 @@ -94,7 +94,6 @@ "-XX:+EagerJVMCI", "-cp", TESTJAR, - "-XX:+UseAppCDS", TESTNAME, TEST_OUT)); @@ -117,7 +116,6 @@ TestCommon.makeCommandLineForAppCDS( "-cp", TESTJAR, - "-XX:+UseAppCDS", "-XX:SharedClassListFile=" + CLASSLIST_FILE, "-XX:SharedArchiveFile=" + ARCHIVE_FILE, "-Xlog:cds", --- old/test/hotspot/jtreg/runtime/appcds/SharedArchiveFile.java 2018-04-25 23:40:03.826644543 -0400 +++ new/test/hotspot/jtreg/runtime/appcds/SharedArchiveFile.java 2018-04-25 23:40:02.458565445 -0400 @@ -41,35 +41,12 @@ public class SharedArchiveFile { public static void main(String[] args) throws Exception { - boolean isProduct = !Platform.isDebugBuild(); String appJar = JarBuilder.getOrCreateHelloJar(); - // 1) Dumping -XX:SharedArchiveFile without -XX:+UseAppCDS should - // succeed with all binary. + // Dumping -XX:SharedArchiveFile should succeed with all binary. ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, "-cp", appJar, "-XX:SharedArchiveFile=./SharedArchiveFile.jsa", "-Xshare:dump"); OutputAnalyzer out = CDSTestUtils.executeAndLog(pb, "dump"); out.shouldContain("Dumping"); - - // 2) Using -XX:SharedArchiveFile with -XX:+UseAppCDS should work - // on product binary by default. - OutputAnalyzer output3 = TestCommon.dump(appJar, TestCommon.list("Hello")); - output3.shouldContain("Dumping"); - output3 = TestCommon.exec(appJar, "Hello"); - TestCommon.checkExec(output3, "Hello World"); - - // 3) Using -XX:+UseAppCDS should not affect other diagnostic flags, - // such as LogEvents - OutputAnalyzer output4 = TestCommon.exec(appJar, "-XX:+LogEvents", "Hello"); - if (isProduct) { - output4.shouldContain("Error: VM option 'LogEvents' is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions."); - } else { - TestCommon.checkExec(output4, "Hello World"); - } - - // 4) 8066921 - Extra -XX:+UseAppCDS - TestCommon.testDump(appJar, TestCommon.list("Hello"), "-XX:+UseAppCDS"); - OutputAnalyzer output5 = TestCommon.exec(appJar, "-XX:+UseAppCDS", "Hello"); - TestCommon.checkExec(output5); } } --- old/test/hotspot/jtreg/runtime/appcds/TestCommon.java 2018-04-25 23:40:08.138893864 -0400 +++ new/test/hotspot/jtreg/runtime/appcds/TestCommon.java 2018-04-25 23:40:06.498799038 -0400 @@ -109,8 +109,6 @@ return createArchive(opts); } - // If you use -XX:+UseAppCDS or -XX:-UseAppCDS in your JVM command-line, call this method - // to wrap the arguments. public static String[] makeCommandLineForAppCDS(String... args) throws Exception { return args; } @@ -135,7 +133,6 @@ cmd.add("-Xshare:dump"); cmd.add("-Xlog:cds,cds+hashtables"); - cmd.add("-XX:+UseAppCDS"); cmd.add("-XX:ExtraSharedClassListFile=" + classList.getPath()); if (opts.archiveName == null) @@ -160,7 +157,6 @@ for (String p : opts.prefix) cmd.add(p); cmd.add("-Xshare:" + opts.xShareMode); - cmd.add("-XX:+UseAppCDS"); cmd.add("-showversion"); cmd.add("-XX:SharedArchiveFile=" + getCurrentArchiveName()); cmd.add("-Dtest.timeout.factor=" + timeoutFactor); --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java 2018-04-25 23:40:12.399140178 -0400 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java 2018-04-25 23:40:10.959056917 -0400 @@ -48,7 +48,6 @@ ProcessBuilder dumpPb = ProcessTools.createJavaProcessBuilder(true, TestCommon.makeCommandLineForAppCDS( - "-XX:+UseAppCDS", "-cp", appJar, "-XX:SharedArchiveConfigFile=" + sharedArchiveConfigFile, "-XX:SharedArchiveFile=./SharedStringsBasic.jsa", @@ -61,7 +60,6 @@ ProcessBuilder runPb = ProcessTools.createJavaProcessBuilder(true, TestCommon.makeCommandLineForAppCDS( - "-XX:+UseAppCDS", "-cp", appJar, "-XX:SharedArchiveFile=./SharedStringsBasic.jsa", "-Xshare:auto", --- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java 2018-04-25 23:40:16.415372384 -0400 +++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java 2018-04-25 23:40:15.087295599 -0400 @@ -44,7 +44,6 @@ ProcessBuilder dumpPb = ProcessTools.createJavaProcessBuilder(true, TestCommon.makeCommandLineForAppCDS( "-XX:+UseG1GC", "-XX:MaxRAMPercentage=12.5", - "-XX:+UseAppCDS", "-cp", ".", "-XX:SharedBaseAddress=0", "-XX:SharedArchiveFile=./SysDictCrash.jsa", "-Xshare:dump", @@ -55,7 +54,6 @@ ProcessBuilder runPb = ProcessTools.createJavaProcessBuilder(true, TestCommon.makeCommandLineForAppCDS( "-XX:+UseG1GC", "-XX:MaxRAMPercentage=12.5", - "-XX:+UseAppCDS", "-XX:SharedArchiveFile=./SysDictCrash.jsa", "-Xshare:on", "-version")); --- old/test/hotspot/jtreg/runtime/appcds/UseAppCDS.java 2018-04-25 23:40:20.851628876 -0400 +++ /dev/null 2018-03-24 19:24:47.133016998 -0400 @@ -1,225 +0,0 @@ -/* - * Copyright (c) 2014, 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 Testing use of UseAppCDS flag - * @requires vm.cds - * @library /test/lib - * @modules java.base/jdk.internal.misc - * java.management - * jdk.jartool/sun.tools.jar - * @build UseAppCDS_Test - * @run main UseAppCDS - */ - -import jdk.test.lib.JDKToolLauncher; -import jdk.test.lib.cds.CDSTestUtils; -import jdk.test.lib.process.OutputAnalyzer; -import jdk.test.lib.process.ProcessTools; - -import java.util.ArrayList; -import java.util.List; -import java.io.*; - -public class UseAppCDS { - - // Class UseAppCDS_Test is loaded by the App loader - - static final String TEST_OUT = "UseAppCDS_Test.main--executed"; - - private static final String TESTJAR = "./test.jar"; - private static final String TESTNAME = "UseAppCDS_Test"; - private static final String TESTCLASS = TESTNAME + ".class"; - - private static final String CLASSES_DIR = System.getProperty("test.classes", "."); - private static final String CLASSLIST_FILE = "./UseAppCDS.classlist"; - private static final String ARCHIVE_FILE = "./shared.jsa"; - private static final String BOOTCLASS = "java.lang.Class"; - - public static void main(String[] args) throws Exception { - - // First create a jar file for the application "test" class - JDKToolLauncher jar = JDKToolLauncher.create("jar") - .addToolArg("-cf") - .addToolArg(TESTJAR) - .addToolArg("-C") - .addToolArg(CLASSES_DIR) - .addToolArg(TESTCLASS); - - ProcessBuilder pb = new ProcessBuilder(jar.getCommand()); - TestCommon.executeAndLog(pb, "jar01").shouldHaveExitValue(0); - - pb = new ProcessBuilder(jar.getCommand()); - TestCommon.executeAndLog(pb, "jar02").shouldHaveExitValue(0); - - // In all tests the BOOTCLASS and TESTNAME should be loaded/dumped/used - - // Test 1: -XX:-UseAppCDS - No effect, dumping loaded classes includes "test" classes - dumpLoadedClasses(false, new String[] { BOOTCLASS, TESTNAME }, - new String[0]); - - // Test 2: -XX:+UseAppCDS - dumping loaded classes includes "test" classes - dumpLoadedClasses(true, new String[] { BOOTCLASS, TESTNAME }, - new String[0]); - - // Next tests rely on the classlist we just dumped - - // Test 3: -XX:-UseAppCDS - No effect, "test" classes in classlist are dumped - dumpArchive(false, new String[] { BOOTCLASS, TESTNAME }, - new String[0]); - - // Test 4: -XX:+UseAppCDS - "test" classes in classlist are dumped - dumpArchive(true, new String[] { BOOTCLASS, TESTNAME }, - new String[0]); - - // Next tests rely on the archive we just dumped - - // Test 5: -XX:-UseAppCDS - No effect, using archive containing "test" loads them - useArchive(false, new String[] { BOOTCLASS, TESTNAME }, - new String[0]); - - // Test 6: -XX:+UseAppCDS - Using archive containing "test" classes loads them - useArchive(true, new String[] { BOOTCLASS, TESTNAME }, - new String[0]); - } - - public static List toClassNames(String filename) throws IOException { - ArrayList classes = new ArrayList<>(); - try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(filename)))) { - for (; ; ) { - String line = br.readLine(); - if (line == null) { - break; - } - classes.add(line.replaceAll("/", ".")); - } - } - return classes; - } - - static void dumpLoadedClasses(boolean useAppCDS, String[] expectedClasses, - String[] unexpectedClasses) throws Exception { - ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, - TestCommon.makeCommandLineForAppCDS( - "-XX:DumpLoadedClassList=" + CLASSLIST_FILE, - "-cp", - TESTJAR, - (useAppCDS) ? "-XX:+UseAppCDS" : "-XX:-UseAppCDS", - TESTNAME, - TEST_OUT)); - - OutputAnalyzer output = TestCommon.executeAndLog(pb, "dump-loaded-classes") - .shouldHaveExitValue(0).shouldContain(TEST_OUT); - - List dumpedClasses = toClassNames(CLASSLIST_FILE); - - for (String clazz : expectedClasses) { - if (!dumpedClasses.contains(clazz)) { - throw new RuntimeException(clazz + " missing in " + - CLASSLIST_FILE); - } - } - for (String clazz : unexpectedClasses) { - if (dumpedClasses.contains(clazz)) { - throw new RuntimeException("Unexpectedly found " + clazz + - " in " + CLASSLIST_FILE); - } - } - } - - static void dumpArchive(boolean useAppCDS, String[] expectedClasses, - String[] unexpectedClasses) throws Exception { - ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, - TestCommon.makeCommandLineForAppCDS( - "-cp", - TESTJAR, - useAppCDS ? "-XX:+UseAppCDS" : "-XX:-UseAppCDS", - "-XX:SharedClassListFile=" + CLASSLIST_FILE, - "-XX:SharedArchiveFile=" + ARCHIVE_FILE, - "-Xlog:cds", - "-Xshare:dump")); - - OutputAnalyzer output = TestCommon.executeAndLog(pb, "dump-archive") - .shouldHaveExitValue(0); - - for (String clazz : expectedClasses) { - String failed = "Preload Warning: Cannot find " + clazz; - output.shouldNotContain(failed); - } - for (String clazz : unexpectedClasses) { - String failed = "Preload Warning: Cannot find " + clazz; - output.shouldContain(failed); - } - } - - static void useArchive(boolean useAppCDS, String[] expectedClasses, - String[] unexpectedClasses) throws Exception { - ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, - TestCommon.makeCommandLineForAppCDS( - "-cp", - TESTJAR, - useAppCDS ? "-XX:+UseAppCDS" : "-XX:-UseAppCDS", - "-XX:SharedArchiveFile=" + ARCHIVE_FILE, - "-verbose:class", - "-Xshare:on", - TESTNAME, - TEST_OUT)); - - OutputAnalyzer output = TestCommon.executeAndLog(pb, "use-archive"); - if (CDSTestUtils.isUnableToMap(output)) - System.out.println("Unable to map: test case skipped"); - else - output.shouldHaveExitValue(0).shouldContain(TEST_OUT); - - // Quote the class name in the regex as it may contain $ - String prefix = ".class,load. "; - String archive_suffix = ".*source: shared objects file.*"; - String jar_suffix = ".*source: .*\\.jar"; - - for (String clazz : expectedClasses) { - String pattern = prefix + clazz + archive_suffix; - try { - output.shouldMatch(pattern); - } catch (Exception e) { - TestCommon.checkCommonExecExceptions(output, e); - } - } - - for (String clazz : unexpectedClasses) { - String pattern = prefix + clazz + archive_suffix; - try { - output.shouldNotMatch(pattern); - } catch (Exception e) { - TestCommon.checkCommonExecExceptions(output, e); - } - pattern = prefix + clazz + jar_suffix; - try { - output.shouldMatch(pattern); - } catch (Exception e) { - TestCommon.checkCommonExecExceptions(output, e); - } - } - } -}