Cleanup

jerboaa · jerboaa · commit 9ffedd3dc931 · 2025-03-21T17:55:51.000+01:00
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JRTArchive.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JRTArchive.java
@@ -89,8 +89,8 @@ public class JRTArchive implements Archive {
      *        install aborts the link.
      * @param perModDiff The lib/modules (a.k.a jimage) diff for this module,
      *                   possibly an empty list if there are no differences.
-     * @param altHashSums A map of per-module hash sums to allow for binaries
-     *                    and dynamic libraries.
+     * @param altHashSums A map of alternative hash sums for files in
+     *                    a module, possibly empty.
      * @param taskHelper The task helper reference.
      */
     JRTArchive(String module,
@@ -225,7 +225,14 @@ private void addNonClassResources() {
 
                         // Read from the base JDK image.
                         Path path = BASE.resolve(m.resPath);
-                        // FIXME: Do this only for binaries/shared libs?
+                        // Allow for additional hash sums so as to support
+                        // file modifications done after jlink has run at build
+                        // time. For example for Windows builds done with
+                        // --with-external-symbols-in-bundles=public or
+                        // distribution builds, where some post-processing happens
+                        // on produced binaries and libraries invalidating the
+                        // hash sum included in the jdk.jlink module for those
+                        // files at jlink-time
                         Set<String> shaSums = new HashSet<>();
                         shaSums.add(m.hashOrTarget);
                         Set<String> extra = altHashSums.get(m.resPath);
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
@@ -28,7 +28,6 @@
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -60,7 +59,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -202,16 +200,22 @@ public class JlinkTask {
                     throw taskHelper.newBadArgs("err.sha.overrides.multiple");
                 }
                 Path file = Paths.get(arg.substring(1));
-                try {
-                    Files.readAllLines(file).stream()
-                        .forEach(task.options.shaOverrides::add);
-                } catch (FileNotFoundException e) {
-                    throw taskHelper.newBadArgs("err.sha.overrides.fnf", file.toString());
-                } catch (IOException e) {
-                    throw taskHelper.newBadArgs("err.sha.overrides.freaderr", file.toString());
+                // Ignore non-existing sha overrides file.
+                //
+                // This is to allow for custom builds needing to optionally
+                // support run-time image links on (possibly) modified
+                // binaries/debuginfo files done after the JDK build
+                if (Files.exists(file)) {
+                    try {
+                        Files.readAllLines(file).stream()
+                            .forEach(task.options.shaOverrides::add);
+                    } catch (IOException e) {
+                        throw taskHelper.newBadArgs("err.sha.overrides.freaderr", file.toString());
+                    }
                 }
             } else {
-                // Comma separated values on CLI. Possible multiples.
+                // Allow multiple values, separated by comma in addition to
+                // multiple times the same option.
                 Arrays.asList(arg.split(",")).stream()
                     .forEach(task.options.shaOverrides::add);
             }
@@ -486,7 +490,7 @@ private JlinkConfiguration initJlinkConfig() throws BadArgs {
 
         LinkableRuntimeImage.Config linkableRuntimeConfig = new LinkableRuntimeImage.Config(
                 options.ignoreModifiedRuntime,
-                isLinkFromRuntime ? buildShaSumMap(finder, taskHelper, options.shaOverrides) : Map.of());
+                isLinkFromRuntime ? buildShaSumMap(taskHelper, options.shaOverrides) : null);
         return new JlinkConfiguration(options.output,
                                       roots,
                                       finder,
@@ -495,15 +499,9 @@ private JlinkConfiguration initJlinkConfig() throws BadArgs {
                                       options.generateLinkableRuntime);
     }
 
-    private Map<String, Map<String, Set<String>>> buildShaSumMap(ModuleFinder finder,
-                                                                 TaskHelper taskHelper,
+    private Map<String, Map<String, Set<String>>> buildShaSumMap(TaskHelper taskHelper,
                                                                  Set<String> shaOverrides) throws BadArgs {
-        Set<String> modules = finder.findAll().stream()
-                                              .map(ModuleReference::descriptor)
-                                              .map(ModuleDescriptor::name)
-                                              .collect(Collectors.toSet());
         Map<String, Map<String, Set<String>>> moduleToFiles = new HashMap<>();
-        modules.forEach(m -> { moduleToFiles.put(m, new HashMap<>());});
         for (String t: shaOverrides) {
             String trimmed = t.trim();
             if (trimmed.startsWith("#")) {
@@ -518,12 +516,8 @@ private Map<String, Map<String, Set<String>>> buildShaSumMap(ModuleFinder finder
             //    <module-name>
             //    <file-path>
             //    <SHA-512-sum>
-            Map<String, Set<String>> perModuleMap = moduleToFiles.get(tokens[0]);
-            if (perModuleMap == null) {
-                throw taskHelper.newBadArgs("err.sha.overrides.bad.module", tokens[0]);
-            }
-            // TreeSet to disallow null values
-            Set<String> shaSumsPerFile = perModuleMap.computeIfAbsent(tokens[1], k -> new TreeSet<>());
+            Map<String, Set<String>> perModuleMap = moduleToFiles.computeIfAbsent(tokens[0], k -> new HashMap<>());
+            Set<String> shaSumsPerFile = perModuleMap.computeIfAbsent(tokens[1], k -> new HashSet<>());
             shaSumsPerFile.add(tokens[2]);
         }
         return moduleToFiles;
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java
@@ -87,7 +87,8 @@ public static Archive newArchive(String module,
                               path,
                               !config.ignoreModifiedRuntime,
                               perModuleDiff,
-                              config.altHashSums.get(module),
+                              // Empty map if no alternative sha sums
+                              config.altHashSums.computeIfAbsent(module, k -> Map.of()),
                               taskHelper);
     }
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties
@@ -127,12 +127,12 @@ err.runtime.link.packaged.mods=This JDK has no packaged modules.\
 err.runtime.link.modified.file={0} has been modified
 err.runtime.link.patched.module=jlink does not support linking from the run-time image\
 \ when running on a patched runtime with --patch-module
+
 # Linking from the run-time image, SHA sum handling
 err.sha.overrides.multiple=option --sha-overrides does not allow @file and non-file combinations
-err.sha.overrides.fnf=File ''{0}'' not found that got passed with option --sha-overrides
 err.sha.overrides.freaderr=Error reading file ''{0}'' passed with option --sha-overrides
 err.sha.overrides.bad.format=Bad format in --sha-overrides. Token was {0}. Expected <module-name>|<file-path>|<sha-sum>
-err.sha.overrides.bad.module=Module {0} specified in --sha-overrides is not in the set of output modules
+
 err.no.module.path=--module-path option must be specified with --add-modules ALL-MODULE-PATH
 err.empty.module.path=No module found in module path ''{0}'' with --add-modules ALL-MODULE-PATH
 err.limit.modules=--limit-modules not allowed with --add-modules ALL-MODULE-PATH
diff --git a/test/jdk/tools/jlink/IntegrationTest.java b/test/jdk/tools/jlink/IntegrationTest.java
@@ -159,7 +159,7 @@ private static void test() throws Exception {
                 mods,
                 JlinkTask.limitFinder(JlinkTask.newModuleFinder(modulePaths), limits, mods),
                 linkFromRuntime,
-                false /* ignore modified runtime */,
+                null /* run-time image link config */,
                 false /* generate run-time image */);
 
         List<Plugin> lst = new ArrayList<>();

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ public static Archive newArchive(String module,`
`87`	`87`	`path,`
`88`	`88`	`!config.ignoreModifiedRuntime,`
`89`	`89`	`perModuleDiff,`
`90`		`- config.altHashSums.get(module),`
	`90`	`+ // Empty map if no alternative sha sums`
	`91`	`+ config.altHashSums.computeIfAbsent(module, k -> Map.of()),`
`91`	`92`	`taskHelper);`
`92`	`93`	`}`
`93`	`94`