Do not check for switch loops that also may happen in the wild

MarcMil · Oct 19, 2024 · e105f6a · e105f6a
1 parent 72b7640
commit e105f6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/soot/dexpler/DexBody.java b/src/main/java/soot/dexpler/DexBody.java
@@ -141,6 +141,7 @@
 import soot.jimple.toolkits.scalar.NopEliminator;
 import soot.jimple.toolkits.scalar.UnconditionalBranchFolder;
 import soot.jimple.toolkits.scalar.UnreachableCodeEliminator;
+import soot.jimple.toolkits.typing.fast.BottomType;
 import soot.jimple.toolkits.typing.fast.DefaultTypingStrategy;
 import soot.jimple.toolkits.typing.fast.ITypingStrategy;
 import soot.jimple.toolkits.typing.fast.TypePromotionUseVisitor;
@@ -1091,7 +1092,7 @@ public Value visit(Value op, Type useType, Stmt stmt, boolean checkOnly) {
     //
     for (Local l : jBody.getLocals()) {
       Type t = l.getType();
-      if (t instanceof NullType) {
+      if (t instanceof NullType || t instanceof BottomType) {
         l.setType(objectType);
       }
     }

diff --git a/src/main/java/soot/toDex/StmtVisitor.java b/src/main/java/soot/toDex/StmtVisitor.java
@@ -784,9 +784,6 @@ public void caseLookupSwitchStmt(LookupSwitchStmt stmt) {
     // create sparse-switch instruction that references the payload
     Value key = stmt.getKey();
     Stmt defaultTarget = (Stmt) stmt.getDefaultTarget();
-    if (defaultTarget == stmt) {
-      throw new RuntimeException("Looping switch block detected");
-    }
     addInsn(buildSwitchInsn(Opcode.SPARSE_SWITCH, key, defaultTarget, payload, stmt), stmt);
   }