8353917: jnativescan: Simplify ClassResolver

Reviewed-by: mcimadamore

Author: JornVernee

src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/ClassFileSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
@@ -27,6 +27,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
 import java.lang.module.ModuleReader;
 import java.lang.module.ModuleReference;
 import java.net.URI;
@@ -40,7 +42,12 @@ sealed interface ClassFileSource {
     String moduleName();
     Path path();
 
-    Stream<byte[]> classFiles(Runtime.Version version) throws IOException;
+    Stream<byte[]> classFiles() throws IOException;
+
+    default Stream<ClassModel> classModels() throws IOException {
+        ClassFile classFile = ClassFile.of();
+        return classFiles().map(classFile::parse);
+    }
 
     record Module(ModuleReference reference) implements ClassFileSource {
         @Override
@@ -55,7 +62,7 @@ public Path path() {
         }
 
         @Override
-        public Stream<byte[]> classFiles(Runtime.Version version) throws IOException {
+        public Stream<byte[]> classFiles() throws IOException {
             ModuleReader reader = reference().open();
             return reader.list()
                 .filter(resourceName -> resourceName.endsWith(".class"))
@@ -75,14 +82,14 @@ public Stream<byte[]> classFiles(Runtime.Version version) throws IOException {
         }
     }
 
-    record ClassPathJar(Path path) implements ClassFileSource {
+    record ClassPathJar(Path path, Runtime.Version version) implements ClassFileSource {
         @Override
         public String moduleName() {
             return "ALL-UNNAMED";
         }
 
         @Override
-        public Stream<byte[]> classFiles(Runtime.Version version) throws IOException {
+        public Stream<byte[]> classFiles() throws IOException {
             JarFile jf = new JarFile(path().toFile(), false, ZipFile.OPEN_READ, version);
             return jf.versionedStream()
                 .filter(je -> je.getName().endsWith(".class"))
@@ -109,7 +116,7 @@ public String moduleName() {
         }
 
         @Override
-        public Stream<byte[]> classFiles(Runtime.Version version) throws IOException {
+        public Stream<byte[]> classFiles() throws IOException {
             return Files.walk(path)
                 .filter(file -> Files.isRegularFile(file) && file.toString().endsWith(".class"))
                 .map(file -> {

src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/ClassResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
@@ -26,17 +26,18 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.lang.classfile.ClassModel;
 import java.lang.constant.ClassDesc;
 import java.lang.module.Configuration;
 import java.lang.module.ModuleFinder;
 import java.lang.module.ResolvedModule;
-import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.zip.ZipFile;
 
 class JNativeScanTask {
@@ -76,11 +77,26 @@ public void run() throws JNativeScanFatalError {
         Set<String> errors = new LinkedHashSet<>();
         Diagnostics diagnostics = (context, error) ->
                 errors.add("Error while processing method: " + context + ": " + error.getMessage());
-        SortedMap<ClassFileSource, SortedMap<ClassDesc, List<RestrictedUse>>> allRestrictedMethods;
-        try(ClassResolver classesToScan = ClassResolver.forClassFileSources(toScan, version);
-            ClassResolver systemClassResolver = ClassResolver.forSystemModules(version)) {
-            NativeMethodFinder finder = NativeMethodFinder.create(diagnostics, classesToScan, systemClassResolver);
-            allRestrictedMethods = finder.findAll();
+        SortedMap<ClassFileSource, SortedMap<ClassDesc, List<RestrictedUse>>> allRestrictedMethods
+                = new TreeMap<>(Comparator.comparing(ClassFileSource::path));
+        try(SystemClassResolver systemClassResolver = SystemClassResolver.forRuntimeVersion(version)) {
+            NativeMethodFinder finder = NativeMethodFinder.create(diagnostics, systemClassResolver);
+
+            for (ClassFileSource source : toScan) {
+                SortedMap<ClassDesc, List<RestrictedUse>> perClass
+                        = new TreeMap<>(Comparator.comparing(JNativeScanTask::qualName));
+                try (Stream<ClassModel> stream = source.classModels()) {
+                    stream.forEach(classModel -> {
+                        List<RestrictedUse> restrictedUses = finder.find(classModel);
+                        if (!restrictedUses.isEmpty()) {
+                            perClass.put(classModel.thisClass().asSymbol(), restrictedUses);
+                        }
+                    });
+                }
+                if (!perClass.isEmpty()) {
+                    allRestrictedMethods.put(source, perClass);
+                }
+            }
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -115,7 +131,7 @@ private List<ClassFileSource> findAllClassPathJars() throws JNativeScanFatalErro
                             jarsToScan.offer(otherJar);
                         }
                     }
-                    result.add(new ClassFileSource.ClassPathJar(jar));
+                    result.add(new ClassFileSource.ClassPathJar(jar, version));
                 }
             } else if (Files.isDirectory(path)) {
                 result.add(new ClassFileSource.ClassPathDirectory(path));