Address MR comments

soot-oss · Oct 18, 2024 · f73bb6a · f73bb6a
1 parent 575f098
commit f73bb6a
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 210 deletions.
diff --git a/src/main/java/soot/dexpler/DexBody.java b/src/main/java/soot/dexpler/DexBody.java
@@ -812,10 +812,8 @@ public Body jimplify(Body b, SootMethod m) {
     Map<Local, Collection<Type>> definiteConstraints = new HashMap<>();
     for (Local l : b.getLocals()) {
       Type type = l.getType();
-      if (!(type instanceof UnknownType)) {
-        if (type instanceof PrimType) {
-          definiteConstraints.put(l, Collections.singleton(type));
-        }
+      if (type instanceof PrimType) {
+        definiteConstraints.put(l, Collections.singleton(type));
       }
     }
 

diff --git a/src/main/java/soot/dexpler/tags/BooleanOpTag.java b/src/main/java/soot/dexpler/tags/BooleanOpTag.java
@@ -22,29 +22,6 @@
 
 import soot.BooleanType;
 import soot.Type;
-
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 1997 - 2018 Raja Vallée-Rai and others
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-
 import soot.tagkit.Tag;
 
 public class BooleanOpTag implements Tag, DexplerTag {

diff --git a/src/main/java/soot/dexpler/tags/ByteOpTag.java b/src/main/java/soot/dexpler/tags/ByteOpTag.java
@@ -22,29 +22,6 @@
 
 import soot.ByteType;
 import soot.Type;
-
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 1997 - 2018 Raja Vallée-Rai and others
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-
 import soot.tagkit.Tag;
 
 public class ByteOpTag implements Tag, DexplerTag {

diff --git a/src/main/java/soot/dexpler/tags/CharOpTag.java b/src/main/java/soot/dexpler/tags/CharOpTag.java
@@ -22,29 +22,6 @@
 
 import soot.CharType;
 import soot.Type;
-
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 1997 - 2018 Raja Vallée-Rai and others
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-
 import soot.tagkit.Tag;
 
 public class CharOpTag implements Tag, DexplerTag {

diff --git a/src/main/java/soot/dexpler/tags/DoubleOpTag.java b/src/main/java/soot/dexpler/tags/DoubleOpTag.java
@@ -22,29 +22,6 @@
 
 import soot.DoubleType;
 import soot.Type;
-
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 1997 - 2018 Raja Vallée-Rai and others
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-
 import soot.tagkit.Tag;
 
 public class DoubleOpTag implements Tag, DexplerTag {

diff --git a/src/main/java/soot/dexpler/tags/FloatOpTag.java b/src/main/java/soot/dexpler/tags/FloatOpTag.java
@@ -22,29 +22,6 @@
 
 import soot.FloatType;
 import soot.Type;
-
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 1997 - 2018 Raja Vallée-Rai and others
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-
 import soot.tagkit.Tag;
 
 public class FloatOpTag implements Tag, DexplerTag {

diff --git a/src/main/java/soot/dexpler/tags/IntOpTag.java b/src/main/java/soot/dexpler/tags/IntOpTag.java
@@ -22,29 +22,6 @@
 
 import soot.IntType;
 import soot.Type;
-
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 1997 - 2018 Raja Vallée-Rai and others
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-
 import soot.tagkit.Tag;
 
 public class IntOpTag implements Tag, DexplerTag {

diff --git a/src/main/java/soot/dexpler/tags/IntOrFloatOpTag.java b/src/main/java/soot/dexpler/tags/IntOrFloatOpTag.java
@@ -20,28 +20,6 @@
 
 package soot.dexpler.tags;
 
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 1997 - 2018 Raja Vallée-Rai and others
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-
 import soot.tagkit.Tag;
 
 public class IntOrFloatOpTag implements Tag, DexplerTag {

diff --git a/src/main/java/soot/dexpler/tags/LongOpTag.java b/src/main/java/soot/dexpler/tags/LongOpTag.java
@@ -22,29 +22,6 @@
 
 import soot.LongType;
 import soot.Type;
-
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 1997 - 2018 Raja Vallée-Rai and others
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-
 import soot.tagkit.Tag;
 
 public class LongOpTag implements Tag, DexplerTag {

diff --git a/src/main/java/soot/dexpler/tags/ShortOpTag.java b/src/main/java/soot/dexpler/tags/ShortOpTag.java
@@ -22,29 +22,6 @@
 
 import soot.ShortType;
 import soot.Type;
-
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 1997 - 2018 Raja Vallée-Rai and others
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-
 import soot.tagkit.Tag;
 
 public class ShortOpTag implements Tag, DexplerTag {