fix erroneous missing stub warnings

unimined · Jul 8, 2024 · 9b35b61 · 9b35b61
1 parent 9113f54
commit 9b35b61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/buildSrc/src/main/kotlin/xyz/wagyourtail/gradle/ctsym/GenerateCtSymTask.kt b/buildSrc/src/main/kotlin/xyz/wagyourtail/gradle/ctsym/GenerateCtSymTask.kt
@@ -81,7 +81,6 @@ abstract class GenerateCtSymTask : ConventionTask() {
                 project.logger.lifecycle("[ct.sym] Processing $java at $home")
                 for (path in home.walk()
                     .filter { it.exists() && it.isRegularFile() && it.extension in setOf("jar", "jmod") }) {
-                    if (path.extension == "jar" && path.nameWithoutExtension != "rt") continue
                     // for each jar/jmod list its contents
                     project.logger.info("[ct.sym]   Found ${path.fileName}")
                     val modName = path.fileName.toString().removeSuffix(".jmod")

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 
-version=0.8.1
+version=0.8.2
 
 asm_version=9.7
 
@@ -16,4 +16,4 @@ stubFromVersion=8
 stubToVersion=22
 
 maven_group=xyz.wagyourtail.jvmdowngrader
-archives_base_name=jvmdowngrader
+archives_base_name=jvmdowngrader
diff --git a/src/main/java/xyz/wagyourtail/jvmdg/version/map/ClassMapping.java b/src/main/java/xyz/wagyourtail/jvmdg/version/map/ClassMapping.java
@@ -79,14 +79,16 @@ public void addModify(MemberNameAndDesc member, Method method, Modify modify) {
         methodModify.put(member, new Pair<>(method, modify));
     }
 
-    public void warnMember(MemberNameAndDesc member, Set<String> warnings) {
+    public void warnMember(MemberNameAndDesc member, Set<String> warnings, boolean invoke_static) {
         FullyQualifiedMemberNameAndDesc fqn = member.toFullyQualified(current);
         String mod = coverage.checkMember(fqn);
         if (mod != null) {
             coverage.warnMember(fqn, warnings);
         }
-        for (ClassMapping parent : parents.get()) {
-            parent.warnMember(member, warnings);
+        if (!invoke_static && !member.getName().equals("<init>")) {
+            for (ClassMapping parent : parents.get()) {
+                parent.warnMember(member, warnings, false);
+            }
         }
     }
 
@@ -205,7 +207,7 @@ public Pair<Method, Stub> getStubFor(MemberNameAndDesc member, boolean invoke_st
                     }
                     return getParentStubFor(member, runtimeAvailable, special, warnings);
                 }
-                warnMember(member, warnings);
+                warnMember(member, warnings, invoke_static);
                 return null;
             }
             Method m = pair.getFirst();
@@ -246,7 +248,7 @@ public Pair<Method, Modify> getModifyFor(MemberNameAndDesc member, boolean invok
                     }
                     return getParentModifyFor(member, warnings);
                 }
-                warnMember(member, warnings);
+                warnMember(member, warnings, invoke_static);
                 return null;
             }
             Method m = pair.getFirst();