corrected DAE, modify pom

soot-oss · Sep 13, 2024 · d23c92f · d23c92f
1 parent 23cd80b
commit d23c92f
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 72 deletions.
diff --git a/pom.xml b/pom.xml
@@ -412,7 +412,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.13</version>
+            <version>${slf4j-simple.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- adds `@Nullable` and `@Nonnull` annotations -->

diff --git a/shared-test-resources/bugfixes/DeadAssignmentEliminatorTest.class b/shared-test-resources/bugfixes/DeadAssignmentEliminatorTest.class
diff --git a/shared-test-resources/bugfixes/DeadAssignmentEliminatorTest.java b/shared-test-resources/bugfixes/DeadAssignmentEliminatorTest.java
@@ -0,0 +1,16 @@
+public class DeadAssignmentEliminatorTest {
+    void tc1() {
+        int x = 10;
+        x = 30;
+        int temp = x;
+        if (temp > 5) {
+            x = 40;
+            System.out.println(x);
+            temp = temp;
+        }
+        System.out.println(x);
+        x = 20;
+        temp = 30;
+        System.out.println(temp);
+    }
+}
diff --git a/sootup.analysis.intraprocedural/pom.xml b/sootup.analysis.intraprocedural/pom.xml
@@ -17,11 +17,6 @@
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.bytecode.frontend</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.java.sourcecode.frontend</artifactId>

diff --git a/sootup.apk.frontend/pom.xml b/sootup.apk.frontend/pom.xml
@@ -19,15 +19,9 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.core</artifactId>
-            <version>1.3.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.java.core</artifactId>
-            <version>1.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.smali</groupId>

diff --git a/sootup.codepropertygraph/pom.xml b/sootup.codepropertygraph/pom.xml
@@ -20,11 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.core</artifactId>
+            <artifactId>sootup.analysis.interprocedural</artifactId>
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>

diff --git a/sootup.examples/pom.xml b/sootup.examples/pom.xml
@@ -16,14 +16,6 @@
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.callgraph</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.java.bytecode.frontend</artifactId>

diff --git a/sootup.interceptors/pom.xml b/sootup.interceptors/pom.xml
@@ -24,6 +24,10 @@
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.java.core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.soot-oss</groupId>
+            <artifactId>sootup.analysis.intraprocedural</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/sootup.interceptors/src/main/java/sootup/interceptors/DeadAssignmentEliminator.java b/sootup.interceptors/src/main/java/sootup/interceptors/DeadAssignmentEliminator.java
@@ -22,7 +22,9 @@
  */
 
 import java.util.*;
+import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
+import sootup.analysis.intraprocedural.reachingdefs.ReachingDefs;
 import sootup.core.graph.MutableStmtGraph;
 import sootup.core.jimple.Jimple;
 import sootup.core.jimple.basic.LValue;
@@ -63,6 +65,7 @@ public DeadAssignmentEliminator(boolean eliminateOnlyStackLocals) {
   @Override
   public void interceptBody(@Nonnull Body.BodyBuilder builder, @Nonnull View view) {
     MutableStmtGraph stmtGraph = builder.getStmtGraph();
+    Map<Stmt, List<Stmt>> reachingDefs = (new ReachingDefs(stmtGraph)).getReachingDefs();
     // refactor.. why already here - getNodes as well
     List<Stmt> stmts = builder.getStmts();
     Deque<Stmt> deque = new ArrayDeque<>(stmts.size());
@@ -84,7 +87,6 @@ public void interceptBody(@Nonnull Body.BodyBuilder builder, @Nonnull View view)
 
         // Stmt is of the form a = a which is useless
         if (lhs == rhs && lhs instanceof Local) {
-          iterator.remove();
           continue;
         }
 
@@ -185,6 +187,8 @@ public void interceptBody(@Nonnull Body.BodyBuilder builder, @Nonnull View view)
           if (value instanceof Local) {
             Local local = (Local) value;
             Collection<Stmt> defs = allDefs.get(local);
+            List<Stmt> reachableDefs = reachingDefs.get(stmt);
+            defs = defs.stream().filter(reachableDefs::contains).collect(Collectors.toList());
             if (defs != null) {
               deque.addAll(defs);
             }

diff --git a/sootup.java.bytecode.frontend/pom.xml b/sootup.java.bytecode.frontend/pom.xml
@@ -13,14 +13,6 @@
 	</parent>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.soot-oss</groupId>
-			<artifactId>sootup.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.soot-oss</groupId>
-			<artifactId>sootup.java.core</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.soot-oss</groupId>
 			<artifactId>sootup.interceptors</artifactId>
@@ -61,6 +53,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

diff --git a/...rc/test/java/sootup/java/bytecode/frontend/interceptors/DeadAssignmentEliminatorTest.java b/...rc/test/java/sootup/java/bytecode/frontend/interceptors/DeadAssignmentEliminatorTest.java
@@ -1,12 +1,18 @@
 package sootup.java.bytecode.frontend.interceptors;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import sootup.core.graph.MutableStmtGraph;
 import sootup.core.graph.StmtGraph;
+import sootup.core.inputlocation.AnalysisInputLocation;
 import sootup.core.jimple.basic.Local;
 import sootup.core.jimple.basic.NoPositionInformation;
 import sootup.core.jimple.basic.StmtPositionInfo;
@@ -16,8 +22,12 @@
 import sootup.core.jimple.common.stmt.JIfStmt;
 import sootup.core.jimple.common.stmt.Stmt;
 import sootup.core.model.Body;
+import sootup.core.model.SourceType;
+import sootup.core.signatures.MethodSignature;
 import sootup.core.types.PrimitiveType;
+import sootup.core.util.Utils;
 import sootup.interceptors.DeadAssignmentEliminator;
+import sootup.java.bytecode.frontend.inputlocation.PathBasedAnalysisInputLocation;
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.language.JavaJimple;
 import sootup.java.core.types.JavaClassType;
@@ -26,6 +36,9 @@
 @Tag("Java8")
 public class DeadAssignmentEliminatorTest {
 
+  Path classFilePath =
+      Paths.get("../shared-test-resources/bugfixes/DeadAssignmentEliminatorTest.class");
+
   /**
    *
    *
@@ -156,4 +169,42 @@ private static Body.BodyBuilder createBody(boolean essentialOption) {
 
     return builder;
   }
+
+  @Test
+  public void testDeadAssignmentEliminator() {
+    AnalysisInputLocation inputLocation =
+        new PathBasedAnalysisInputLocation.ClassFileBasedAnalysisInputLocation(
+            classFilePath,
+            "",
+            SourceType.Application,
+            Collections.singletonList(new DeadAssignmentEliminator()));
+    JavaView view = new JavaView(Collections.singletonList(inputLocation));
+
+    final MethodSignature methodSignature =
+        view.getIdentifierFactory()
+            .getMethodSignature(
+                "DeadAssignmentEliminatorTest", "tc1", "void", Collections.emptyList());
+    Body body = view.getMethod(methodSignature).get().getBody();
+    assertFalse(body.getStmts().isEmpty());
+    assertEquals(
+        Stream.of(
+                "DeadAssignmentEliminatorTest this",
+                "unknown $stack3, $stack4, $stack5",
+                "this := @this: DeadAssignmentEliminatorTest",
+                "l1 = 30",
+                "l2 = l1",
+                "if l2 <= 5 goto label1",
+                "l1 = 40",
+                "$stack5 = <java.lang.System: java.io.PrintStream out>",
+                "virtualinvoke $stack5.<java.io.PrintStream: void println(int)>(l1)",
+                "label1:",
+                "$stack3 = <java.lang.System: java.io.PrintStream out>",
+                "virtualinvoke $stack3.<java.io.PrintStream: void println(int)>(l1)",
+                "l2 = 30",
+                "$stack4 = <java.lang.System: java.io.PrintStream out>",
+                "virtualinvoke $stack4.<java.io.PrintStream: void println(int)>(l2)",
+                "return")
+            .collect(Collectors.toList()),
+        Utils.filterJimple(body.toString()));
+  }
 }
diff --git a/sootup.java.sourcecode.frontend/pom.xml b/sootup.java.sourcecode.frontend/pom.xml
@@ -66,10 +66,6 @@
 	</dependencyManagement>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.soot-oss</groupId>
-			<artifactId>sootup.core</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.soot-oss</groupId>
 			<artifactId>sootup.java.core</artifactId>

diff --git a/sootup.jimple.frontend/pom.xml b/sootup.jimple.frontend/pom.xml
@@ -46,16 +46,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.sourcecode.frontend</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.java.core</artifactId>

diff --git a/sootup.qilin/pom.xml b/sootup.qilin/pom.xml
@@ -14,14 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.java.bytecode.frontend</artifactId>

diff --git a/sootup.tests/pom.xml b/sootup.tests/pom.xml
@@ -14,33 +14,20 @@
 	</parent>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.soot-oss</groupId>
-			<artifactId>sootup.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.soot-oss</groupId>
-			<artifactId>sootup.java.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.soot-oss</groupId>
-			<artifactId>sootup.interceptors</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.soot-oss</groupId>
 			<artifactId>sootup.java.bytecode.frontend</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.soot-oss</groupId>
-			<artifactId>sootup.java.sourcecode.frontend</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.soot-oss</groupId>
 			<artifactId>sootup.jimple.frontend</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.soot-oss</groupId>
 			<artifactId>sootup.callgraph</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>