Repro-compare fixes for jdk-25+ (#4308)

* Update repro_compare for jdk25

Signed-off-by: Andrew Leonard <[email protected]>

* Update repro_compare for jdk25

Signed-off-by: Andrew Leonard <[email protected]>

* jdk25u repro compare fixes

Signed-off-by: Andrew Leonard <[email protected]>

* jdk25u repro compare fixes

Signed-off-by: Andrew Leonard <[email protected]>

* jdk25u repro compare fixes

Signed-off-by: Andrew Leonard <[email protected]>

* jdk25u repro compare fixes

Signed-off-by: Andrew Leonard <[email protected]>

* jdk25u repro compare fixes

Signed-off-by: Andrew Leonard <[email protected]>

---------

Signed-off-by: Andrew Leonard <[email protected]>

Author: andrew-m-leonard

tooling/reproducible/repro_common.sh

@@ -79,6 +79,40 @@ function expandJDK() {
   rm -rf "${JDK_ROOT}_CP"
 }
 
+# Windows & Mac: jdk-25+ Jlink runtimelink files contain signed binary "hash" lines in fs_* runtimelink files
+#  - remove hashes of binaries and of lib/security/cacerts
+#  - sort files as they are not sorted
+function removeJlinkRuntimelinkHashes() {
+  local JDK_DIR="$1"
+  local OS="$2"
+
+  if [[ "$OS" =~ CYGWIN* ]] || [[ "$OS" =~ Darwin* ]]; then
+    extractedDir="${JDK_DIR}/lib/modules_extracted/jdk.jlink/jdk/tools/jlink/internal/runtimelink"
+    if [[ "$OS" =~ CYGWIN* ]]; then
+      extractedDir=$(cygpath -w $extractedDir)
+    fi
+
+    FILES=$(find "${extractedDir}" -type f -name "fs_*files")
+    for f in $FILES
+      do
+          # Remove the binary hashes
+          if [[ "$OS" =~ Darwin* ]]; then
+            sed -i "" -E 's/^([^|]+)\|([^|]+)\|[^|]+\|([^\.]+\.dylib$)/\1|\2||\3/g' "$f"
+            sed -i "" -E 's/^([^|]+)\|([^|]+)\|[^|]+\|(bin\/.*$)/\1|\2||\3/g' "$f"
+            sed -i "" -E 's/^([^|]+)\|([^|]+)\|[^|]+\|(lib\/security\/cacerts$)/\1|\2||\3/g' "$f"
+          else
+            sed -i -E 's/^([^|]+)\|([^|]+)\|[^|]+\|([^\.]+\.dll$)/\1|\2||\3/g' "$f"
+            sed -i -E 's/^([^|]+)\|([^|]+)\|[^|]+\|([^\.]+\.exe$)/\1|\2||\3/g' "$f"
+            sed -i -E 's/^([^|]+)\|([^|]+)\|[^|]+\|(lib\/security\/cacerts$)/\1|\2||\3/g' "$f"
+          fi
+
+          # Sort file content
+          sort "$f" > "$f.sorted"
+          rm "$f"
+      done
+  fi
+}
+
 # Process SystemModules classes to remove ModuleHashes$Builder differences due to Signatures
 #   1. javap
 #   2. search for line: // Method jdk/internal/module/ModuleHashes$Builder.hashForModule:(Ljava/lang/String;[B)Ljdk/internal/module/ModuleHashes$Builder;
@@ -90,7 +124,7 @@ function removeSystemModulesHashBuilderParams() {
   moduleHashesFunction="// Method jdk/internal/module/ModuleHashes\$Builder.hashForModule:(Ljava/lang/String;[B)Ljdk/internal/module/ModuleHashes\$Builder;"
   moduleString="// String "
   virtualFunction="invokevirtual"
-  systemModules="SystemModules\$0.class SystemModules\$all.class SystemModules\$default.class"
+  systemModules="SystemModules\$0.class SystemModules\$all.class SystemModules\$default.class SystemModules\$1.class SystemModules\$2.class SystemModules\$3.class SystemModules\$4.class SystemModules\$5.class"
   local JDK_DIR="$1"
   local OS="$2"
   local work_JDK="$3"
@@ -333,6 +367,8 @@ function removeGeneratedClasses() {
   if [[ "$OS" =~ CYGWIN* ]] || [[ "$OS" =~ Darwin* ]]; then
     rm -rf "$JDK_DIR/bin/server/classes.jsa"
     rm -rf "$JDK_DIR/bin/server/classes_nocoops.jsa"
+    rm -rf "$JDK_DIR/bin/server/classes_coh.jsa"
+    rm -rf "$JDK_DIR/bin/server/classes_nocoops_coh.jsa"
   fi
 }
 

tooling/reproducible/repro_compare.sh

@@ -64,7 +64,8 @@ do
   # release file build machine OS level and builds-scripts SHA can/will be different
   cleanTemurinBuildInfo "${JDK_DIR}"
 
-  if [[ "$OS" =~ CYGWIN* ]] || [[ "$OS" =~ Darwin* ]]; then 
+  if [[ "$OS" =~ CYGWIN* ]] || [[ "$OS" =~ Darwin* ]]; then
+    removeJlinkRuntimelinkHashes "${JDK_DIR}" "${OS}"
     removeSystemModulesHashBuilderParams "${JDK_DIR}" "${OS}" "${BK_JDK_DIR}"
     processModuleInfo "${JDK_DIR}" "${OS}" "${BK_JDK_DIR}"
   fi