Merge branch 'develop'

unimined · Aug 10, 2024 · fe48bb4 · fe48bb4
2 parents e668a0d + 1eba37b
commit fe48bb4
Show file tree

Hide file tree

Showing 14 changed files with 690 additions and 202 deletions.
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=1.0.1
+version=1.1.0
 
 asm_version=9.7
 

diff --git a/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_U_R_RandomGenerator.java b/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_U_R_RandomGenerator.java
@@ -46,77 +46,77 @@ static boolean isDeprecated(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).isDeprecated();
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static DoubleStream doubles(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).doubles();
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static DoubleStream doubles(@Coerce(J_U_R_RandomGenerator.class) Object obj, double lower, double upper) {
         return jvmdg$checkcast(obj).doubles(lower, upper);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static DoubleStream doubles(@Coerce(J_U_R_RandomGenerator.class) Object obj, long limit) {
         return jvmdg$checkcast(obj).doubles(limit);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static DoubleStream doubles(@Coerce(J_U_R_RandomGenerator.class) Object obj, long limit, double origin, double bound) {
         return jvmdg$checkcast(obj).doubles(limit, origin, bound);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static IntStream ints(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).ints();
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static IntStream ints(@Coerce(J_U_R_RandomGenerator.class) Object obj, int origin, int bound) {
         return jvmdg$checkcast(obj).ints(origin, bound);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static IntStream ints(@Coerce(J_U_R_RandomGenerator.class) Object obj, long limit) {
         return jvmdg$checkcast(obj).ints(limit);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static IntStream ints(@Coerce(J_U_R_RandomGenerator.class) Object obj, long limit, int origin, int bound) {
         return jvmdg$checkcast(obj).ints(limit, origin, bound);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static LongStream longs(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).longs();
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static LongStream longs(@Coerce(J_U_R_RandomGenerator.class) Object obj, long origin, long bound) {
         return jvmdg$checkcast(obj).longs(origin, bound);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static LongStream longs(@Coerce(J_U_R_RandomGenerator.class) Object obj, long limit) {
         return jvmdg$checkcast(obj).longs(limit);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static LongStream longs(@Coerce(J_U_R_RandomGenerator.class) Object obj, long limit, long origin, long bound) {
         return jvmdg$checkcast(obj).longs(limit, origin, bound);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static boolean nextBoolean(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).nextBoolean();
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static void nextBytes(@Coerce(J_U_R_RandomGenerator.class) Object obj, byte[] bytes) {
         jvmdg$checkcast(obj).nextBytes(bytes);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static float nextFloat(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).nextFloat();
     }
@@ -131,7 +131,7 @@ static float nextFloat(@Coerce(J_U_R_RandomGenerator.class) Object obj, float or
         return jvmdg$checkcast(obj).nextFloat(origin, bound);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static double nextDouble(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).nextDouble();
     }
@@ -146,12 +146,12 @@ static double nextDouble(@Coerce(J_U_R_RandomGenerator.class) Object obj, double
         return jvmdg$checkcast(obj).nextDouble(origin, bound);
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static int nextInt(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).nextInt();
     }
 
-    @Stub(noSpecial = true)
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
     static int nextInt(@Coerce(J_U_R_RandomGenerator.class) Object obj, int bound) {
         return jvmdg$checkcast(obj).nextInt(bound);
     }
@@ -161,33 +161,33 @@ static int nextInt(@Coerce(J_U_R_RandomGenerator.class) Object obj, int origin,
         return jvmdg$checkcast(obj).nextInt(origin, bound);
     }
 
-    @Stub(noSpecial = true)
-    static long nextLong(@Coerce(J_U_Random.class) Object obj) {
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
+    static long nextLong(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).nextLong();
     }
 
     @Stub(noSpecial = true)
-    static long nextLong(@Coerce(J_U_Random.class) Object obj, long bound) {
+    static long nextLong(@Coerce(J_U_R_RandomGenerator.class) Object obj, long bound) {
         return jvmdg$checkcast(obj).nextLong(bound);
     }
 
     @Stub(noSpecial = true)
-    static long nextLong(@Coerce(J_U_Random.class) Object obj, long origin, long bound) {
+    static long nextLong(@Coerce(J_U_R_RandomGenerator.class) Object obj, long origin, long bound) {
         return jvmdg$checkcast(obj).nextLong(origin, bound);
     }
 
-    @Stub(noSpecial = true)
-    static double nextGaussian(@Coerce(J_U_Random.class) Object obj) {
+    @Stub(noSpecial = true, excludeChild = "java/util/Random")
+    static double nextGaussian(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).nextGaussian();
     }
 
     @Stub(noSpecial = true)
-    static double nextGaussian(@Coerce(J_U_Random.class) Object obj, double mean, double stdDev) {
+    static double nextGaussian(@Coerce(J_U_R_RandomGenerator.class) Object obj, double mean, double stdDev) {
         return jvmdg$checkcast(obj).nextGaussian(mean, stdDev);
     }
 
     @Stub(noSpecial = true)
-    static double nextExponential(@Coerce(J_U_Random.class) Object obj) {
+    static double nextExponential(@Coerce(J_U_R_RandomGenerator.class) Object obj) {
         return jvmdg$checkcast(obj).nextExponential();
     }
 

diff --git a/src/main/java/xyz/wagyourtail/jvmdg/ClassDowngrader.java b/src/main/java/xyz/wagyourtail/jvmdg/ClassDowngrader.java
@@ -5,7 +5,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.VisibleForTesting;
 import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;
@@ -250,9 +253,25 @@ protected Set<ClassNode> downgrade(ClassNode clazz, boolean enableRuntime, Funct
             version = downgrader.outputVersion;
             if (flags.multiReleaseVersions.contains(version)) {
                 // copy to new class node
-                ClassNode multiRelease = new ClassNode();
-                clazz.accept(multiRelease);
-                multiReleaseHolder.add(multiRelease);
+                for (ClassNode c : classes) {
+                    ClassNode copy = new ClassNode();
+                    c.accept(new ClassVisitor(Opcodes.ASM9, copy) {
+                        @Override
+                        public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+                            return new MethodVisitor(api, super.visitMethod(access, name, descriptor, signature, exceptions)) {
+
+                                @Override
+                                public void visitInvokeDynamicInsn(String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) {
+                                    // copy bsm args
+                                    Object[] copy = new Object[bootstrapMethodArguments.length];
+                                    System.arraycopy(bootstrapMethodArguments, 0, copy, 0, bootstrapMethodArguments.length);
+                                    super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, copy);
+                                }
+                            };
+                        }
+                    });
+                    multiReleaseHolder.add(copy);
+                }
             }
         }
         multiReleaseHolder.addAll(classes);

diff --git a/src/main/java/xyz/wagyourtail/jvmdg/cli/Flags.java b/src/main/java/xyz/wagyourtail/jvmdg/cli/Flags.java
@@ -24,6 +24,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 
@@ -145,9 +146,25 @@ public String toString() {
                 ", printDebug=" + printDebug +
                 ", debugSkipStubs=" + debugSkipStubs +
                 ", ignoreWarningsIn=" + ignoreWarningsIn +
+                ", debugDumpClasses=" + debugDumpClasses +
+                ", multiReleaseOriginal=" + multiReleaseOriginal +
+                ", multiReleaseVersions=" + multiReleaseVersions +
                 '}';
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Flags)) return false;
+        Flags flags = (Flags) o;
+        return classVersion == flags.classVersion && quiet == flags.quiet && logAnsiColors == flags.logAnsiColors && allowMaven == flags.allowMaven && printDebug == flags.printDebug && debugDumpClasses == flags.debugDumpClasses && multiReleaseOriginal == flags.multiReleaseOriginal && Objects.equals(api, flags.api) && logLevel == flags.logLevel && Objects.equals(ignoreWarningsIn, flags.ignoreWarningsIn) && Objects.equals(debugSkipStubs, flags.debugSkipStubs) && Objects.equals(multiReleaseVersions, flags.multiReleaseVersions);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(classVersion, api, quiet, logAnsiColors, logLevel, ignoreWarningsIn, allowMaven, printDebug, debugSkipStubs, debugDumpClasses, multiReleaseOriginal, multiReleaseVersions);
+    }
+
     public void addIgnore(String s) {
         if (s.endsWith("**")) {
             ignoreWarningsIn.put(s.substring(0, s.length() - 2), WildcardType.DOUBLE);