bump asm lib to fix bug with DUP_X2

narumii · Sep 10, 2024 · e155334 · e155334
1 parent f607aa4
commit e155334
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/deobfuscator-api/pom.xml b/deobfuscator-api/pom.xml
@@ -15,8 +15,28 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <!-- Snapshot -->
+        <asm.version>9.8-20240908.112439-20</asm.version>
+
+        <log4j.version>2.23.1</log4j.version>
+        <slf4j.version>2.0.13</slf4j.version>
+        <kafedjud.version>1.10.2</kafedjud.version>
+        <ssvm.version>d559ea90bb</ssvm.version>
+        <jlinker.version>205d8eaa1f</jlinker.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <repository>
+            <id>ow2-repo</id>
+            <url>https://repository.ow2.org/nexus/content/repositories/snapshots</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>com.github.xxDark</groupId>

diff --git a/deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/asm/InstructionContext.java b/deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/asm/InstructionContext.java
@@ -31,7 +31,7 @@ public MethodNode methodNode() {
   }
 
   /**
-   * Pops current instruction by adding POP instruction before this instruction
+   * Pops current instruction's stack values by adding POP instructions before this instruction
    *
    * @param count Stack values count to pop
    */

diff --git a/...va/uwu/narumi/deobfuscator/core/other/impl/clean/peephole/UselessPopCleanTransformer.java b/...va/uwu/narumi/deobfuscator/core/other/impl/clean/peephole/UselessPopCleanTransformer.java
@@ -67,7 +67,6 @@ private boolean isSourceValueRemovable(OriginalSourceValue sourceValue) {
     }
     if (!sourceValue.getChildren().isEmpty()) {
       // Other source values depends on this source value
-      // Also there is a small bug https://gitlab.ow2.org/asm/asm/-/merge_requests/414
       return false;
     }
 

diff --git a/pom.xml b/pom.xml
@@ -23,22 +23,8 @@
 
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-
-    <asm.version>9.7</asm.version>
-    <log4j.version>2.23.1</log4j.version>
-    <slf4j.version>2.0.13</slf4j.version>
-    <kafedjud.version>1.10.2</kafedjud.version>
-    <ssvm.version>d559ea90bb</ssvm.version>
-    <jlinker.version>205d8eaa1f</jlinker.version>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>jitpack.io</id>
-      <url>https://jitpack.io</url>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.jetbrains</groupId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ public MethodNode methodNode() { @@
       }
       /**
-       * Pops current instruction by adding POP instruction before this instruction
+       * Pops current instruction's stack values by adding POP instructions before this instruction
        *
        * @param count Stack values count to pop
        */
@@ Expand Down @@