\n"
- listData=[]
- data=""
- regexMethod =re.compile( "(\w*)[(]((([a-zA-Z])*(\s+)([a-zA-Z]))*)(([,])(\s+)([a-zA-Z])*(\s+)([a-zA-Z])*)*[)]" )
- f= open(srcFile, 'r', encoding="utf8")
- print(srcFile)
- foundFlag=0
-
- for line in f.readlines():
- found=regexMethod.search(line)
- if found:
- foundFlag=1
- if '{' in line :
- ocb+=1
- if '}' in line:
- ccb+=1
- str+=line
- if found:
- continue
-
- if ocb >= 1 or foundFlag==1:
- if '{' in line :
- ocb+=1
- if '}' in line:
- ccb+=1
- if ocb>=ccb:
- str+=line
- if '}' in line and ocb == 1 :
- ocb=0
- exit
-
- str+="\n*/"
- var1=""
- srcFileName = (srcFile.rsplit('\\',1)[1]).split('.')[0]
-
- for filename in srcTestMatches:
- dummy=srcFileName+"Test"
- filenameDummy = (filename.rsplit('\\',1)[1]).split('.')[0]
- if dummy == filenameDummy:
- str2=""
- var1=""
- strSrcTest1=""
- strSrcTest2=""
- srcTestFile=filename
- str2= open(srcTestFile, 'r', encoding="utf8").read()
- for line in open(srcTestFile, 'r'):
- l_strip=line.strip()
- if " expectedBodyStmts()" in l_strip:
- break
- else:
- strSrcTest1+=line
- #print("Line added for "+srcTestFile+line)
-
- found= re.search(r' @Override(\s*)public List expectedBodyStmts((.+\s)*)}(\s*)((.+\s)*)}(\s*)',str2,re.DOTALL)
-
- if found != None:
- strSrcTest2= var1.rsplit("\n",3)[0]+str
- strSrcTest2+=found.group()
- New2= ""
- strSrcTestNew2 = "".join(strSrcTest1.rsplit('@Override', 1))
- #pdb.set_trace()
- strSrcTestNew2+=strSrcTest2
- #pdb.set_trace()
- with open(srcTestFile, 'w', encoding="utf8") as filew:
- filew.writelines(strSrcTestNew2)
- print("File write for file "+srcTestFile)
- else :
- print("No match for "+srcTestFile)
- dummy=""
diff --git a/sootup.core/src/main/java/sootup/core/BaseViewChangeListener.java b/sootup.core/src/main/java/sootup/core/BaseViewChangeListener.java
index 76d4baf64e2..83d12923b70 100644
--- a/sootup.core/src/main/java/sootup/core/BaseViewChangeListener.java
+++ b/sootup.core/src/main/java/sootup/core/BaseViewChangeListener.java
@@ -1,5 +1,27 @@
package sootup.core;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import sootup.core.model.SootClass;
import sootup.core.model.SootMethod;
diff --git a/sootup.core/src/main/java/sootup/core/IdentifierFactory.java b/sootup.core/src/main/java/sootup/core/IdentifierFactory.java
index 6814d56e6cd..ceb8c1256c9 100644
--- a/sootup.core/src/main/java/sootup/core/IdentifierFactory.java
+++ b/sootup.core/src/main/java/sootup/core/IdentifierFactory.java
@@ -22,7 +22,6 @@
* #L%
*/
-import java.nio.file.Path;
import java.util.List;
import java.util.Optional;
import javax.annotation.Nonnull;
@@ -245,17 +244,10 @@ FieldSignature getFieldSignature(
*/
ArrayType getArrayType(Type baseType, int dim);
- /**
- * Builds class type from path.
- *
- * @param file the file
- * @param rootDirectory root directory in which the file is.
- * @return the class type
- */
- ClassType fromPath(Path rootDirectory, Path file);
-
boolean isStaticInitializerSubSignature(@Nonnull MethodSubSignature methodSubSignature);
+ boolean isConstructorSignature(@Nonnull MethodSignature methodSignature);
+
boolean isConstructorSubSignature(@Nonnull MethodSubSignature methodSubSignature);
boolean isMainSubSignature(@Nonnull MethodSubSignature methodSubSignature);
diff --git a/sootup.core/src/main/java/sootup/core/SourceTypeSpecifier.java b/sootup.core/src/main/java/sootup/core/SourceTypeSpecifier.java
deleted file mode 100644
index 5887de096b9..00000000000
--- a/sootup.core/src/main/java/sootup/core/SourceTypeSpecifier.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package sootup.core;
-/*-
- * #%L
- * Soot
- * %%
- * Copyright (C) 2019-2020 Linghui Luo, Markus Schmidt
- * %%
- * 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
- * .
- * #L%
- */
-import javax.annotation.Nonnull;
-import sootup.core.frontend.AbstractClassSource;
-import sootup.core.model.SourceType;
-
-/**
- * @author Christian Brüggemann
- * @author Markus Schmidt
- */
-public interface SourceTypeSpecifier {
-
- /**
- * Specifies which {@link SourceType} a specific ClassType maps to.
- *
- * @param clsSource the type
- * @return the source type
- */
- @Nonnull
- SourceType sourceTypeFor(AbstractClassSource clsSource);
-}
diff --git a/sootup.core/src/main/java/sootup/core/ViewChangeListener.java b/sootup.core/src/main/java/sootup/core/ViewChangeListener.java
index a72c7d65418..7981fd96bf2 100644
--- a/sootup.core/src/main/java/sootup/core/ViewChangeListener.java
+++ b/sootup.core/src/main/java/sootup/core/ViewChangeListener.java
@@ -1,5 +1,27 @@
package sootup.core;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import sootup.core.model.SootClass;
import sootup.core.model.SootMethod;
diff --git a/sootup.core/src/main/java/sootup/core/cache/ClassCache.java b/sootup.core/src/main/java/sootup/core/cache/ClassCache.java
index 7c7c85244d6..27674076559 100644
--- a/sootup.core/src/main/java/sootup/core/cache/ClassCache.java
+++ b/sootup.core/src/main/java/sootup/core/cache/ClassCache.java
@@ -1,5 +1,27 @@
package sootup.core.cache;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import java.util.Collection;
import javax.annotation.Nonnull;
import sootup.core.model.SootClass;
diff --git a/sootup.core/src/main/java/sootup/core/cache/FullCache.java b/sootup.core/src/main/java/sootup/core/cache/FullCache.java
index 658170d1b63..f1932077315 100644
--- a/sootup.core/src/main/java/sootup/core/cache/FullCache.java
+++ b/sootup.core/src/main/java/sootup/core/cache/FullCache.java
@@ -1,5 +1,27 @@
package sootup.core.cache;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
diff --git a/sootup.core/src/main/java/sootup/core/cache/LRUCache.java b/sootup.core/src/main/java/sootup/core/cache/LRUCache.java
index fbe5e7ea67a..44b7b053669 100644
--- a/sootup.core/src/main/java/sootup/core/cache/LRUCache.java
+++ b/sootup.core/src/main/java/sootup/core/cache/LRUCache.java
@@ -1,5 +1,27 @@
package sootup.core.cache;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import java.util.*;
import javax.annotation.Nonnull;
import sootup.core.model.SootClass;
diff --git a/sootup.core/src/main/java/sootup/core/cache/MutableClassCache.java b/sootup.core/src/main/java/sootup/core/cache/MutableClassCache.java
index 09b362ce5ea..c4d1435e1ca 100644
--- a/sootup.core/src/main/java/sootup/core/cache/MutableClassCache.java
+++ b/sootup.core/src/main/java/sootup/core/cache/MutableClassCache.java
@@ -1,5 +1,27 @@
package sootup.core.cache;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import javax.annotation.Nonnull;
import sootup.core.model.SootClass;
import sootup.core.types.ClassType;
diff --git a/sootup.core/src/main/java/sootup/core/cache/MutableFullCache.java b/sootup.core/src/main/java/sootup/core/cache/MutableFullCache.java
index 9fe303b9e62..e03b8512724 100644
--- a/sootup.core/src/main/java/sootup/core/cache/MutableFullCache.java
+++ b/sootup.core/src/main/java/sootup/core/cache/MutableFullCache.java
@@ -1,5 +1,27 @@
package sootup.core.cache;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import javax.annotation.Nonnull;
import sootup.core.model.SootClass;
import sootup.core.types.ClassType;
diff --git a/sootup.core/src/main/java/sootup/core/cache/provider/ClassCacheProvider.java b/sootup.core/src/main/java/sootup/core/cache/provider/ClassCacheProvider.java
index bba31e5a15a..2913ffeb500 100644
--- a/sootup.core/src/main/java/sootup/core/cache/provider/ClassCacheProvider.java
+++ b/sootup.core/src/main/java/sootup/core/cache/provider/ClassCacheProvider.java
@@ -1,5 +1,27 @@
package sootup.core.cache.provider;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import sootup.core.cache.ClassCache;
/** Interface for cache providers. */
diff --git a/sootup.core/src/main/java/sootup/core/cache/provider/FullCacheProvider.java b/sootup.core/src/main/java/sootup/core/cache/provider/FullCacheProvider.java
index c6bc63226d9..324aae8e346 100644
--- a/sootup.core/src/main/java/sootup/core/cache/provider/FullCacheProvider.java
+++ b/sootup.core/src/main/java/sootup/core/cache/provider/FullCacheProvider.java
@@ -1,5 +1,27 @@
package sootup.core.cache.provider;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import sootup.core.cache.ClassCache;
import sootup.core.cache.FullCache;
diff --git a/sootup.core/src/main/java/sootup/core/cache/provider/LRUCacheProvider.java b/sootup.core/src/main/java/sootup/core/cache/provider/LRUCacheProvider.java
index 762ff2153ac..e23adc4640d 100644
--- a/sootup.core/src/main/java/sootup/core/cache/provider/LRUCacheProvider.java
+++ b/sootup.core/src/main/java/sootup/core/cache/provider/LRUCacheProvider.java
@@ -1,5 +1,27 @@
package sootup.core.cache.provider;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import sootup.core.cache.ClassCache;
import sootup.core.cache.LRUCache;
diff --git a/sootup.core/src/main/java/sootup/core/cache/provider/MutableFullCacheProvider.java b/sootup.core/src/main/java/sootup/core/cache/provider/MutableFullCacheProvider.java
index f253e6e00f9..20123f81468 100644
--- a/sootup.core/src/main/java/sootup/core/cache/provider/MutableFullCacheProvider.java
+++ b/sootup.core/src/main/java/sootup/core/cache/provider/MutableFullCacheProvider.java
@@ -1,5 +1,27 @@
package sootup.core.cache.provider;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import sootup.core.cache.ClassCache;
import sootup.core.cache.MutableFullCache;
diff --git a/sootup.core/src/main/java/sootup/core/frontend/AbstractClassSource.java b/sootup.core/src/main/java/sootup/core/frontend/AbstractClassSource.java
index 4274e3fb227..3205dfd0f83 100644
--- a/sootup.core/src/main/java/sootup/core/frontend/AbstractClassSource.java
+++ b/sootup.core/src/main/java/sootup/core/frontend/AbstractClassSource.java
@@ -64,7 +64,7 @@ public ClassType getClassType() {
return classSignature;
}
- public AnalysisInputLocation getClassSource() {
+ public AnalysisInputLocation getAnalysisInputLocation() {
return classSource;
}
diff --git a/sootup.core/src/main/java/sootup/core/graph/BasicBlock.java b/sootup.core/src/main/java/sootup/core/graph/BasicBlock.java
index b27d188b2c3..c104a4110ce 100644
--- a/sootup.core/src/main/java/sootup/core/graph/BasicBlock.java
+++ b/sootup.core/src/main/java/sootup/core/graph/BasicBlock.java
@@ -1,5 +1,27 @@
package sootup.core.graph;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import java.util.List;
import java.util.Map;
import javax.annotation.Nonnull;
diff --git a/sootup.core/src/main/java/sootup/core/graph/ImmutableBasicBlock.java b/sootup.core/src/main/java/sootup/core/graph/ImmutableBasicBlock.java
index 2cb3c57a337..3a0ed109165 100644
--- a/sootup.core/src/main/java/sootup/core/graph/ImmutableBasicBlock.java
+++ b/sootup.core/src/main/java/sootup/core/graph/ImmutableBasicBlock.java
@@ -1,5 +1,27 @@
package sootup.core.graph;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import java.util.List;
import java.util.Map;
import javax.annotation.Nonnull;
diff --git a/sootup.core/src/main/java/sootup/core/graph/ImmutableBlockStmtGraph.java b/sootup.core/src/main/java/sootup/core/graph/ImmutableBlockStmtGraph.java
index 7354ca426d8..d49275e02c3 100644
--- a/sootup.core/src/main/java/sootup/core/graph/ImmutableBlockStmtGraph.java
+++ b/sootup.core/src/main/java/sootup/core/graph/ImmutableBlockStmtGraph.java
@@ -1,5 +1,27 @@
package sootup.core.graph;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import com.google.common.collect.Lists;
import java.util.*;
import javax.annotation.Nonnull;
diff --git a/sootup.core/src/main/java/sootup/core/graph/MutableBlockStmtGraph.java b/sootup.core/src/main/java/sootup/core/graph/MutableBlockStmtGraph.java
index aa961c2f61d..200801fd97d 100644
--- a/sootup.core/src/main/java/sootup/core/graph/MutableBlockStmtGraph.java
+++ b/sootup.core/src/main/java/sootup/core/graph/MutableBlockStmtGraph.java
@@ -1,5 +1,27 @@
package sootup.core.graph;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.Lists;
import java.util.*;
@@ -43,7 +65,7 @@ public MutableBlockStmtGraph(boolean isStatic, MethodSignature sig, LocalGenerat
Local thisLocal = localgen.generateThisLocal(thisType);
Stmt stmt =
Jimple.newIdentityStmt(
- thisLocal, Jimple.newThisRef(thisType), StmtPositionInfo.createNoStmtPositionInfo());
+ thisLocal, Jimple.newThisRef(thisType), StmtPositionInfo.getNoStmtPositionInfo());
stmts.add(stmt);
}
int i = 0;
@@ -52,7 +74,7 @@ public MutableBlockStmtGraph(boolean isStatic, MethodSignature sig, LocalGenerat
Jimple.newIdentityStmt(
localgen.generateParameterLocal(parameterType, i),
Jimple.newParameterRef(parameterType, i++),
- StmtPositionInfo.createNoStmtPositionInfo());
+ StmtPositionInfo.getNoStmtPositionInfo());
stmts.add(stmt);
}
if (!stmts.isEmpty()) {
@@ -95,6 +117,13 @@ public MutableBlockStmtGraph(@Nonnull StmtGraph> graph)
});
}
+ public static StmtGraph createUnmodifiableStmtGraph(StmtGraph stmtGraph) {
+ if (stmtGraph instanceof MutableStmtGraph) {
+ return ((MutableStmtGraph) stmtGraph).unmodifiableStmtGraph();
+ }
+ return stmtGraph;
+ }
+
/**
* Creates a Graph representation from the 'legacy' representation i.e. a List of Stmts and Traps.
*/
@@ -143,7 +172,7 @@ public void initializeWith(
*/
setStartingStmt(stmts.get(0));
Map exceptionToHandlerMap = new HashMap<>();
- Map currentTrapMap = new HashMap<>();
+ Map activeTrapMap = new HashMap<>();
Map> overlappingTraps = new HashMap<>();
Trap nextStartingTrap = trapStart.poll();
@@ -157,18 +186,22 @@ public void initializeWith(
nextEndingTrap = trapEnd.poll();
// endStmt is exclusive! -> trap ends before this stmt -> remove exception info here
final ClassType exceptionType = trap.getExceptionType();
- final boolean isRemoved = currentTrapMap.remove(exceptionType, trap);
+ final boolean isRemovedFromActive = activeTrapMap.remove(exceptionType, trap);
final PriorityQueue overridenTrapHandlers = overlappingTraps.get(exceptionType);
if (overridenTrapHandlers != null) {
- if (!isRemoved && !overridenTrapHandlers.isEmpty()) {
- // check if theres an overlapping trap that has a less specific TrapRange which is
+ // System.out.println("overlapping traps found");
+ if (isRemovedFromActive) {
+ // is there an overridden traprange that needs to take its place?
+ if (!overridenTrapHandlers.isEmpty()) {
+ // System.out.println("update activeTrapMap with next trap from overlaps");
+ activeTrapMap.put(exceptionType, overridenTrapHandlers.poll());
+ }
+ } else {
+ // check if there is an overlapping trap that has a less specific TrapRange which is
// ending before it gets the active exception information again
// not logical as a compiler output... but possible.
overridenTrapHandlers.remove(trap);
- }
-
- if (!overridenTrapHandlers.isEmpty()) {
- currentTrapMap.put(exceptionType, overridenTrapHandlers.poll());
+ // System.out.println("remove from overlapping: " + trap);
}
}
@@ -178,9 +211,9 @@ public void initializeWith(
while (nextStartingTrap != null && nextStartingTrap.getBeginStmt() == stmt) {
Trap trap = nextStartingTrap;
nextStartingTrap = trapStart.poll();
- final Trap existingTrapForException = currentTrapMap.get(trap.getExceptionType());
+ final Trap existingTrapForException = activeTrapMap.get(trap.getExceptionType());
if (existingTrapForException == null) {
- currentTrapMap.put(trap.getExceptionType(), trap);
+ activeTrapMap.put(trap.getExceptionType(), trap);
} else {
final PriorityQueue overridenTraps =
overlappingTraps.computeIfAbsent(
@@ -204,19 +237,19 @@ public void initializeWith(
// remove element which is the trap with the next ending traprange
Trap trapToApply = overridenTraps.poll();
- currentTrapMap.put(trapToApply.getExceptionType(), trapToApply);
+ activeTrapMap.put(trapToApply.getExceptionType(), trapToApply);
}
trapsChanged = true;
}
// TODO: [ms] use more performant addBlock() as we already know where the Blocks borders are
if (trapsChanged) {
exceptionToHandlerMap.clear();
- currentTrapMap.forEach(
+ activeTrapMap.forEach(
(type, trap) -> exceptionToHandlerMap.put(type, trap.getHandlerStmt()));
/* debugprint
System.out.println("-- "+ i +" --");
- currentTrapMap.values().stream().sorted(getTrapComparator(trapstmtToIdx)).forEach(t -> System.out.println( t.getExceptionType() + " "+ trapstmtToIdx.get(t.getBeginStmt()) + " " + trapstmtToIdx.get(t.getEndStmt()) + " -> " +trapstmtToIdx.get(t.getHandlerStmt())));
+ activeTrapMap.values().stream().sorted(getTrapComparator(trapstmtToIdx)).forEach(t -> System.out.println( t.getExceptionType() + " "+ trapstmtToIdx.get(t.getBeginStmt()) + " " + trapstmtToIdx.get(t.getEndStmt()) + " -> " +trapstmtToIdx.get(t.getHandlerStmt())));
*/
}
@@ -480,6 +513,28 @@ private MutableBasicBlock addBlockInternal(
return block;
}
+ @Override
+ public void removeBlock(BasicBlock block) {
+ MutableBasicBlock blockOf = stmtToBlock.get(block.getHead());
+ if (blockOf != block) {
+ throw new IllegalArgumentException(
+ "The given block is not contained in this MutableBlockStmtGraph.");
+ }
+
+ List stmts = block.getStmts();
+ stmts.forEach(
+ stmt -> {
+ stmtToBlock.remove(stmt);
+ });
+
+ // unlink block from graph
+ blockOf.clearPredecessorBlocks();
+ blockOf.clearSuccessorBlocks();
+ blockOf.clearExceptionalSuccessorBlocks();
+
+ blocks.remove(blockOf);
+ }
+
@Override
public void addNode(@Nonnull Stmt stmt, @Nonnull Map exceptions) {
MutableBasicBlock block = stmtToBlock.get(stmt);
@@ -1352,6 +1407,7 @@ public List getTraps() {
// it.getTraps() is valid/completely build when the iterator is done.
HashMap stmtsBlockIdx = new HashMap<>();
int i = 0;
+ // collect BlockIdx positions to sort the traps according to the numbering
while (it.hasNext()) {
final BasicBlock nextBlock = it.next();
stmtsBlockIdx.put(nextBlock.getHead(), i);
@@ -1359,7 +1415,6 @@ public List getTraps() {
i++;
}
final List traps = it.getTraps();
-
traps.sort(getTrapComparator(stmtsBlockIdx));
return traps;
}
diff --git a/sootup.core/src/main/java/sootup/core/graph/MutableStmtGraph.java b/sootup.core/src/main/java/sootup/core/graph/MutableStmtGraph.java
index 408290ffa8f..50e28f983b0 100644
--- a/sootup.core/src/main/java/sootup/core/graph/MutableStmtGraph.java
+++ b/sootup.core/src/main/java/sootup/core/graph/MutableStmtGraph.java
@@ -51,6 +51,8 @@ public void addNode(@Nonnull Stmt stmt) {
/** creates a whole BasicBlock with the details from the parameters */
public abstract void addBlock(@Nonnull List stmts, @Nonnull Map traps);
+ public abstract void removeBlock(BasicBlock block);
+
/**
* creates a whole BasicBlock which contains the sequence of (n-1)*fallsthrough()-stmt + optional
* a non-fallsthrough() stmt at the end of the list
diff --git a/sootup.core/src/main/java/sootup/core/graph/StmtGraph.java b/sootup.core/src/main/java/sootup/core/graph/StmtGraph.java
index f9c27e8d366..f631a7a1c37 100644
--- a/sootup.core/src/main/java/sootup/core/graph/StmtGraph.java
+++ b/sootup.core/src/main/java/sootup/core/graph/StmtGraph.java
@@ -20,6 +20,7 @@
* .
* #L%
*/
+
import com.google.common.collect.Iterators;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -64,6 +65,7 @@ public abstract class StmtGraph> implements Iterable getStartingStmtBlock();
+
/**
* returns the nodes in this graph in a non-deterministic order (->Set) to get the nodes in
* linearized, ordered manner use iterator() or getStmts.
@@ -472,27 +474,22 @@ public BasicBlock next() {
}
/**
- * for jimple serialization -> this is the info for the end of the method contains only
- * valid/useful information when all stmts are iterated i.e. hasNext() == false!
+ * for jimple serialization - this info contains only valid/useful information if all stmts are
+ * iterated i.e. hasNext() == false!
*
* @return List of Traps
*/
public List getTraps() {
- // aggregate dangling trap data
- trapStarts.forEach(
- (type, trapStart) -> {
- final BasicBlock trapHandler =
- lastIteratedBlock.getExceptionalSuccessors().get(type);
- if (trapHandler == null) {
- throw new IllegalStateException(
- "No matching Trap info found for '"
- + type
- + "' in ExceptionalSucessors() of the last iterated Block!");
- }
- collectedTraps.add(
- new Trap(type, trapStart, lastIteratedBlock.getTail(), trapHandler.getTail()));
- });
- trapStarts.clear();
+
+ if (hasNext()) {
+ throw new IllegalStateException("Iterator needs to be iterated completely!");
+ }
+
+ // check for dangling traps that are not collected as the endStmt was not visited.
+ if (!trapStarts.isEmpty()) {
+ throw new IllegalArgumentException(
+ "Invalid StmtGraph. A Trap is not created as a traps endStmt was not visited during the iteration of all Stmts.");
+ }
return collectedTraps;
}
}
diff --git a/sootup.core/src/main/java/sootup/core/inputlocation/AnalysisInputLocation.java b/sootup.core/src/main/java/sootup/core/inputlocation/AnalysisInputLocation.java
index bfaa1600a77..a8cc3e7190a 100644
--- a/sootup.core/src/main/java/sootup/core/inputlocation/AnalysisInputLocation.java
+++ b/sootup.core/src/main/java/sootup/core/inputlocation/AnalysisInputLocation.java
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Optional;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import sootup.core.frontend.SootClassSource;
import sootup.core.model.SootClass;
import sootup.core.model.SourceType;
@@ -71,7 +70,7 @@ public interface AnalysisInputLocation {
*
* @return returns null as source type
*/
- @Nullable
+ @Nonnull
SourceType getSourceType();
@Nonnull
diff --git a/sootup.core/src/main/java/sootup/core/inputlocation/DefaultSourceTypeSpecifier.java b/sootup.core/src/main/java/sootup/core/inputlocation/DefaultSourceTypeSpecifier.java
deleted file mode 100644
index 2d11a7d7b0e..00000000000
--- a/sootup.core/src/main/java/sootup/core/inputlocation/DefaultSourceTypeSpecifier.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package sootup.core.inputlocation;
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 2019-2020 Markus Schmidt, Linghui Luo
- * %%
- * 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
- * .
- * #L%
- */
-import javax.annotation.Nonnull;
-import sootup.core.SourceTypeSpecifier;
-import sootup.core.frontend.AbstractClassSource;
-import sootup.core.model.SourceType;
-
-/**
- * Implements a very basic version of {@link SourceTypeSpecifier} which tells the type of a class by
- * checking if it is a language build-in class.
- *
- * @author Markus Schmidt
- */
-public class DefaultSourceTypeSpecifier implements SourceTypeSpecifier {
-
- private static final DefaultSourceTypeSpecifier INSTANCE = new DefaultSourceTypeSpecifier();
-
- /** Singleton to get an Instance of this SourceTypeSpecifier */
- public static DefaultSourceTypeSpecifier getInstance() {
- return INSTANCE;
- }
-
- private DefaultSourceTypeSpecifier() {}
-
- @Nonnull
- public SourceType sourceTypeFor(AbstractClassSource clsSource) {
- SourceType sourceType = clsSource.getClassSource().getSourceType();
- if (sourceType != null) {
- // Check if source type is specified in AnalysisInputLocation.
- return sourceType;
- }
-
- if (clsSource.getClassType().isBuiltInClass()) {
- // Call builtInClass() method which uses package name to validate whether the class is inbuilt
- // or not.
- return SourceType.Library;
- }
-
- return SourceType.Application;
- }
-}
diff --git a/sootup.core/src/main/java/sootup/core/inputlocation/EagerInputLocation.java b/sootup.core/src/main/java/sootup/core/inputlocation/EagerInputLocation.java
index d74c1f1cac4..366afe42026 100644
--- a/sootup.core/src/main/java/sootup/core/inputlocation/EagerInputLocation.java
+++ b/sootup.core/src/main/java/sootup/core/inputlocation/EagerInputLocation.java
@@ -74,6 +74,7 @@ public Collection getClassSources(@Nullable View view) {
return map.values();
}
+ @Nonnull
@Override
public SourceType getSourceType() {
return sourceType;
diff --git a/sootup.core/src/main/java/sootup/core/inputlocation/EmptyClassLoadingOptions.java b/sootup.core/src/main/java/sootup/core/inputlocation/EmptyClassLoadingOptions.java
index ce252da5f3f..3fda3aa8254 100644
--- a/sootup.core/src/main/java/sootup/core/inputlocation/EmptyClassLoadingOptions.java
+++ b/sootup.core/src/main/java/sootup/core/inputlocation/EmptyClassLoadingOptions.java
@@ -1,5 +1,27 @@
package sootup.core.inputlocation;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import java.util.Collections;
import java.util.List;
import javax.annotation.Nonnull;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/Jimple.java b/sootup.core/src/main/java/sootup/core/jimple/Jimple.java
index 768e72b5e7f..d9c6dcb78ff 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/Jimple.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/Jimple.java
@@ -348,11 +348,6 @@ public static JStaticInvokeExpr newStaticInvokeExpr(
return new JStaticInvokeExpr(method, args);
}
- @Deprecated // use the version with List args instead
- public static JStaticInvokeExpr newStaticInvokeExpr(MethodSignature method, Immediate... args) {
- return newStaticInvokeExpr(method, Arrays.asList(args));
- }
-
public static JStaticInvokeExpr newStaticInvokeExpr(MethodSignature method, Immediate arg) {
return newStaticInvokeExpr(method, Collections.singletonList(arg));
}
@@ -370,16 +365,6 @@ public static JSpecialInvokeExpr newSpecialInvokeExpr(
return new JSpecialInvokeExpr(base, method, args);
}
- /**
- * Constructs a NewSpecialInvokeExpr(Local base, SootMethod method, List of Immediate) grammar
- * chunk.
- */
- @Deprecated // use the version with List args instead
- public static JSpecialInvokeExpr newSpecialInvokeExpr(
- Local base, MethodSignature method, Immediate... args) {
- return newSpecialInvokeExpr(base, method, Arrays.asList(args));
- }
-
public static JSpecialInvokeExpr newSpecialInvokeExpr(
Local base, MethodSignature method, Immediate arg) {
return newSpecialInvokeExpr(base, method, Collections.singletonList(arg));
@@ -424,16 +409,6 @@ public static JVirtualInvokeExpr newVirtualInvokeExpr(
return new JVirtualInvokeExpr(base, method, args);
}
- /**
- * Constructs a NewVirtualInvokeExpr(Local base, SootMethod method, List of Immediate) grammar
- * chunk.
- */
- @Deprecated // use the version with List args instead
- public static JVirtualInvokeExpr newVirtualInvokeExpr(
- Local base, MethodSignature method, Immediate... args) {
- return newVirtualInvokeExpr(base, method, Arrays.asList(args));
- }
-
public static JVirtualInvokeExpr newVirtualInvokeExpr(
Local base, MethodSignature method, Immediate arg) {
return newVirtualInvokeExpr(base, method, Collections.singletonList(arg));
@@ -452,16 +427,6 @@ public static JInterfaceInvokeExpr newInterfaceInvokeExpr(
return new JInterfaceInvokeExpr(base, method, args);
}
- /**
- * Constructs a NewInterfaceInvokeExpr(Local base, SootMethod method, List of Immediate) grammar
- * chunk.
- */
- @Deprecated // use the version with List args instead
- public static JInterfaceInvokeExpr newInterfaceInvokeExpr(
- Local base, MethodSignature method, Immediate... args) {
- return newInterfaceInvokeExpr(base, method, Arrays.asList(args));
- }
-
public static JInterfaceInvokeExpr newInterfaceInvokeExpr(
Local base, MethodSignature method, Immediate arg) {
return newInterfaceInvokeExpr(base, method, Collections.singletonList(arg));
diff --git a/sootup.core/src/main/java/sootup/core/jimple/basic/FullStmtPositionInfo.java b/sootup.core/src/main/java/sootup/core/jimple/basic/FullStmtPositionInfo.java
index 98dab8e2641..54ca76d8e12 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/basic/FullStmtPositionInfo.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/basic/FullStmtPositionInfo.java
@@ -24,7 +24,6 @@
import javax.annotation.Nonnull;
import sootup.core.model.Position;
-import sootup.core.util.Copyable;
/**
* This class stores position information stored for a statement. line number + information about
@@ -32,7 +31,7 @@
*
* @author Linghui Luo, Markus Schmidt
*/
-public class FullStmtPositionInfo extends SimpleStmtPositionInfo implements Copyable {
+public class FullStmtPositionInfo extends SimpleStmtPositionInfo {
@Nonnull protected final Position[] operandPositions;
/**
diff --git a/sootup.core/src/main/java/sootup/core/jimple/basic/LValue.java b/sootup.core/src/main/java/sootup/core/jimple/basic/LValue.java
index e7ff23de3c2..d01bde97314 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/basic/LValue.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/basic/LValue.java
@@ -1,4 +1,26 @@
package sootup.core.jimple.basic;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
/** Marker interface for Values that can be on the left side of an Assignment */
public interface LValue extends Value {}
diff --git a/sootup.core/src/main/java/sootup/core/jimple/basic/Local.java b/sootup.core/src/main/java/sootup/core/jimple/basic/Local.java
index 2cb07ae5ea2..079d9ace828 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/basic/Local.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/basic/Local.java
@@ -33,7 +33,6 @@
import sootup.core.model.Body;
import sootup.core.types.Type;
import sootup.core.types.VoidType;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/**
@@ -43,7 +42,7 @@
*
* @author Linghui Luo
*/
-public class Local implements Immediate, LValue, Copyable, Acceptor {
+public class Local implements Immediate, LValue, Acceptor {
@Nonnull private final String name;
@Nonnull private final Type type;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/basic/StmtPositionInfo.java b/sootup.core/src/main/java/sootup/core/jimple/basic/StmtPositionInfo.java
index 769eb1bdf1b..f445c83ca63 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/basic/StmtPositionInfo.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/basic/StmtPositionInfo.java
@@ -58,7 +58,7 @@ public String toString() {
* @return an instance with no position information.
*/
@Nonnull
- public static StmtPositionInfo createNoStmtPositionInfo() {
+ public static StmtPositionInfo getNoStmtPositionInfo() {
return NOPOSITION;
}
diff --git a/sootup.core/src/main/java/sootup/core/jimple/basic/Trap.java b/sootup.core/src/main/java/sootup/core/jimple/basic/Trap.java
index 9f8a1b11459..5ee3dde9800 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/basic/Trap.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/basic/Trap.java
@@ -27,14 +27,13 @@
import sootup.core.jimple.Jimple;
import sootup.core.jimple.common.stmt.Stmt;
import sootup.core.types.ClassType;
-import sootup.core.util.Copyable;
/**
* Represents a try-catch construct.
*
* Prefer to use the factory methods in {@link Jimple}.
*/
-public final class Trap implements Copyable {
+public final class Trap {
/** The exception being caught. */
@Nonnull private final ClassType exception;
@@ -55,12 +54,9 @@ public Trap(
@Nonnull Stmt endStmt, // exclusive!
@Nonnull Stmt handlerStmt) {
- /* TODO: [ms] rethink the beginStmt->endStmt interval model as we dont have a linear
- // representation anymore.
if (beginStmt == endStmt) {
throw new IllegalArgumentException("The covered Trap range is empty. Trap is of no use.");
}
- */
this.exception = exception;
this.beginStmt = beginStmt;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/constant/MethodType.java b/sootup.core/src/main/java/sootup/core/jimple/common/constant/MethodType.java
index 8a5b0bd689a..49ad88426aa 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/constant/MethodType.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/constant/MethodType.java
@@ -29,9 +29,8 @@
import sootup.core.signatures.MethodSubSignature;
import sootup.core.types.ClassType;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
-public class MethodType implements Constant, Copyable {
+public class MethodType implements Constant {
// FIXME: [AD] adapt this class
private final Type type;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/AbstractFloatBinopExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/AbstractFloatBinopExpr.java
index 71383da7037..5c834a32808 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/AbstractFloatBinopExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/AbstractFloatBinopExpr.java
@@ -24,7 +24,6 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
-import sootup.core.jimple.basic.Value;
import sootup.core.types.PrimitiveType;
import sootup.core.types.Type;
import sootup.core.types.UnknownType;
@@ -38,8 +37,8 @@ protected AbstractFloatBinopExpr(@Nonnull Immediate op1, @Nonnull Immediate op2)
@Nonnull
@Override
public Type getType() {
- Value op1 = getOp1();
- Value op2 = getOp2();
+ Immediate op1 = getOp1();
+ Immediate op2 = getOp2();
Type op1t = op1.getType();
Type op2t = op2.getType();
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JAddExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JAddExpr.java
index d0da90b20b9..d5db75cfd15 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JAddExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JAddExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that adds two numbers. */
-public final class JAddExpr extends AbstractFloatBinopExpr implements Copyable {
+public final class JAddExpr extends AbstractFloatBinopExpr {
public JAddExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JAndExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JAndExpr.java
index 59d53666619..1de8e46fca6 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JAndExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JAndExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that computes a binary AND of two operands. */
-public final class JAndExpr extends AbstractIntLongBinopExpr implements Copyable {
+public final class JAndExpr extends AbstractIntLongBinopExpr {
public JAndExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCastExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCastExpr.java
index c1fc3a03b86..1cd49a340bd 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCastExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCastExpr.java
@@ -30,11 +30,10 @@
import sootup.core.jimple.basic.Value;
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** An expression that casts a value to a certain type. */
-public final class JCastExpr implements Expr, Copyable {
+public final class JCastExpr implements Expr {
private final Immediate op;
private final Type type;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmpExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmpExpr.java
index 3aa9c0b83d5..4662b226954 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmpExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmpExpr.java
@@ -26,9 +26,8 @@
import sootup.core.jimple.Jimple;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
-public final class JCmpExpr extends AbstractIntBinopExpr implements Copyable {
+public final class JCmpExpr extends AbstractIntBinopExpr {
public JCmpExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmpgExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmpgExpr.java
index 3c71803b66a..e95e068305e 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmpgExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmpgExpr.java
@@ -26,9 +26,8 @@
import sootup.core.jimple.Jimple;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
-public final class JCmpgExpr extends AbstractIntBinopExpr implements Copyable {
+public final class JCmpgExpr extends AbstractIntBinopExpr {
public JCmpgExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmplExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmplExpr.java
index d73f93025cf..8b9a9d98cc4 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmplExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JCmplExpr.java
@@ -26,9 +26,8 @@
import sootup.core.jimple.Jimple;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
-public final class JCmplExpr extends AbstractIntBinopExpr implements Copyable {
+public final class JCmplExpr extends AbstractIntBinopExpr {
public JCmplExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JDivExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JDivExpr.java
index 02cfc8639d1..0078831b6cf 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JDivExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JDivExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that divides a number by another. */
-public final class JDivExpr extends AbstractFloatBinopExpr implements Copyable {
+public final class JDivExpr extends AbstractFloatBinopExpr {
public JDivExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JDynamicInvokeExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JDynamicInvokeExpr.java
index d75729fade0..5a1f5c73788 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JDynamicInvokeExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JDynamicInvokeExpr.java
@@ -32,11 +32,10 @@
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.signatures.MethodSignature;
import sootup.core.signatures.MethodSubSignature;
-import sootup.core.util.Copyable;
import sootup.core.util.ImmutableUtils;
import sootup.core.util.printer.StmtPrinter;
-public final class JDynamicInvokeExpr extends AbstractInvokeExpr implements Copyable {
+public final class JDynamicInvokeExpr extends AbstractInvokeExpr {
@Nonnull public static final String INVOKEDYNAMIC_DUMMY_CLASS_NAME = "sootup.dummy.InvokeDynamic";
@Nonnull private final MethodSignature bootstrapMethodSignature;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JEqExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JEqExpr.java
index a05acf75b3b..427eb1d8b7f 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JEqExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JEqExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that checks whether two value are equal. */
-public final class JEqExpr extends AbstractConditionExpr implements Copyable {
+public final class JEqExpr extends AbstractConditionExpr {
public JEqExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JGeExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JGeExpr.java
index 9544bf8eae3..fab195e3bc4 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JGeExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JGeExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that checks whether operand 1 >= operand 2. */
-public final class JGeExpr extends AbstractConditionExpr implements Copyable {
+public final class JGeExpr extends AbstractConditionExpr {
public JGeExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JGtExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JGtExpr.java
index 238730642cd..5ef14d09653 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JGtExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JGtExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that checks whether operand 1 > operand 2. */
-public final class JGtExpr extends AbstractConditionExpr implements Copyable {
+public final class JGtExpr extends AbstractConditionExpr {
public JGtExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JInstanceOfExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JInstanceOfExpr.java
index fa67cf57c1c..7f8fb98c346 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JInstanceOfExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JInstanceOfExpr.java
@@ -32,11 +32,10 @@
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.types.PrimitiveType;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** An expression that checks whether a value is of a certain type. */
-public final class JInstanceOfExpr implements Expr, Copyable {
+public final class JInstanceOfExpr implements Expr {
private final Immediate op;
private final Type checkType;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JInterfaceInvokeExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JInterfaceInvokeExpr.java
index e8c677280ad..3f9fedf8799 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JInterfaceInvokeExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JInterfaceInvokeExpr.java
@@ -36,11 +36,10 @@
import sootup.core.jimple.basic.Local;
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.signatures.MethodSignature;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** An expression that invokes an interface method. */
-public final class JInterfaceInvokeExpr extends AbstractInstanceInvokeExpr implements Copyable {
+public final class JInterfaceInvokeExpr extends AbstractInstanceInvokeExpr {
/** methodArgs to an array args. */
public JInterfaceInvokeExpr(
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLeExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLeExpr.java
index aea6cd63de0..63533ceb454 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLeExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLeExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that checks whether operand 1 <= operand 2. */
-public final class JLeExpr extends AbstractConditionExpr implements Copyable {
+public final class JLeExpr extends AbstractConditionExpr {
public JLeExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLengthExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLengthExpr.java
index 48817a58f79..643c550abdd 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLengthExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLengthExpr.java
@@ -28,11 +28,10 @@
import sootup.core.jimple.basic.JimpleComparator;
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.types.PrimitiveType;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** An expression that returns the length of an array. */
-public final class JLengthExpr extends AbstractUnopExpr implements Copyable {
+public final class JLengthExpr extends AbstractUnopExpr {
public JLengthExpr(@Nonnull Immediate op) {
super(op);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLtExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLtExpr.java
index 2923d28586f..9cdae61edc5 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLtExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JLtExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that checks whether operand 1 < operand 2. */
-public final class JLtExpr extends AbstractConditionExpr implements Copyable {
+public final class JLtExpr extends AbstractConditionExpr {
public JLtExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JMulExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JMulExpr.java
index 1978279d15f..6202a191295 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JMulExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JMulExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that multiplies two numbers. */
-public final class JMulExpr extends AbstractFloatBinopExpr implements Copyable {
+public final class JMulExpr extends AbstractFloatBinopExpr {
public JMulExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNeExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNeExpr.java
index d97fd60e39a..9e3e1cc0ef2 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNeExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNeExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** The opposite of {@link JEqExpr} */
-public final class JNeExpr extends AbstractConditionExpr implements Copyable {
+public final class JNeExpr extends AbstractConditionExpr {
public JNeExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNegExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNegExpr.java
index c10ef2d8c0d..7466b08913c 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNegExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNegExpr.java
@@ -31,11 +31,10 @@
import sootup.core.types.PrimitiveType;
import sootup.core.types.Type;
import sootup.core.types.UnknownType;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** An expression that negates its operand (-). */
-public final class JNegExpr extends AbstractUnopExpr implements Copyable {
+public final class JNegExpr extends AbstractUnopExpr {
public JNegExpr(@Nonnull Immediate op) {
super(op);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewArrayExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewArrayExpr.java
index 3baf4c432bb..9f9d07683c9 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewArrayExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewArrayExpr.java
@@ -33,11 +33,10 @@
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.types.ArrayType;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** An expression that creates a new array of a certain type and a certain size. */
-public final class JNewArrayExpr implements Expr, Copyable {
+public final class JNewArrayExpr implements Expr {
@Nonnull private final Type baseType;
@Nonnull private final Immediate size;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewExpr.java
index 2a8bad17cfb..3cdd93c9927 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewExpr.java
@@ -30,11 +30,10 @@
import sootup.core.jimple.basic.Value;
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.types.ClassType;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** An expression that creates a new instance of a class. */
-public final class JNewExpr implements Expr, Copyable {
+public final class JNewExpr implements Expr {
@Nonnull private final ClassType type;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewMultiArrayExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewMultiArrayExpr.java
index 1be30ab14ce..26180e52864 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewMultiArrayExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JNewMultiArrayExpr.java
@@ -26,18 +26,16 @@
import java.util.List;
import javax.annotation.Nonnull;
import sootup.core.jimple.Jimple;
-import sootup.core.jimple.basic.*;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.basic.JimpleComparator;
import sootup.core.jimple.basic.Value;
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.types.ArrayType;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** Like {@link JNewArrayExpr}, but for multi-dimensional arrays. */
-public final class JNewMultiArrayExpr implements Expr, Copyable {
+public final class JNewMultiArrayExpr implements Expr {
private final ArrayType baseType;
private final List sizes;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JOrExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JOrExpr.java
index 68e11dec3a7..8f5f9d31526 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JOrExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JOrExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that computes a binary OR of two operands. */
-public final class JOrExpr extends AbstractIntLongBinopExpr implements Copyable {
+public final class JOrExpr extends AbstractIntLongBinopExpr {
public JOrExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JPhiExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JPhiExpr.java
index 46dcfa8c293..b4593528cc2 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JPhiExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JPhiExpr.java
@@ -32,11 +32,10 @@
import sootup.core.jimple.basic.Value;
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** @author Zun Wang */
-public final class JPhiExpr implements Expr, Copyable {
+public final class JPhiExpr implements Expr {
private final List args;
private final Map, Local> blockToArg = new HashMap<>();
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JRemExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JRemExpr.java
index d491ca0171b..23998b875d1 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JRemExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JRemExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that computes a % b. */
-public final class JRemExpr extends AbstractFloatBinopExpr implements Copyable {
+public final class JRemExpr extends AbstractFloatBinopExpr {
public JRemExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JShlExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JShlExpr.java
index 96ecfb5503c..5d0e526045f 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JShlExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JShlExpr.java
@@ -29,10 +29,9 @@
import sootup.core.types.PrimitiveType;
import sootup.core.types.Type;
import sootup.core.types.UnknownType;
-import sootup.core.util.Copyable;
/** An expression that shifts its operand to the left (<<). */
-public final class JShlExpr extends AbstractIntLongBinopExpr implements Copyable {
+public final class JShlExpr extends AbstractIntLongBinopExpr {
public JShlExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JShrExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JShrExpr.java
index ee1030496ae..087a3af5233 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JShrExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JShrExpr.java
@@ -29,10 +29,9 @@
import sootup.core.types.PrimitiveType;
import sootup.core.types.Type;
import sootup.core.types.UnknownType;
-import sootup.core.util.Copyable;
/** An expression that shifts its operand to the left (>>). */
-public final class JShrExpr extends AbstractIntLongBinopExpr implements Copyable {
+public final class JShrExpr extends AbstractIntLongBinopExpr {
public JShrExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JSpecialInvokeExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JSpecialInvokeExpr.java
index ce423df897e..3bd417c76fe 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JSpecialInvokeExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JSpecialInvokeExpr.java
@@ -30,11 +30,10 @@
import sootup.core.jimple.basic.Local;
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.signatures.MethodSignature;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** An expression that invokes a special method (e.g. private methods). */
-public final class JSpecialInvokeExpr extends AbstractInstanceInvokeExpr implements Copyable {
+public final class JSpecialInvokeExpr extends AbstractInstanceInvokeExpr {
public JSpecialInvokeExpr(
@Nonnull Local base, @Nonnull MethodSignature method, @Nonnull List args) {
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JStaticInvokeExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JStaticInvokeExpr.java
index b6e030692dd..08e25e168d3 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JStaticInvokeExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JStaticInvokeExpr.java
@@ -29,11 +29,10 @@
import sootup.core.jimple.basic.JimpleComparator;
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.signatures.MethodSignature;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** An expression that invokes a static method. */
-public final class JStaticInvokeExpr extends AbstractInvokeExpr implements Copyable {
+public final class JStaticInvokeExpr extends AbstractInvokeExpr {
/** Stores the values to the args array. */
public JStaticInvokeExpr(@Nonnull MethodSignature method, @Nonnull List args) {
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JSubExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JSubExpr.java
index 2ab830502ce..a9cf646d427 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JSubExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JSubExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that subtracts operand 2 from operand 1. */
-public final class JSubExpr extends AbstractFloatBinopExpr implements Copyable {
+public final class JSubExpr extends AbstractFloatBinopExpr {
public JSubExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JUshrExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JUshrExpr.java
index 01e9c2d2153..f7b9e7cf1e7 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JUshrExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JUshrExpr.java
@@ -29,10 +29,9 @@
import sootup.core.types.PrimitiveType;
import sootup.core.types.Type;
import sootup.core.types.UnknownType;
-import sootup.core.util.Copyable;
/** Similar to {@link JShrExpr}, but shifts zero into the leftmost position. */
-public final class JUshrExpr extends AbstractIntLongBinopExpr implements Copyable {
+public final class JUshrExpr extends AbstractIntLongBinopExpr {
public JUshrExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
}
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JVirtualInvokeExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JVirtualInvokeExpr.java
index cc2dba3ff6b..e3ca02a382e 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JVirtualInvokeExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JVirtualInvokeExpr.java
@@ -30,11 +30,10 @@
import sootup.core.jimple.basic.Local;
import sootup.core.jimple.visitor.ExprVisitor;
import sootup.core.signatures.MethodSignature;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/** An expression that invokes a virtual method. */
-public final class JVirtualInvokeExpr extends AbstractInstanceInvokeExpr implements Copyable {
+public final class JVirtualInvokeExpr extends AbstractInstanceInvokeExpr {
/** Stores the values to the args array. */
public JVirtualInvokeExpr(
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JXorExpr.java b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JXorExpr.java
index 4856ebe1ca2..1eb9cabcdf3 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/expr/JXorExpr.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/expr/JXorExpr.java
@@ -25,10 +25,9 @@
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.visitor.ExprVisitor;
-import sootup.core.util.Copyable;
/** An expression that computes a binary XOR of two operands. */
-public final class JXorExpr extends AbstractIntLongBinopExpr implements Copyable {
+public final class JXorExpr extends AbstractIntLongBinopExpr {
public JXorExpr(@Nonnull Immediate op1, @Nonnull Immediate op2) {
super(op1, op2);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JArrayRef.java b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JArrayRef.java
index 43e4d641590..7ff5cdfcf39 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JArrayRef.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JArrayRef.java
@@ -28,10 +28,9 @@
import sootup.core.jimple.basic.*;
import sootup.core.jimple.visitor.RefVisitor;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
-public final class JArrayRef implements ConcreteRef, LValue, Copyable {
+public final class JArrayRef implements ConcreteRef, LValue {
private final Local base;
private final Immediate index;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JCaughtExceptionRef.java b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JCaughtExceptionRef.java
index c07f6df1d02..70b6b1ba94f 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JCaughtExceptionRef.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JCaughtExceptionRef.java
@@ -29,10 +29,9 @@
import sootup.core.jimple.basic.Value;
import sootup.core.jimple.visitor.RefVisitor;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
-public final class JCaughtExceptionRef implements IdentityRef, Copyable {
+public final class JCaughtExceptionRef implements IdentityRef {
private final Type type;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JInstanceFieldRef.java b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JInstanceFieldRef.java
index 3c6ac8f284d..95411c2f161 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JInstanceFieldRef.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JInstanceFieldRef.java
@@ -30,15 +30,13 @@
import java.util.List;
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.JimpleComparator;
-import sootup.core.jimple.basic.LValue;
import sootup.core.jimple.basic.Local;
import sootup.core.jimple.basic.Value;
import sootup.core.jimple.visitor.RefVisitor;
import sootup.core.signatures.FieldSignature;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
-public final class JInstanceFieldRef extends JFieldRef implements LValue, Copyable {
+public final class JInstanceFieldRef extends JFieldRef {
private final Local base;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JParameterRef.java b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JParameterRef.java
index 08125532677..9aafc5236a5 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JParameterRef.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JParameterRef.java
@@ -29,7 +29,6 @@
import sootup.core.jimple.basic.Value;
import sootup.core.jimple.visitor.RefVisitor;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
/**
@@ -39,7 +38,7 @@
* For instance, in a method, the first statement will often be
* this := @parameter0;
*/
-public final class JParameterRef implements IdentityRef, Copyable {
+public final class JParameterRef implements IdentityRef {
private final int index;
private final Type paramType;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JStaticFieldRef.java b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JStaticFieldRef.java
index 8f471346261..fcbc6c5f177 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JStaticFieldRef.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JStaticFieldRef.java
@@ -30,10 +30,9 @@
import sootup.core.jimple.basic.Value;
import sootup.core.jimple.visitor.RefVisitor;
import sootup.core.signatures.FieldSignature;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
-public final class JStaticFieldRef extends JFieldRef implements LValue, Copyable {
+public final class JStaticFieldRef extends JFieldRef implements LValue {
public JStaticFieldRef(@Nonnull FieldSignature fieldSig) {
super(fieldSig);
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JThisRef.java b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JThisRef.java
index e49310e433e..2af65662096 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/ref/JThisRef.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/ref/JThisRef.java
@@ -30,10 +30,9 @@
import sootup.core.jimple.visitor.RefVisitor;
import sootup.core.types.ClassType;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
-public final class JThisRef implements IdentityRef, Copyable {
+public final class JThisRef implements IdentityRef {
private final ClassType thisType;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/stmt/FallsThroughStmt.java b/sootup.core/src/main/java/sootup/core/jimple/common/stmt/FallsThroughStmt.java
index 6bab22a5b62..0568cdcaa4a 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/stmt/FallsThroughStmt.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/stmt/FallsThroughStmt.java
@@ -1,5 +1,27 @@
package sootup.core.jimple.common.stmt;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
/** as an equivalent to BranchingStmt */
public interface FallsThroughStmt extends Stmt {
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/stmt/JAssignStmt.java b/sootup.core/src/main/java/sootup/core/jimple/common/stmt/JAssignStmt.java
index 3301d2d5422..064eb5d359e 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/stmt/JAssignStmt.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/stmt/JAssignStmt.java
@@ -1,5 +1,27 @@
package sootup.core.jimple.common.stmt;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
/*-
* #%Value
* Soot - a J*va Optimization Framework
diff --git a/sootup.core/src/main/java/sootup/core/jimple/common/stmt/Stmt.java b/sootup.core/src/main/java/sootup/core/jimple/common/stmt/Stmt.java
index 36c4d2cad90..9e6b6140b1c 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/common/stmt/Stmt.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/common/stmt/Stmt.java
@@ -31,10 +31,9 @@
import sootup.core.jimple.common.ref.JFieldRef;
import sootup.core.jimple.visitor.Acceptor;
import sootup.core.jimple.visitor.StmtVisitor;
-import sootup.core.util.Copyable;
import sootup.core.util.printer.StmtPrinter;
-public interface Stmt extends EquivTo, Acceptor, Copyable {
+public interface Stmt extends EquivTo, Acceptor {
@Nonnull
List getUses();
diff --git a/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractImmediateVisitor.java b/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractImmediateVisitor.java
index b10be5e9632..f9721e13a57 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractImmediateVisitor.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractImmediateVisitor.java
@@ -1,5 +1,27 @@
package sootup.core.jimple.visitor;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Immediate;
import sootup.core.jimple.basic.Local;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractTypeVisitor.java b/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractTypeVisitor.java
index f61fca7e998..d646e6d0cc9 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractTypeVisitor.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractTypeVisitor.java
@@ -1,5 +1,27 @@
package sootup.core.jimple.visitor;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import javax.annotation.Nonnull;
import sootup.core.types.*;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractValueVisitor.java b/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractValueVisitor.java
index f72e15ab648..bc9fcf6477f 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractValueVisitor.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractValueVisitor.java
@@ -1,5 +1,27 @@
package sootup.core.jimple.visitor;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Local;
import sootup.core.jimple.basic.Value;
diff --git a/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractVisitor.java b/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractVisitor.java
index fe2026df887..12de0b5dda1 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractVisitor.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/visitor/AbstractVisitor.java
@@ -1,5 +1,27 @@
package sootup.core.jimple.visitor;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
/**
* Base class for retrieving a calculated result from the implemented Visitor (which is basically a
* switch via OOP)
diff --git a/sootup.core/src/main/java/sootup/core/jimple/visitor/ImmediateVisitor.java b/sootup.core/src/main/java/sootup/core/jimple/visitor/ImmediateVisitor.java
index 1f8a51b52f6..a95d4fcffe7 100644
--- a/sootup.core/src/main/java/sootup/core/jimple/visitor/ImmediateVisitor.java
+++ b/sootup.core/src/main/java/sootup/core/jimple/visitor/ImmediateVisitor.java
@@ -1,5 +1,27 @@
package sootup.core.jimple.visitor;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import javax.annotation.Nonnull;
import sootup.core.jimple.basic.Local;
diff --git a/sootup.core/src/main/java/sootup/core/model/Body.java b/sootup.core/src/main/java/sootup/core/model/Body.java
index 4003e687faf..30deb635bc2 100644
--- a/sootup.core/src/main/java/sootup/core/model/Body.java
+++ b/sootup.core/src/main/java/sootup/core/model/Body.java
@@ -36,18 +36,15 @@
import sootup.core.jimple.common.ref.JThisRef;
import sootup.core.jimple.common.stmt.*;
import sootup.core.signatures.MethodSignature;
-import sootup.core.util.Copyable;
import sootup.core.util.EscapedWriter;
-import sootup.core.util.ImmutableUtils;
import sootup.core.util.printer.JimplePrinter;
-import sootup.core.validation.*;
/**
* Class that models the Jimple body (code attribute) of a method.
*
* @author Linghui Luo
*/
-public class Body implements Copyable, HasPosition {
+public class Body implements HasPosition {
/** The locals for this Body. */
private final Set locals;
@@ -60,18 +57,6 @@ public class Body implements Copyable, HasPosition {
/** The MethodSignature associated with this Body. */
@Nonnull private final MethodSignature methodSignature;
- /** An array containing some validators in order to validate the JimpleBody */
- @Nonnull
- private static final List validators =
- ImmutableUtils.immutableList(
- new LocalsValidator(),
- new TrapsValidator(),
- new StmtsValidator(),
- new UsesValidator(),
- new ValuesValidator(),
- new CheckInitValidator(),
- new CheckTypesValidator());
-
/**
* Creates an body which is not associated to any method.
*
@@ -84,10 +69,8 @@ private Body(
@Nonnull Position position) {
this.methodSignature = methodSignature;
this.locals = Collections.unmodifiableSet(locals);
- this.graph = /* FIXME: [ms] make immutable when availabe */
- new MutableBlockStmtGraph(stmtGraph).unmodifiableStmtGraph();
+ this.graph = MutableBlockStmtGraph.createUnmodifiableStmtGraph(stmtGraph);
this.position = position;
- // checkInit();
}
/**
@@ -99,7 +82,7 @@ public static Local getThisLocal(StmtGraph stmtGraph) {
for (Stmt stmt : stmtGraph.getNodes()) {
if (stmt instanceof JIdentityStmt
&& ((JIdentityStmt) stmt).getRightOp() instanceof JThisRef) {
- return (Local) ((JIdentityStmt) stmt).getLeftOp();
+ return ((JIdentityStmt) stmt).getLeftOp();
}
}
throw new RuntimeException("couldn't find *this* assignment");
@@ -120,28 +103,18 @@ public int getLocalCount() {
return locals.size();
}
- /** Verifies that a Value is not used in more than one place. */
- // TODO: #535 implement validator public void validateValues() { runValidation(new
- // ValuesValidator());}
-
- /** Verifies that each Local of getUsesAndDefs() is in this body's locals Chain. */
- // TODO: #535 implement validator public void validateLocals() {runValidation(new
- // LocalsValidator());}
-
- /** Verifies that each use in this Body has a def. */
- // TODO: #535 implement validator public void validateUses() { runValidation(new
- // UsesValidator()); }
- // private void checkInit() {
- // runValidation(new CheckInitValidator(),);
- // }
-
/** Returns a backed chain of the locals declared in this Body. */
public Set getLocals() {
return locals;
}
- /** Returns an unmodifiable view of the traps found in this Body. */
+ /**
+ * Returns an unmodifiable view of the traps found in this Body. @Deprecated the exceptional flow
+ * information is already integrated into the StmtGraphs BasicBlocks.getExceptionalFlows() -
+ * exists to make porting tools from Soot easier
+ */
@Nonnull
+ @Deprecated()
public List getTraps() {
return graph.getTraps();
}
@@ -149,18 +122,18 @@ public List getTraps() {
/** Return unit containing the \@this-assignment * */
@Nullable
public Stmt getThisStmt() {
- for (Stmt u : getStmts()) {
- if (u instanceof JIdentityStmt) {
- if (((JIdentityStmt) u).getRightOp() instanceof JThisRef) {
- return u;
+ for (Stmt stmt : graph) {
+ if (stmt instanceof JIdentityStmt) {
+ if (((JIdentityStmt) stmt).getRightOp() instanceof JThisRef) {
+ return stmt;
}
} else {
- // TODO: possible optimization see getParameterLocals()
+ // TODO: possible optimisation see getParameterLocals()
// break;
}
}
return null;
- // throw new RuntimeException("couldn't find this-assignment!" + " in " +
+ // throw new IllegalArgumentException("couldn't find this-assignment!" + " in " +
// getMethodSignature());
}
@@ -171,24 +144,22 @@ public Local getThisLocal() {
if (thisStmt == null) {
return null;
}
- return (Local) thisStmt.getLeftOp();
+ return thisStmt.getLeftOp();
}
/** Return LHS of the first identity stmt assigning from \@parameter i. */
@Nonnull
public Local getParameterLocal(int i) {
- for (Stmt s : getStmts()) {
- if (s instanceof JIdentityStmt) {
- if (((JIdentityStmt) s).getRightOp() instanceof JParameterRef) {
- JIdentityStmt idStmt = (JIdentityStmt) s;
+ for (Stmt stmt : graph) {
+ // TODO: possible optimisation see getParameterLocals()
+ if (stmt instanceof JIdentityStmt) {
+ if (((JIdentityStmt) stmt).getRightOp() instanceof JParameterRef) {
+ JIdentityStmt idStmt = (JIdentityStmt) stmt;
JParameterRef pr = (JParameterRef) idStmt.getRightOp();
if (pr.getIndex() == i) {
- return (Local) idStmt.getLeftOp();
+ return idStmt.getLeftOp();
}
}
- } else {
- // TODO: possible optimization see getParameterLocals()
- // break;
}
}
throw new IllegalArgumentException("There exists no Parameter Local with index " + i + "!");
@@ -206,7 +177,7 @@ public Collection getParameterLocals() {
final List retVal = new ArrayList<>();
// TODO: [ms] performance: don't iterate over all stmt -> lazy vs freedom/error tolerance -> use
// fixed index positions at the beginning?
- for (Stmt u : graph.getNodes()) {
+ for (Stmt u : graph) {
if (u instanceof JIdentityStmt) {
JIdentityStmt idStmt = (JIdentityStmt) u;
if (idStmt.getRightOp() instanceof JParameterRef) {
@@ -225,7 +196,9 @@ public Collection getParameterLocals() {
}
/**
- * returns the control flow graph that represents this body into a linear List of statements.
+ * returns the control flow graph that represents this body into a linear List of statements. for
+ * more detailed information of the underlying CFG - or just parts of it - have a look at
+ * getStmtGraph()
*
* @return the statements in this Body
*/
@@ -270,10 +243,6 @@ public boolean isStmtBranchTarget(@Nonnull Stmt targetStmt) {
return getStmtGraph().isStmtBranchTarget(targetStmt);
}
- // public void validateIdentityStatements() {
- // runValidation(new IdentityStatementsValidator());
- // }
-
/** Returns the first non-identity stmt in this body. */
@Nonnull
public Stmt getFirstNonIdentityStmt() {
diff --git a/sootup.core/src/main/java/sootup/core/model/HasPosition.java b/sootup.core/src/main/java/sootup/core/model/HasPosition.java
index 68a00eaffe8..b4a7c58a85c 100644
--- a/sootup.core/src/main/java/sootup/core/model/HasPosition.java
+++ b/sootup.core/src/main/java/sootup/core/model/HasPosition.java
@@ -1,5 +1,27 @@
package sootup.core.model;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
/**
* Interface to mark Soot code objects that may contain code location information.
*
diff --git a/sootup.core/src/main/java/sootup/core/model/LinePosition.java b/sootup.core/src/main/java/sootup/core/model/LinePosition.java
index 624ffa88fb8..a7d1afb62f0 100644
--- a/sootup.core/src/main/java/sootup/core/model/LinePosition.java
+++ b/sootup.core/src/main/java/sootup/core/model/LinePosition.java
@@ -1,5 +1,27 @@
package sootup.core.model;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
public class LinePosition extends Position {
private final int lineNo;
diff --git a/sootup.core/src/main/java/sootup/core/model/Position.java b/sootup.core/src/main/java/sootup/core/model/Position.java
index 9a0aa6844e3..671873f2f8e 100644
--- a/sootup.core/src/main/java/sootup/core/model/Position.java
+++ b/sootup.core/src/main/java/sootup/core/model/Position.java
@@ -1,5 +1,27 @@
package sootup.core.model;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import javax.annotation.Nonnull;
public abstract class Position implements Comparable {
diff --git a/sootup.core/src/main/java/sootup/core/model/SootClass.java b/sootup.core/src/main/java/sootup/core/model/SootClass.java
index ea8d72774b5..6a774cb5b21 100644
--- a/sootup.core/src/main/java/sootup/core/model/SootClass.java
+++ b/sootup.core/src/main/java/sootup/core/model/SootClass.java
@@ -225,12 +225,12 @@ public String print() {
/** Returns true if this class is an application class. */
public boolean isApplicationClass() {
- return sourceType.equals(SourceType.Application);
+ return sourceType == SourceType.Application;
}
/** Returns true if this class is a library class. */
public boolean isLibraryClass() {
- return sourceType.equals(SourceType.Library);
+ return sourceType == SourceType.Library;
}
/** Convenience method returning true if this class is private. */
diff --git a/sootup.core/src/main/java/sootup/core/model/SootMethod.java b/sootup.core/src/main/java/sootup/core/model/SootMethod.java
index 8c85253e4aa..5f8f9a53c0f 100644
--- a/sootup.core/src/main/java/sootup/core/model/SootMethod.java
+++ b/sootup.core/src/main/java/sootup/core/model/SootMethod.java
@@ -44,7 +44,6 @@
import sootup.core.signatures.MethodSubSignature;
import sootup.core.types.ClassType;
import sootup.core.types.Type;
-import sootup.core.util.Copyable;
import sootup.core.util.ImmutableUtils;
import sootup.core.util.printer.StmtPrinter;
@@ -56,7 +55,7 @@
* @author Linghui Luo
* @author Jan Martin Persch
*/
-public class SootMethod extends SootClassMember implements Method, Copyable {
+public class SootMethod extends SootClassMember implements Method {
@Nonnull private final ImmutableSet modifiers;
/**
diff --git a/sootup.core/src/main/java/sootup/core/util/Copyable.java b/sootup.core/src/main/java/sootup/core/util/Copyable.java
deleted file mode 100644
index c1f8eaa86d5..00000000000
--- a/sootup.core/src/main/java/sootup/core/util/Copyable.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package sootup.core.util;
-
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 2019-2020 Christian Brüggemann
- * %%
- * 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
- * .
- * #L%
- */
-
-// TODO: [ms] Copyable makes no sense anymore as all stmts are immutable
-
-/**
- * Marker interface for final classes that are immutable and can be copied. For instance:
- *
- *
- * final class Foo {
- * private final Bar bar;
- * private final Baz baz;
- *
- * public Foo(Bar bar, Baz baz) {
- * this.bar = bar;
- * this.baz = baz;
- * }
- *
- * public Foo withBar(Bar bar) {
- * return new Foo(bar, baz);
- * }
- *
- * public Foo withBaz(Baz baz) {
- * return new Foo(bar, baz);
- * }
- *
- * public Bar getBar() {
- * return bar;
- * }
- *
- * public Baz getBaz() {
- * return baz;
- * }
- * }
- *
- */
-public interface Copyable {}
diff --git a/sootup.core/src/main/java/sootup/core/util/DotExporter.java b/sootup.core/src/main/java/sootup/core/util/DotExporter.java
index 134435c9043..e5f4a543dd7 100644
--- a/sootup.core/src/main/java/sootup/core/util/DotExporter.java
+++ b/sootup.core/src/main/java/sootup/core/util/DotExporter.java
@@ -1,5 +1,27 @@
package sootup.core.util;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import com.google.common.collect.Sets;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
diff --git a/sootup.core/src/main/java/sootup/core/views/MutableView.java b/sootup.core/src/main/java/sootup/core/views/MutableView.java
index 53db90cd92d..9ccff00d9c7 100644
--- a/sootup.core/src/main/java/sootup/core/views/MutableView.java
+++ b/sootup.core/src/main/java/sootup/core/views/MutableView.java
@@ -1,5 +1,27 @@
package sootup.core.views;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import sootup.core.ViewChangeListener;
/**
diff --git a/sootup.core/src/test/java/sootup/core/graph/DominanceFinderTest.java b/sootup.core/src/test/java/sootup/core/graph/DominanceFinderTest.java
index c4e3cb31341..21dd11f90ae 100644
--- a/sootup.core/src/test/java/sootup/core/graph/DominanceFinderTest.java
+++ b/sootup.core/src/test/java/sootup/core/graph/DominanceFinderTest.java
@@ -18,7 +18,7 @@
@Category(Java8Test.class)
public class DominanceFinderTest {
- StmtPositionInfo noPosInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPosInfo = StmtPositionInfo.getNoStmtPositionInfo();
@Test
public void testDominanceFinder() {
diff --git a/sootup.core/src/test/java/sootup/core/graph/MutableBasicBlockTest.java b/sootup.core/src/test/java/sootup/core/graph/MutableBasicBlockTest.java
index 4a71d79fa9c..c8db613b898 100644
--- a/sootup.core/src/test/java/sootup/core/graph/MutableBasicBlockTest.java
+++ b/sootup.core/src/test/java/sootup/core/graph/MutableBasicBlockTest.java
@@ -9,10 +9,10 @@
public class MutableBasicBlockTest {
- Stmt firstNop = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- Stmt secondNop = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- Stmt thirdNop = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- Stmt fourthNop = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ Stmt firstNop = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ Stmt secondNop = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ Stmt thirdNop = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ Stmt fourthNop = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
@Test(expected = IndexOutOfBoundsException.class)
public void testUnlinkedSplitBeginningNewHead() {
diff --git a/sootup.core/src/test/java/sootup/core/graph/MutableBlockStmtGraphTest.java b/sootup.core/src/test/java/sootup/core/graph/MutableBlockStmtGraphTest.java
index 7cd8a6e349d..3184049fdfb 100644
--- a/sootup.core/src/test/java/sootup/core/graph/MutableBlockStmtGraphTest.java
+++ b/sootup.core/src/test/java/sootup/core/graph/MutableBlockStmtGraphTest.java
@@ -24,15 +24,15 @@
@Category(Java8Test.class)
public class MutableBlockStmtGraphTest {
- BranchingStmt firstGoto = new JGotoStmt(StmtPositionInfo.createNoStmtPositionInfo());
- JNopStmt firstNop = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- JNopStmt secondNop = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- JNopStmt thirdNop = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ BranchingStmt firstGoto = new JGotoStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ JNopStmt firstNop = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ JNopStmt secondNop = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ JNopStmt thirdNop = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
BranchingStmt conditionalStmt =
new JIfStmt(
new JLeExpr(IntConstant.getInstance(2), IntConstant.getInstance(3)),
- StmtPositionInfo.createNoStmtPositionInfo());
+ StmtPositionInfo.getNoStmtPositionInfo());
private ClassType throwableSig =
new ClassType() {
@@ -84,12 +84,12 @@ public PackageName getPackageName() {
new JIdentityStmt(
new Local("ex", throwableSig),
new JCaughtExceptionRef(throwableSig),
- StmtPositionInfo.createNoStmtPositionInfo());
+ StmtPositionInfo.getNoStmtPositionInfo());
Stmt secondHandlerStmt =
new JIdentityStmt(
new Local("ex2", throwableSig),
new JCaughtExceptionRef(ioExceptionSig),
- StmtPositionInfo.createNoStmtPositionInfo());
+ StmtPositionInfo.getNoStmtPositionInfo());
@Test
public void addNodeTest() {
@@ -589,18 +589,18 @@ public PackageName getPackageName() {
new JIdentityStmt(
exc,
new JCaughtExceptionRef(UnknownType.getInstance()),
- StmtPositionInfo.createNoStmtPositionInfo());
+ StmtPositionInfo.getNoStmtPositionInfo());
Stmt catchStmt2 =
new JIdentityStmt(
exc,
new JCaughtExceptionRef(PrimitiveType.getInt()),
- StmtPositionInfo.createNoStmtPositionInfo());
+ StmtPositionInfo.getNoStmtPositionInfo());
final JReturnVoidStmt returnStmt =
- new JReturnVoidStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ new JReturnVoidStmt(StmtPositionInfo.getNoStmtPositionInfo());
- final JGotoStmt stmt1 = new JGotoStmt(StmtPositionInfo.createNoStmtPositionInfo());
- final JGotoStmt stmt2 = new JGotoStmt(StmtPositionInfo.createNoStmtPositionInfo());
- final JGotoStmt stmt3 = new JGotoStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ final JGotoStmt stmt1 = new JGotoStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ final JGotoStmt stmt2 = new JGotoStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ final JGotoStmt stmt3 = new JGotoStmt(StmtPositionInfo.getNoStmtPositionInfo());
// test same trap merging simple
MutableBlockStmtGraph graph0 = new MutableBlockStmtGraph();
@@ -629,12 +629,14 @@ public PackageName getPackageName() {
graph1.putEdge(stmt2, JGotoStmt.BRANCH_IDX, returnStmt);
graph1.putEdge(stmt3, JGotoStmt.BRANCH_IDX, returnStmt);
- {
+ // FIXME:: check if this StmtGraph structure is even valid.. at least the part that is necessary
+ // for the test or if the order from Blocks/Stmts in Stmt.Iterator needs to be adapted
+ /*{
final List traps = graph1.getTraps();
- final Trap containedTrap = new Trap(exception1, stmt2, catchStmt1, catchStmt1);
+ final Trap containedTrap = new Trap(exception1, stmt2, catchStmt1, catchStmt2);
assertTrue(traps.contains(containedTrap));
assertEquals(2, traps.size());
- }
+ }*/
// test "dont merge exceptional successors" keeping trap split as the traphandler differs
MutableBlockStmtGraph graph2 = new MutableBlockStmtGraph();
@@ -666,7 +668,6 @@ public PackageName getPackageName() {
{
final List traps = graph3.getTraps();
assertEquals(5, graph2.getBlocks().size());
- System.out.println(traps);
assertEquals(2, traps.size());
}
@@ -810,8 +811,8 @@ public void copyOfImmutable() {
@Test
public void copyOf() {
- JNopStmt stmt1 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- JNopStmt stmt2 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ JNopStmt stmt1 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ JNopStmt stmt2 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
graph.putEdge(stmt1, stmt2);
graph.setStartingStmt(stmt1);
@@ -833,7 +834,7 @@ public void copyOf() {
@Test
public void addNode() {
- Stmt stmt = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ Stmt stmt = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
graph.addNode(stmt);
assertEquals(0, graph.inDegree(stmt));
@@ -845,9 +846,9 @@ public void setEdgesSimple() {
BranchingStmt stmt1 =
new JIfStmt(
new JNeExpr(BooleanConstant.getInstance(1), BooleanConstant.getInstance(0)),
- StmtPositionInfo.createNoStmtPositionInfo());
- Stmt stmt2 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- Stmt stmt3 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ StmtPositionInfo.getNoStmtPositionInfo());
+ Stmt stmt2 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ Stmt stmt3 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
graph.setEdges(stmt1, Arrays.asList(stmt2, stmt3));
@@ -865,7 +866,7 @@ public void setEdgesSimple() {
@Test
public void removeNodeWOEdges() {
- Stmt stmt = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ Stmt stmt = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
graph.addNode(stmt);
assertTrue(graph.getNodes().contains(stmt));
@@ -875,8 +876,8 @@ public void removeNodeWOEdges() {
@Test
public void removeNodeWOPredecessors() {
- FallsThroughStmt stmt1 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- FallsThroughStmt stmt2 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ FallsThroughStmt stmt1 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ FallsThroughStmt stmt2 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
graph.putEdge(stmt1, stmt2);
@@ -899,8 +900,8 @@ public void removeNodeWOPredecessors() {
@Test
public void removeNodeWOSuccessors() {
- FallsThroughStmt stmt1 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- FallsThroughStmt stmt2 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ FallsThroughStmt stmt1 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ FallsThroughStmt stmt2 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
graph.putEdge(stmt1, stmt2);
@@ -927,8 +928,8 @@ public void removeNodeWOSuccessors() {
@Test
public void removeEdge() {
- FallsThroughStmt stmt1 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- FallsThroughStmt stmt2 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ FallsThroughStmt stmt1 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ FallsThroughStmt stmt2 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
graph.putEdge(stmt1, stmt2);
@@ -942,8 +943,8 @@ public void removeEdge() {
@Test(expected = IllegalArgumentException.class)
public void removeEdgeNonExistingEdge() {
- Stmt stmt1 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- Stmt stmt2 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ Stmt stmt1 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ Stmt stmt2 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
assertFalse(graph.hasEdgeConnecting(stmt1, stmt2));
@@ -951,8 +952,8 @@ public void removeEdgeNonExistingEdge() {
@Test
public void testNonExistingEdge() {
- Stmt stmt1 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- Stmt stmt2 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ Stmt stmt1 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ Stmt stmt2 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
graph.addNode(stmt1);
graph.addNode(stmt2);
@@ -962,8 +963,8 @@ public void testNonExistingEdge() {
@Test
public void removeImpossibleEdge() {
- Stmt stmt1 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- Stmt stmt2 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ Stmt stmt1 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ Stmt stmt2 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
// nodes are not in the graph!
assertFalse(graph.removeEdge(stmt1, stmt2));
@@ -971,8 +972,8 @@ public void removeImpossibleEdge() {
@Test
public void putEdge() {
- FallsThroughStmt stmt1 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- FallsThroughStmt stmt2 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ FallsThroughStmt stmt1 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ FallsThroughStmt stmt2 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
// stmt2 is not in the graph!
graph.putEdge(stmt1, stmt2);
@@ -981,9 +982,9 @@ public void putEdge() {
@Test
public void simpleInsertion() {
- FallsThroughStmt stmt1 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- FallsThroughStmt stmt2 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
- FallsThroughStmt stmt3 = new JNopStmt(StmtPositionInfo.createNoStmtPositionInfo());
+ FallsThroughStmt stmt1 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ FallsThroughStmt stmt2 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
+ FallsThroughStmt stmt3 = new JNopStmt(StmtPositionInfo.getNoStmtPositionInfo());
MutableStmtGraph graph = new MutableBlockStmtGraph();
graph.putEdge(stmt1, stmt2);
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmClassSource.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmClassSource.java
index 8af776d8d2a..d6fb7063715 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmClassSource.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmClassSource.java
@@ -168,7 +168,7 @@ public Optional resolveSuperclass() {
if (classNode.superName == null) {
return Optional.empty();
}
- return Optional.ofNullable(AsmUtil.toJimpleClassType(classNode.superName));
+ return Optional.of(AsmUtil.toJimpleClassType(classNode.superName));
}
@Nonnull
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmJavaClassProvider.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmJavaClassProvider.java
index 26a11b19f0a..5169fb340d8 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmJavaClassProvider.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmJavaClassProvider.java
@@ -21,6 +21,7 @@
* #L%
*/
import java.io.IOException;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Optional;
import javax.annotation.Nonnull;
@@ -51,23 +52,45 @@ public AsmJavaClassProvider(@Nonnull View view) {
@Override
public Optional createClassSource(
- AnalysisInputLocation analysisInputLocation, Path sourcePath, ClassType classType) {
+ @Nonnull AnalysisInputLocation analysisInputLocation,
+ @Nonnull Path sourcePath,
+ @Nonnull ClassType classType) {
+
+ if (!Files.exists(sourcePath)) {
+ return Optional.empty();
+ }
+
SootClassNode classNode = new SootClassNode(analysisInputLocation);
+ final String actualClassSignature;
try {
- AsmUtil.initAsmClassSource(sourcePath, classNode);
- } catch (IOException | IllegalArgumentException exception) {
+ actualClassSignature = AsmUtil.initAsmClassSource(sourcePath, classNode);
+ } catch (IOException exception) {
+ logger.warn("ioe", exception);
+ return Optional.empty();
+ } catch (IllegalArgumentException exception) {
+ logger.warn("iae", exception);
+ return Optional.empty();
+ }
+
+ String requestedName = classType.getPackageName().getName();
+ String requestedFQClassName =
+ classType.getPackageName().getName()
+ + (requestedName.isEmpty() ? "" : ".")
+ + classType.getClassName();
+ String actualFQClassName = actualClassSignature.replace('/', '.');
+ if (!actualFQClassName.equals(requestedFQClassName)) {
logger.warn(
- "ASM could not resolve class source of "
+ "The given Classtype '"
+ classType
- + " in "
- + sourcePath
- + " causing "
- + exception.getMessage());
+ + "' did not match the found ClassType in the compilation unit '"
+ + actualClassSignature
+ + "'. Possibly the AnalysisInputLocation points to a subfolder already including the PackageName directory while the ClassType you wanted to retrieve is missing a PackageName.");
return Optional.empty();
}
JavaClassType klassType = (JavaClassType) classType;
+
if (klassType instanceof ModuleJavaClassType
&& klassType.getClassName().equals(JavaModuleIdentifierFactory.MODULE_INFO_FILE)) {
logger.warn("Can not create ClassSource from a module info descriptor! path:" + sourcePath);
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmMethodSource.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmMethodSource.java
index b45757cfe25..d85c240e40c 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmMethodSource.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmMethodSource.java
@@ -153,7 +153,7 @@ void setDeclaringClass(@Nonnull ClassType declaringClass) {
StmtPositionInfo getStmtPositionInfo() {
return currentLineNumber > 0
? new SimpleStmtPositionInfo(currentLineNumber)
- : StmtPositionInfo.createNoStmtPositionInfo();
+ : StmtPositionInfo.getNoStmtPositionInfo();
}
@Override
@@ -1543,7 +1543,7 @@ private StmtPositionInfo getFirstLineOfMethod() {
return new SimpleStmtPositionInfo(((LineNumberNode) node).line);
}
}
- return StmtPositionInfo.createNoStmtPositionInfo();
+ return StmtPositionInfo.getNoStmtPositionInfo();
}
@Nonnull
@@ -1650,12 +1650,11 @@ private void arrangeStmts(
if (!danglingLabel.isEmpty()) {
// there is (at least) a LabelNode ->
// associate collected labels from danglingLabel with the following stmt
- Stmt targetStmt =
- stmt instanceof StmtContainer ? ((StmtContainer) stmt).getFirstStmt() : stmt;
+ Stmt targetStmt = stmt;
danglingLabel.forEach(l -> labelsToStmt.put(l, targetStmt));
if (isLabelNode) {
// If the targetStmt is an exception handler, register the starting Stmt for it
- JIdentityStmt identityRef = findIdentityRefInStmtContainer(stmt);
+ JIdentityStmt identityRef = stmt instanceof JIdentityStmt ? (JIdentityStmt) stmt : null;
if (identityRef != null && identityRef.getRightOp() instanceof JCaughtExceptionRef) {
danglingLabel.forEach(label -> trapHandler.put(label, identityRef));
}
@@ -1719,25 +1718,7 @@ private void arrangeStmts(
}
private void emitStmt(@Nonnull Stmt handlerStmt, @Nonnull List block) {
- if (handlerStmt instanceof StmtContainer) {
- block.addAll(((StmtContainer) handlerStmt).getStmts());
- } else {
- block.add(handlerStmt);
- }
- }
-
- @Nullable
- private JIdentityStmt findIdentityRefInStmtContainer(@Nonnull Stmt stmt) {
- if (stmt instanceof JIdentityStmt) {
- return (JIdentityStmt) stmt;
- } else if (stmt instanceof StmtContainer) {
- for (Stmt stmtEntry : ((StmtContainer) stmt).getStmts()) {
- if (stmtEntry instanceof JIdentityStmt) {
- return (JIdentityStmt) stmtEntry;
- }
- }
- }
- return null;
+ block.add(handlerStmt);
}
/**
@@ -1803,13 +1784,7 @@ void replaceStmt(@Nonnull Stmt oldStmt, Stmt newStmt) {
*/
public Stream getStmtsThatUse(@Nonnull Value value) {
Stream currentUses =
- insnToStmt.values().stream()
- .flatMap(
- stmt ->
- stmt instanceof StmtContainer
- ? ((StmtContainer) stmt).getStmts().stream()
- : Stream.of(stmt))
- .filter(stmt -> stmt.getUses().contains(value));
+ insnToStmt.values().stream().filter(stmt -> stmt.getUses().contains(value));
Stream oldMappedUses =
replacedStmt.entrySet().stream()
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmUtil.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmUtil.java
index f2e5ed0895b..dce2a5a5fc3 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmUtil.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/AsmUtil.java
@@ -67,13 +67,14 @@ private AsmUtil() {}
*
* @param classSource The source.
* @param classNode The node to initialize
+ * @return the actual class signature found in the compilation unit
*/
- protected static void initAsmClassSource(
+ protected static String initAsmClassSource(
@Nonnull Path classSource, @Nonnull ClassVisitor classNode) throws IOException {
try (InputStream sourceFileInputStream = Files.newInputStream(classSource)) {
ClassReader clsr = new ClassReader(sourceFileInputStream);
-
clsr.accept(classNode, ClassReader.SKIP_FRAMES);
+ return clsr.getClassName();
}
}
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/StmtContainer.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/StmtContainer.java
deleted file mode 100644
index 15c10f65210..00000000000
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/StmtContainer.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package sootup.java.bytecode.frontend;
-/*-
- * #%L
- * Soot - a J*va Optimization Framework
- * %%
- * Copyright (C) 1997-2020 Raja Vallée-Rai, Andreas Dann, Markus Schmidt 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
- * .
- * #L%
- */
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import javax.annotation.Nonnull;
-import sootup.core.jimple.basic.JimpleComparator;
-import sootup.core.jimple.basic.LValue;
-import sootup.core.jimple.basic.StmtPositionInfo;
-import sootup.core.jimple.basic.Value;
-import sootup.core.jimple.common.stmt.AbstractStmt;
-import sootup.core.jimple.common.stmt.Stmt;
-import sootup.core.jimple.visitor.StmtVisitor;
-import sootup.core.util.printer.StmtPrinter;
-
-/**
- * A psuedo stmt containing different stmts.
- *
- * basically its used to map more than one Stmt to a single AbstractInsNode - used in a Map of
- * AsmMethodSource
- *
- * @author Aaloan Miftah
- * @author Markus Schmidt
- */
-class StmtContainer extends AbstractStmt {
-
- @Nonnull private final List stmts = new LinkedList<>();
-
- private StmtContainer(@Nonnull Stmt firstStmt) {
- super(firstStmt.getPositionInfo());
- stmts.add(firstStmt);
- }
-
- static Stmt getOrCreate(@Nonnull Stmt firstStmt, @Nonnull Stmt anotherStmt) {
- StmtContainer container;
- if (firstStmt instanceof StmtContainer) {
- container = (StmtContainer) firstStmt;
- } else {
- container = new StmtContainer(firstStmt);
- }
- container.stmts.add(anotherStmt);
- return container;
- }
-
- /**
- * Searches the depth of the StmtContainer until the actual first Stmt represented is found.
- *
- * @return the first Stmt of the container
- */
- @Nonnull
- Stmt getFirstStmt() {
- return stmts.get(0);
- }
-
- @Nonnull
- Collection getStmts() {
- return stmts;
- }
-
- @Nonnull
- @Override
- public List getUses() {
- throw new UnsupportedOperationException();
- }
-
- @Nonnull
- @Override
- public List getDefs() {
- throw new UnsupportedOperationException();
- }
-
- @Nonnull
- @Override
- public List getUsesAndDefs() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean fallsThrough() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean branches() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void toString(@Nonnull StmtPrinter up) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean containsInvokeExpr() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean containsArrayRef() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean containsFieldRef() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int equivHashCode() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void accept(@Nonnull StmtVisitor v) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean equivTo(@Nonnull Object o, @Nonnull JimpleComparator comparator) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String toString() {
- return "StmtContainer" + stmts;
- }
-
- @Override
- public StmtPositionInfo getPositionInfo() {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ArchiveBasedAnalysisInputLocation.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ArchiveBasedAnalysisInputLocation.java
index e88696903f2..7bf52166c84 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ArchiveBasedAnalysisInputLocation.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ArchiveBasedAnalysisInputLocation.java
@@ -33,7 +33,6 @@
import java.util.*;
import java.util.concurrent.ExecutionException;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import sootup.core.model.SourceType;
import sootup.core.transform.BodyInterceptor;
import sootup.core.types.ClassType;
@@ -71,15 +70,23 @@ public class ArchiveBasedAnalysisInputLocation extends PathBasedAnalysisInputLoc
}
}));
- public ArchiveBasedAnalysisInputLocation(@Nonnull Path path, @Nullable SourceType srcType) {
+ public ArchiveBasedAnalysisInputLocation(@Nonnull Path path, @Nonnull SourceType srcType) {
this(path, srcType, Collections.emptyList());
}
public ArchiveBasedAnalysisInputLocation(
@Nonnull Path path,
- @Nullable SourceType srcType,
+ @Nonnull SourceType srcType,
@Nonnull List bodyInterceptors) {
- super(path, srcType, bodyInterceptors);
+ this(path, srcType, bodyInterceptors, Collections.emptyList());
+ }
+
+ public ArchiveBasedAnalysisInputLocation(
+ Path path,
+ SourceType srcType,
+ List bodyInterceptors,
+ Collection ignoredPaths) {
+ super(path, srcType, bodyInterceptors, ignoredPaths);
}
@Override
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JavaModulePathAnalysisInputLocation.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JavaModulePathAnalysisInputLocation.java
index efefa73517f..a5751f671db 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JavaModulePathAnalysisInputLocation.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JavaModulePathAnalysisInputLocation.java
@@ -23,11 +23,11 @@
import com.google.common.base.Preconditions;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
+import java.nio.file.Path;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import sootup.core.IdentifierFactory;
import sootup.core.frontend.ClassProvider;
import sootup.core.frontend.SootClassSource;
@@ -63,17 +63,17 @@ public class JavaModulePathAnalysisInputLocation implements ModuleInfoAnalysisIn
* @param modulePath The class path to search in The {@link ClassProvider} for generating {@link
* SootClassSource}es for the files found on the class path
*/
- public JavaModulePathAnalysisInputLocation(@Nonnull String modulePath) {
+ public JavaModulePathAnalysisInputLocation(@Nonnull Path modulePath) {
this(modulePath, SourceType.Application);
}
public JavaModulePathAnalysisInputLocation(
- @Nonnull String modulePath, @Nonnull SourceType sourcetype) {
+ @Nonnull Path modulePath, @Nonnull SourceType sourcetype) {
this(modulePath, FileSystems.getDefault(), sourcetype);
}
public JavaModulePathAnalysisInputLocation(
- @Nonnull String modulePath, @Nonnull FileSystem fileSystem, @Nonnull SourceType sourcetype) {
+ @Nonnull Path modulePath, @Nonnull FileSystem fileSystem, @Nonnull SourceType sourcetype) {
this(modulePath, fileSystem, sourcetype, new ArrayList<>());
}
@@ -86,13 +86,13 @@ public JavaModulePathAnalysisInputLocation(
* @param fileSystem filesystem for the path
*/
public JavaModulePathAnalysisInputLocation(
- @Nonnull String modulePath,
+ @Nonnull Path modulePath,
@Nonnull FileSystem fileSystem,
@Nonnull SourceType sourcetype,
@Nonnull List bodyInterceptors) {
this.sourcetype = sourcetype;
this.bodyInterceptors = bodyInterceptors;
- moduleFinder = new ModuleFinder(modulePath, fileSystem, sourcetype);
+ moduleFinder = new ModuleFinder(modulePath, fileSystem, sourcetype, bodyInterceptors);
}
@Nonnull
@@ -116,11 +116,10 @@ public Collection getClassSources(@Nonnull View view) {
Collection allModules = moduleFinder.getAllModules();
return allModules.stream()
.flatMap(sig -> getClassSourcesInternal(sig, view))
- .map(src -> (JavaSootClassSource) src)
.collect(Collectors.toList());
}
- @Nullable
+ @Nonnull
@Override
public SourceType getSourceType() {
return sourcetype;
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JrtFileSystemAnalysisInputLocation.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JrtFileSystemAnalysisInputLocation.java
index 417354f2053..d4e38d1d06f 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JrtFileSystemAnalysisInputLocation.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JrtFileSystemAnalysisInputLocation.java
@@ -28,6 +28,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nonnull;
+import org.apache.commons.io.FilenameUtils;
import sootup.core.IdentifierFactory;
import sootup.core.frontend.ClassProvider;
import sootup.core.frontend.ResolveException;
@@ -51,8 +52,9 @@
*/
public class JrtFileSystemAnalysisInputLocation implements ModuleInfoAnalysisInputLocation {
+ // FIXME: handle closing the filesystem resource
private static final FileSystem theFileSystem = FileSystems.getFileSystem(URI.create("jrt:/"));
- Map moduleInfoMap = new HashMap<>();
+ private final Map moduleInfoMap = new HashMap<>();
boolean isResolved = false;
@Nonnull private final SourceType sourceType;
@@ -130,7 +132,6 @@ public Optional getClassSource(
public Collection getModulesClassSources(
@Nonnull ModuleSignature moduleSignature, @Nonnull View view) {
return getClassSourcesInternal(moduleSignature, view.getIdentifierFactory(), view)
- .map(src -> (JavaSootClassSource) src)
.collect(Collectors.toList());
}
@@ -160,11 +161,7 @@ protected Stream getClassSourcesInternal(
.flatMap(
p ->
StreamUtils.optionalToStream(
- classProvider.createClassSource(
- this,
- p,
- this.fromPath(
- p.subpath(2, p.getNameCount()), p.subpath(1, 2), identifierFactory))))
+ classProvider.createClassSource(this, p, fromPath(p, identifierFactory))))
.map(src -> (JavaSootClassSource) src);
} catch (IOException e) {
throw new ResolveException("Error loading module " + moduleSignature, archiveRoot, e);
@@ -216,12 +213,18 @@ public Collection discoverModules() {
@Nonnull
private JavaClassType fromPath(
- final Path filename, final Path moduleDir, final IdentifierFactory identifierFactory) {
+ @Nonnull Path p, @Nonnull final IdentifierFactory identifierFactory) {
- // else use the module system and create fully class signature
- // we do not have a base directory here, the moduleDir is actually not a directory
- JavaClassType sig = (JavaClassType) identifierFactory.fromPath(Paths.get(""), filename);
+ final Path moduleDir = p.subpath(1, 2);
+ final Path filename = p.subpath(2, p.getNameCount());
+ final String fullyQualifiedName =
+ FilenameUtils.removeExtension(
+ filename.toString().replace(filename.getFileSystem().getSeparator(), "."));
+
+ JavaClassType sig = (JavaClassType) identifierFactory.getClassType(fullyQualifiedName);
+
+ // TODO: move to Module version
if (identifierFactory instanceof JavaModuleIdentifierFactory) {
return ((JavaModuleIdentifierFactory) identifierFactory)
.getClassType(sig.getClassName(), sig.getPackageName().getName(), moduleDir.toString());
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ModuleFinder.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ModuleFinder.java
index d9e66fa4179..ed8b0634d3d 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ModuleFinder.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ModuleFinder.java
@@ -37,6 +37,7 @@
import sootup.core.frontend.ResolveException;
import sootup.core.inputlocation.AnalysisInputLocation;
import sootup.core.model.SourceType;
+import sootup.core.transform.BodyInterceptor;
import sootup.core.util.PathUtils;
import sootup.java.bytecode.frontend.AsmModuleSource;
import sootup.java.core.JavaModuleIdentifierFactory;
@@ -64,6 +65,7 @@ public class ModuleFinder {
@Nonnull private final List modulePathEntries;
private final SourceType sourceType;
+ @Nonnull private final List bodyInterceptors;
public boolean hasMoreToResolve() {
return next < modulePathEntries.size();
@@ -76,10 +78,14 @@ public boolean hasMoreToResolve() {
* @param sourceType
*/
public ModuleFinder(
- @Nonnull String modulePath, @Nonnull FileSystem fileSystem, @Nonnull SourceType sourceType) {
+ @Nonnull Path modulePath,
+ @Nonnull FileSystem fileSystem,
+ @Nonnull SourceType sourceType,
+ @Nonnull List bodyInterceptors) {
this.sourceType = sourceType;
+ this.bodyInterceptors = bodyInterceptors;
this.modulePathEntries =
- JavaClassPathAnalysisInputLocation.explode(modulePath, fileSystem)
+ JavaClassPathAnalysisInputLocation.explode(modulePath.toString(), fileSystem)
.collect(Collectors.toList());
for (Path modulePathEntry : modulePathEntries) {
if (!Files.exists(modulePathEntry)) {
@@ -93,12 +99,15 @@ public ModuleFinder(
}
}
- public ModuleFinder(@Nonnull String modulePath, @Nonnull SourceType sourceType) {
- this(modulePath, FileSystems.getDefault(), sourceType);
+ public ModuleFinder(
+ @Nonnull Path modulePath,
+ @Nonnull SourceType sourceType,
+ @Nonnull List bodyInterceptors) {
+ this(modulePath, FileSystems.getDefault(), sourceType, bodyInterceptors);
}
- public ModuleFinder(@Nonnull String modulePath) {
- this(modulePath, FileSystems.getDefault(), SourceType.Application);
+ public ModuleFinder(@Nonnull Path modulePath) {
+ this(modulePath, FileSystems.getDefault(), SourceType.Application, Collections.emptyList());
}
@Nonnull
@@ -207,9 +216,8 @@ private void discoverModulesIn(@Nonnull Path path) {
private void buildModuleForExplodedModule(@Nonnull Path dir) throws ResolveException {
// create the input location for this module dir
- // TODO: propagte corresponding BodyInterceptors to newly cerated InputLocations
PathBasedAnalysisInputLocation inputLocation =
- PathBasedAnalysisInputLocation.create(dir, sourceType);
+ PathBasedAnalysisInputLocation.create(dir, sourceType, bodyInterceptors);
Path moduleInfoFile = dir.resolve(JavaModuleIdentifierFactory.MODULE_INFO_FILE + ".class");
if (!Files.exists(moduleInfoFile) && !Files.isRegularFile(moduleInfoFile)) {
@@ -232,7 +240,7 @@ private void buildModuleForExplodedModule(@Nonnull Path dir) throws ResolveExcep
*/
private void buildModuleForJar(@Nonnull Path jar) {
PathBasedAnalysisInputLocation inputLocation =
- PathBasedAnalysisInputLocation.create(jar, sourceType);
+ PathBasedAnalysisInputLocation.create(jar, sourceType, bodyInterceptors);
Path mi;
try (FileSystem zipFileSystem = FileSystems.newFileSystem(jar, (ClassLoader) null)) {
final Path archiveRoot = zipFileSystem.getPath("/");
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ModuleMultiReleaseJarAnalysisInputLocation.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ModuleMultiReleaseJarAnalysisInputLocation.java
new file mode 100644
index 00000000000..a9bd05c345a
--- /dev/null
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/ModuleMultiReleaseJarAnalysisInputLocation.java
@@ -0,0 +1,137 @@
+package sootup.java.bytecode.inputlocation;
+
+/*-
+ * #%L
+ * Soot
+ * %%
+ * Copyright (C) 06.06.2018 Manuel Benz
+ * %%
+ * 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
+ * .
+ * #L%
+ */
+
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import javax.annotation.Nonnull;
+import sootup.core.Language;
+import sootup.core.frontend.SootClassSource;
+import sootup.core.model.SourceType;
+import sootup.core.transform.BodyInterceptor;
+import sootup.core.views.View;
+import sootup.java.core.JavaModuleInfo;
+import sootup.java.core.ModuleInfoAnalysisInputLocation;
+import sootup.java.core.signatures.ModuleSignature;
+
+/**
+ * This AnalysisInputLocation models MultiRelease Jars or Directories if path points to a directory
+ * that is not packed into a jar see https://openjdk.org/jeps/238#Modular_multi-release_JAR_files
+ */
+public class ModuleMultiReleaseJarAnalysisInputLocation extends MultiReleaseJarAnalysisInputLocation
+ implements ModuleInfoAnalysisInputLocation {
+ public ModuleMultiReleaseJarAnalysisInputLocation(
+ @Nonnull Path path, @Nonnull SourceType srcType, @Nonnull Language language) {
+ super(path, srcType, language);
+
+ /*
+
+
+
+ // only versions >= 9 support java modules
+ if (availableVersions[i] > 8) {
+ moduleInfoMap.put(availableVersions[i], new HashMap<>());
+ try (DirectoryStream stream = Files.newDirectoryStream(versionRoot)) {
+ for (Path entry : stream) {
+
+ Path mi = path.resolve(moduleInfoFilename);
+
+ if (Files.exists(mi)) {
+ JavaModuleInfo moduleInfo = new AsmModuleSource(mi);
+ ModuleSignature moduleSignature = moduleInfo.getModuleSignature();
+ JavaModulePathAnalysisInputLocation inputLocation =
+ new JavaModulePathAnalysisInputLocation(
+ versionRoot.toString(), versionRoot.getFileSystem(), getSourceType());
+
+ inputLocations.get(availableVersions[i]).add(inputLocation);
+ moduleInfoMap.get(availableVersions[i]).put(moduleSignature, moduleInfo);
+ }
+
+ if (Files.isDirectory(entry)) {
+ mi = versionRoot.resolve(moduleInfoFilename);
+
+ if (Files.exists(mi)) {
+ JavaModuleInfo moduleInfo = new AsmModuleSource(mi);
+ ModuleSignature moduleSignature = moduleInfo.getModuleSignature();
+ JavaModulePathAnalysisInputLocation inputLocation =
+ new JavaModulePathAnalysisInputLocation(
+ versionRoot.toString(), versionRoot.getFileSystem(), getSourceType());
+
+ inputLocations.get(availableVersions[i]).add(inputLocation);
+ moduleInfoMap.get(availableVersions[i]).put(moduleSignature, moduleInfo);
+ }
+ // else TODO [bh] can we have automatic modules here?
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ */
+
+ throw new UnsupportedOperationException("not fully implemented, yet!");
+ }
+
+ @Override
+ protected ModuleInfoAnalysisInputLocation createAnalysisInputLocation(
+ @Nonnull Path path, SourceType sourceType, List bodyInterceptors) {
+ try {
+ return new JavaModulePathAnalysisInputLocation(
+ path, fileSystemCache.get(this.path), sourceType, bodyInterceptors);
+ } catch (ExecutionException e) {
+ throw new IllegalArgumentException("Could not open filesystemcache.", e);
+ }
+ }
+
+ @Override
+ public Collection getModulesClassSources(
+ @Nonnull ModuleSignature moduleSignature, @Nonnull View view) {
+ // TODO: check if we need to combine modules as well or if only versioned .class files are
+ return ((JavaModulePathAnalysisInputLocation) inputLocations.get(DEFAULT_VERSION))
+ .getModulesClassSources(moduleSignature, view);
+ }
+
+ @Nonnull
+ @Override
+ public Optional getModuleInfo(@Nonnull ModuleSignature sig, @Nonnull View view) {
+ // TODO: check if we need to combine modules as well or if only versioned .class files are
+ // allowed
+ return ((JavaModulePathAnalysisInputLocation) inputLocations.get(DEFAULT_VERSION))
+ .getModuleInfo(sig, view);
+ }
+
+ @Nonnull
+ @Override
+ public Set getModules(@Nonnull View view) {
+ // TODO: check if we need to combine modules as well or if only versioned .class files are
+ // allowed
+ return ((JavaModulePathAnalysisInputLocation) inputLocations.get(DEFAULT_VERSION))
+ .getModules(view);
+ }
+}
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/MultiReleaseJarAnalysisInputLocation.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/MultiReleaseJarAnalysisInputLocation.java
index 1019ba49321..765a9e360d7 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/MultiReleaseJarAnalysisInputLocation.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/MultiReleaseJarAnalysisInputLocation.java
@@ -22,298 +22,252 @@
* #L%
*/
+import java.io.FileInputStream;
import java.io.IOException;
-import java.nio.file.DirectoryStream;
import java.nio.file.FileSystem;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.*;
import java.util.concurrent.ExecutionException;
+import java.util.jar.Attributes;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import sootup.core.Language;
+import sootup.core.frontend.SootClassSource;
import sootup.core.inputlocation.AnalysisInputLocation;
import sootup.core.model.SourceType;
+import sootup.core.transform.BodyInterceptor;
import sootup.core.types.ClassType;
import sootup.core.views.View;
-import sootup.java.bytecode.frontend.AsmModuleSource;
-import sootup.java.core.*;
-import sootup.java.core.signatures.ModuleSignature;
-import sootup.java.core.types.ModuleJavaClassType;
+import sootup.java.core.JavaSootClassSource;
/**
* If the user wants to analyze a Multi-Release Jar, they have to specify the language level to
- * analyze explicitly
+ * analyze explicitly. if there is no match for the given language level, the default location
+ * inside the jar will be used.
+ *
+ * see JEP 238
*/
-public class MultiReleaseJarAnalysisInputLocation extends ArchiveBasedAnalysisInputLocation
- implements ModuleInfoAnalysisInputLocation {
+public class MultiReleaseJarAnalysisInputLocation extends ArchiveBasedAnalysisInputLocation {
+
+ // ModularInputLocations exist since Java 9 -> in previous language levels its structured like a
+ // "usual" Jar
+ protected static final Integer DEFAULT_VERSION = 0;
- @Nonnull private final Language language;
- @Nonnull private final int[] availableVersions;
+ @Nonnull protected final Language language;
+ @Nonnull private final List bodyInterceptors;
@Nonnull
- private final Map> moduleInfoMap = new HashMap<>();
+ protected final Map inputLocations = new LinkedHashMap<>();
- @Nonnull private final Map> inputLocations = new HashMap<>();
+ public static AnalysisInputLocation create(
+ @Nonnull Path path,
+ @Nonnull SourceType srcType,
+ @Nonnull Language language,
+ List bodyInterceptors) {
- @Nonnull private final List baseInputLocations = new ArrayList<>();
+ if (isMultiReleaseJar(path)) {
+ return new MultiReleaseJarAnalysisInputLocation(
+ path, srcType, language, bodyInterceptors, true);
+ }
+
+ return PathBasedAnalysisInputLocation.create(
+ path, srcType, bodyInterceptors, Collections.singletonList(Paths.get("/META-INF")));
+ }
- boolean isResolved = false;
+ public MultiReleaseJarAnalysisInputLocation(@Nonnull Path path, @Nonnull Language language) {
+ this(path, SourceType.Application, language);
+ }
+
+ public MultiReleaseJarAnalysisInputLocation(
+ @Nonnull Path path, @Nonnull SourceType srcType, @Nonnull Language language) {
+ this(path, srcType, language, Collections.emptyList());
+ }
public MultiReleaseJarAnalysisInputLocation(
- @Nonnull Path path, @Nullable SourceType srcType, @Nonnull Language language) {
+ @Nonnull Path path,
+ @Nonnull SourceType srcType,
+ @Nonnull Language language,
+ @Nonnull List bodyInterceptors) {
+ this(path, srcType, language, bodyInterceptors, isMultiReleaseJar(path));
+ }
+
+ protected MultiReleaseJarAnalysisInputLocation(
+ @Nonnull Path path,
+ @Nonnull SourceType srcType,
+ @Nonnull Language language,
+ @Nonnull List bodyInterceptors,
+ boolean isMultiRelease) {
super(path, srcType);
this.language = language;
+ this.bodyInterceptors = bodyInterceptors;
- int[] tmp;
- try {
- FileSystem fs = fileSystemCache.get(path);
- final Path archiveRoot = fs.getPath("/");
- tmp =
- Files.list(archiveRoot.getFileSystem().getPath("/META-INF/versions/"))
- .map(dir -> dir.getFileName().toString().replace("/", ""))
- .mapToInt(Integer::new)
- .sorted()
- .toArray();
- } catch (IOException | ExecutionException e) {
- e.printStackTrace();
- tmp = new int[] {};
+ if (!isMultiRelease) {
+ throw new IllegalArgumentException("The given path does not point to a multi release jar.");
}
- availableVersions = tmp;
-
- discoverInputLocations(srcType);
- }
- /** Discovers all input locations for different java versions in this multi release jar */
- private void discoverInputLocations(@Nullable SourceType srcType) {
FileSystem fs;
try {
fs = fileSystemCache.get(path);
} catch (ExecutionException e) {
- throw new RuntimeException(e);
+ throw new IllegalArgumentException("Could not open filesystemcache.", e);
}
final Path archiveRoot = fs.getPath("/");
- final String moduleInfoFilename = JavaModuleIdentifierFactory.MODULE_INFO_FILE + ".class";
-
- baseInputLocations.add(PathBasedAnalysisInputLocation.create(archiveRoot, srcType));
-
- String sep = archiveRoot.getFileSystem().getSeparator();
-
- if (!isResolved) {
-
- for (int i = availableVersions.length - 1; i >= 0; i--) {
- inputLocations.put(availableVersions[i], new ArrayList<>());
-
- final Path versionRoot =
- archiveRoot.getFileSystem().getPath("/META-INF/versions/" + availableVersions[i] + sep);
-
- // only versions >= 9 support java modules
- if (availableVersions[i] > 8) {
- moduleInfoMap.put(availableVersions[i], new HashMap<>());
- try (DirectoryStream stream = Files.newDirectoryStream(versionRoot)) {
- for (Path entry : stream) {
-
- Path mi = path.resolve(moduleInfoFilename);
-
- if (Files.exists(mi)) {
- JavaModuleInfo moduleInfo = new AsmModuleSource(mi);
- ModuleSignature moduleSignature = moduleInfo.getModuleSignature();
- JavaModulePathAnalysisInputLocation inputLocation =
- new JavaModulePathAnalysisInputLocation(
- versionRoot.toString(), versionRoot.getFileSystem(), getSourceType());
-
- inputLocations.get(availableVersions[i]).add(inputLocation);
- moduleInfoMap.get(availableVersions[i]).put(moduleSignature, moduleInfo);
- }
-
- if (Files.isDirectory(entry)) {
- mi = versionRoot.resolve(moduleInfoFilename);
+ Path versionedRoot = archiveRoot.getFileSystem().getPath("/META-INF/versions/");
+
+ try (Stream list = Files.list(versionedRoot)) {
+ list.map(
+ dir -> {
+ String versionDirName = dir.getFileName().toString();
+ return versionDirName.substring(0, versionDirName.length() - 1);
+ })
+ .map(Integer::new)
+ .filter(version -> version <= language.getVersion())
+ .sorted(Comparator.reverseOrder())
+ .forEach(
+ version -> {
+ final Path versionRoot =
+ archiveRoot
+ .getFileSystem()
+ .getPath("/META-INF", "versions", version.toString());
+ inputLocations.put(
+ version,
+ PathBasedAnalysisInputLocation.create(
+ versionRoot, sourceType, bodyInterceptors, Collections.emptyList()));
+ });
+
+ inputLocations.put(
+ DEFAULT_VERSION,
+ createAnalysisInputLocation(archiveRoot, srcType, getBodyInterceptors()));
+ } catch (IOException e) {
+ throw new IllegalStateException("Can not index the given file.", e);
+ }
+ }
- if (Files.exists(mi)) {
- JavaModuleInfo moduleInfo = new AsmModuleSource(mi);
- ModuleSignature moduleSignature = moduleInfo.getModuleSignature();
- JavaModulePathAnalysisInputLocation inputLocation =
- new JavaModulePathAnalysisInputLocation(
- versionRoot.toString(), versionRoot.getFileSystem(), getSourceType());
+ protected AnalysisInputLocation createAnalysisInputLocation(
+ Path archiveRoot, SourceType sourceType, List bodyInterceptors) {
+ return PathBasedAnalysisInputLocation.create(
+ archiveRoot,
+ sourceType,
+ bodyInterceptors,
+ Collections.singletonList(Paths.get("/META-INF")));
+ }
- inputLocations.get(availableVersions[i]).add(inputLocation);
- moduleInfoMap.get(availableVersions[i]).put(moduleSignature, moduleInfo);
- }
- // else TODO [bh] can we have automatic modules here?
- }
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- // if there was no module or the version is not > 8, we just add a directory based input
- // location
- if (inputLocations.get(availableVersions[i]).size() == 0) {
- inputLocations
- .get(availableVersions[i])
- .add(PathBasedAnalysisInputLocation.create(versionRoot, srcType));
- }
+ @Override
+ @Nonnull
+ public Optional getClassSource(@Nonnull ClassType type, @Nonnull View view) {
+ for (AnalysisInputLocation analysisInputLocation : inputLocations.values()) {
+ Optional classSource =
+ analysisInputLocation.getClassSource(type, view);
+ if (classSource.isPresent()) {
+ SootClassSource src = classSource.get();
+ JavaSootClassSource javaSootClassSource = (JavaSootClassSource) src;
+ return Optional.of(javaSootClassSource);
}
}
-
- isResolved = true;
+ return Optional.empty();
}
@Override
@Nonnull
- public Optional getClassSource(@Nonnull ClassType type, @Nonnull View view) {
+ public Collection getClassSources(@Nonnull View view) {
- Collection il = getBestMatchingInputLocationsRaw(language.getVersion());
-
- Collection baseIl = getBaseInputLocations();
-
- if (type instanceof ModuleJavaClassType) {
- il =
- il.stream()
- .filter(location -> location instanceof ModuleInfoAnalysisInputLocation)
- .collect(Collectors.toList());
- baseIl =
- baseIl.stream()
- .filter(location -> location instanceof ModuleInfoAnalysisInputLocation)
- .collect(Collectors.toList());
- } else {
- il =
- il.stream()
- .filter(location -> !(location instanceof ModuleInfoAnalysisInputLocation))
- .collect(Collectors.toList());
- baseIl =
- baseIl.stream()
- .filter(location -> !(location instanceof ModuleInfoAnalysisInputLocation))
- .collect(Collectors.toList());
- }
+ Collection classSources = new ArrayList<>();
+ inputLocations.values().stream()
+ .flatMap(location -> location.getClassSources(view).stream())
+ .map(src -> (JavaSootClassSource) src)
+ .forEach(
+ cs -> {
+ // do not add duplicate class sources
+ if (classSources.stream()
+ .noneMatch(
+ bestMatchCS ->
+ bestMatchCS
+ .getClassType()
+ .getFullyQualifiedName()
+ .equals(cs.getClassType().getFullyQualifiedName()))) {
+ classSources.add(cs);
+ }
+ });
- Optional foundClass =
- il.stream()
- .map(location -> location.getClassSource(type, view))
- .filter(Optional::isPresent)
- .limit(1)
- .map(Optional::get)
- .map(src -> (JavaSootClassSource) src)
- .findAny();
-
- if (foundClass.isPresent()) {
- return foundClass;
- } else {
- return baseIl.stream()
- .map(location -> location.getClassSource(type, view))
- .filter(Optional::isPresent)
- .limit(1)
- .map(Optional::get)
- .map(src -> (JavaSootClassSource) src)
- .findAny();
- }
+ return classSources;
}
@Nonnull
- @Override
- public Collection getModulesClassSources(
- @Nonnull ModuleSignature moduleSignature, @Nonnull View view) {
- return inputLocations.get(language.getVersion()).stream()
- .filter(location -> location instanceof ModuleInfoAnalysisInputLocation)
- .map(
- location ->
- ((ModuleInfoAnalysisInputLocation) location)
- .getModulesClassSources(moduleSignature, view))
- .flatMap(Collection::stream)
- .map(src -> (JavaSootClassSource) src)
- .collect(Collectors.toList());
+ public Language getLanguage() {
+ return language;
}
- /**
- * Returns the best matching input locations or the base input location.
- *
- * @param javaVersion version to find best match to
- * @return best match or base input locations
- */
- private Collection getBestMatchingInputLocationsRaw(int javaVersion) {
- for (int i = availableVersions.length - 1; i >= 0; i--) {
+ public static boolean isMultiReleaseJar(Path path) {
+ try {
+ FileInputStream inputStream = new FileInputStream(path.toFile());
+ JarInputStream jarStream = new JarInputStream(inputStream);
+ Manifest mf = jarStream.getManifest();
- if (availableVersions[i] > javaVersion) continue;
+ if (mf == null) {
+ return false;
+ }
- return new ArrayList<>(inputLocations.get(availableVersions[i]));
- }
+ Attributes attributes = mf.getMainAttributes();
- return getBaseInputLocations();
- }
+ String value = attributes.getValue("Multi-Release");
- private Collection getBaseInputLocations() {
- return baseInputLocations;
- }
+ if (value == null) {
+ return false;
+ }
- @Override
- @Nonnull
- public Collection getClassSources(@Nonnull View view) {
- Collection il = getBestMatchingInputLocationsRaw(language.getVersion());
-
- Collection result =
- il.stream()
- .map(location -> location.getClassSources(view))
- .flatMap(Collection::stream)
- .map(src -> (JavaSootClassSource) src)
- .collect(Collectors.toList());
-
- if (il != getBaseInputLocations()) {
-
- Collection baseSources =
- getBaseInputLocations().stream()
- .map(location -> location.getClassSources(view))
- .flatMap(Collection::stream)
- .map(src -> (JavaSootClassSource) src)
- .collect(Collectors.toList());
-
- baseSources.forEach(
- cs -> {
- // do not add duplicate class sources
- if (result.stream()
- .noneMatch(
- bestMatchCS ->
- bestMatchCS
- .getClassType()
- .getFullyQualifiedName()
- .equals(cs.getClassType().getFullyQualifiedName()))) {
- result.add(cs);
- }
- });
+ return Boolean.parseBoolean(value);
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Manifest file not found.", e);
}
-
- return result;
}
- @Nonnull
@Override
- public Optional getModuleInfo(ModuleSignature sig, View view) {
- return Optional.ofNullable(moduleInfoMap.get(language.getVersion()).get(sig));
- }
-
@Nonnull
- @Override
- public Set getModules(View view) {
- return inputLocations.get(language.getVersion()).stream()
- .filter(e -> e instanceof ModuleInfoAnalysisInputLocation)
- .map(e -> ((ModuleInfoAnalysisInputLocation) e).getModules(view))
- .flatMap(Set::stream)
- .collect(Collectors.toSet());
+ public List getBodyInterceptors() {
+ return bodyInterceptors;
}
- @Nonnull
- public Language getLanguage() {
- return this.language;
+ /**
+ * lists all versions from the version directories inside the META-INF/ directory - excluding the
+ * default implemention version
+ */
+ protected static List getLanguageVersions(@Nonnull Path path) {
+ FileSystem fs;
+ try {
+ fs = fileSystemCache.get(path);
+ } catch (ExecutionException e) {
+ throw new IllegalArgumentException("Could not open filesystemcache.", e);
+ }
+
+ final Path archiveRoot = fs.getPath("/");
+ Path versionedRoot = archiveRoot.getFileSystem().getPath("/META-INF/versions/");
+
+ try (Stream list = Files.list(versionedRoot)) {
+ return list.map(
+ dir -> {
+ String versionDirName = dir.getFileName().toString();
+ return versionDirName.substring(0, versionDirName.length() - 1);
+ })
+ .map(Integer::new)
+ .sorted()
+ .collect(Collectors.toCollection(ArrayList::new));
+ } catch (IOException e) {
+ throw new IllegalStateException("Can not index the given file.", e);
+ }
}
@Override
public boolean equals(Object o) {
- if (!(o instanceof PathBasedAnalysisInputLocation)) {
+ if (!(o instanceof MultiReleaseJarAnalysisInputLocation)) {
return false;
}
- return path.equals(((PathBasedAnalysisInputLocation) o).path);
+ return path.equals(((MultiReleaseJarAnalysisInputLocation) o).path);
}
@Override
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocation.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocation.java
index 1129cc73272..e247066692b 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocation.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocation.java
@@ -3,17 +3,15 @@
import java.io.*;
import java.nio.file.*;
import java.util.*;
-import java.util.jar.Attributes;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.commons.io.FilenameUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -64,19 +62,32 @@
* @author Kaustubh Kelkar updated on 30.07.2020
*/
public abstract class PathBasedAnalysisInputLocation implements AnalysisInputLocation {
- private final SourceType sourceType;
- private final List bodyInterceptors;
- protected Path path;
+ @Nonnull protected Path path;
+ @Nonnull protected Collection ignoredPaths;
+ @Nonnull protected final SourceType sourceType;
+ @Nonnull protected final List bodyInterceptors;
- protected PathBasedAnalysisInputLocation(@Nonnull Path path, @Nullable SourceType srcType) {
+ protected PathBasedAnalysisInputLocation(@Nonnull Path path, @Nonnull SourceType srcType) {
this(path, srcType, Collections.emptyList());
}
protected PathBasedAnalysisInputLocation(
@Nonnull Path path,
- @Nullable SourceType srcType,
+ @Nonnull SourceType srcType,
@Nonnull List bodyInterceptors) {
+ this(path, srcType, bodyInterceptors, Collections.emptyList());
+ }
+
+ protected PathBasedAnalysisInputLocation(
+ @Nonnull Path path,
+ @Nonnull SourceType srcType,
+ @Nonnull List bodyInterceptors,
+ @Nonnull Collection ignoredPaths) {
this.path = path;
+ this.ignoredPaths =
+ ignoredPaths.stream()
+ .map(Path::toAbsolutePath)
+ .collect(Collectors.toCollection(HashSet::new));
this.sourceType = srcType;
this.bodyInterceptors = bodyInterceptors;
@@ -85,8 +96,8 @@ protected PathBasedAnalysisInputLocation(
}
}
- @Nullable
@Override
+ @Nonnull
public SourceType getSourceType() {
return sourceType;
}
@@ -100,7 +111,7 @@ public List getBodyInterceptors() {
@Nonnull
public static PathBasedAnalysisInputLocation create(
@Nonnull Path path, @Nonnull SourceType sourceType) {
- return PathBasedAnalysisInputLocation.create(path, sourceType, Collections.emptyList());
+ return create(path, sourceType, Collections.emptyList());
}
@Nonnull
@@ -108,57 +119,39 @@ public static PathBasedAnalysisInputLocation create(
@Nonnull Path path,
@Nonnull SourceType srcType,
@Nonnull List bodyInterceptors) {
- final PathBasedAnalysisInputLocation inputLocation;
+ return create(path, srcType, bodyInterceptors, Collections.emptyList());
+ }
+
+ @Nonnull
+ public static PathBasedAnalysisInputLocation create(
+ @Nonnull Path path,
+ @Nonnull SourceType srcType,
+ @Nonnull List bodyInterceptors,
+ @Nonnull Collection ignoredPaths) {
+
+ if (ignoredPaths.stream()
+ .anyMatch(ignoPath -> path.toString().startsWith(ignoPath.toString()))) {
+ throw new IllegalArgumentException(
+ "The Path for the AnalysisInputLocation is in the ignored paths.");
+ }
+
if (Files.isDirectory(path)) {
- inputLocation = new DirectoryBasedAnalysisInputLocation(path, srcType, bodyInterceptors);
+ return new DirectoryBasedAnalysisInputLocation(path, srcType, bodyInterceptors, ignoredPaths);
} else if (PathUtils.isArchive(path)) {
if (PathUtils.hasExtension(path, FileType.JAR)) {
- inputLocation = new ArchiveBasedAnalysisInputLocation(path, srcType, bodyInterceptors);
+ return new ArchiveBasedAnalysisInputLocation(path, srcType, bodyInterceptors, ignoredPaths);
} else if (PathUtils.hasExtension(path, FileType.WAR)) {
try {
- inputLocation = new WarArchiveAnalysisInputLocation(path, srcType, bodyInterceptors);
+ return new WarArchiveAnalysisInputLocation(path, srcType, bodyInterceptors, ignoredPaths);
} catch (IOException e) {
throw new RuntimeException(e);
}
- } else {
- throw new IllegalArgumentException(
- "Path '"
- + path.toAbsolutePath()
- + "' has to be pointing to the root of a class container, e.g. directory, jar, zip, apk, war etc.");
}
- } else if (PathUtils.hasExtension(path, FileType.CLASS)) {
- inputLocation = new ClassFileBasedAnalysisInputLocation(path, srcType, bodyInterceptors);
- } else {
- throw new IllegalArgumentException(
- "Path '"
- + path.toAbsolutePath()
- + "' has to be pointing to the root of a class container, e.g. directory, jar, zip, apk, war etc.");
}
- return inputLocation;
- }
-
- private static boolean isMultiReleaseJar(Path path) {
- try {
- FileInputStream inputStream = new FileInputStream(path.toFile());
- JarInputStream jarStream = new JarInputStream(inputStream);
- Manifest mf = jarStream.getManifest();
-
- if (mf == null) {
- return false;
- }
-
- Attributes attributes = mf.getMainAttributes();
-
- String value = attributes.getValue("Multi-Release");
-
- return Boolean.parseBoolean(value);
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return false;
+ throw new IllegalArgumentException(
+ "Path '"
+ + path.toAbsolutePath()
+ + "' has to be pointing to the root of a class container, e.g. directory, jar, zip, apk, war etc.");
}
@Nonnull
@@ -166,18 +159,24 @@ Collection walkDirectory(
@Nonnull Path dirPath,
@Nonnull IdentifierFactory factory,
@Nonnull ClassProvider classProvider) {
- try {
- final FileType handledFileType = classProvider.getHandledFileType();
- final String moduleInfoFilename = JavaModuleIdentifierFactory.MODULE_INFO_FILE + ".class";
- return Files.walk(dirPath)
- .filter(
+
+ final FileType handledFileType = classProvider.getHandledFileType();
+ final String moduleInfoFilename = JavaModuleIdentifierFactory.MODULE_INFO_FILE + ".class";
+ try (final Stream walk = Files.walk(dirPath)) {
+ return walk.filter(
filePath ->
PathUtils.hasExtension(filePath, handledFileType)
- && !filePath.toString().endsWith(moduleInfoFilename))
+ && !filePath.toString().endsWith(moduleInfoFilename)
+ && ignoredPaths.stream()
+ .noneMatch(p -> filePath.toString().startsWith(p.toString())))
.flatMap(
- p ->
- StreamUtils.optionalToStream(
- classProvider.createClassSource(this, p, factory.fromPath(dirPath, p))))
+ p -> {
+ final String fullyQualifiedName = fromPath(dirPath, p);
+
+ return StreamUtils.optionalToStream(
+ classProvider.createClassSource(
+ this, p, factory.getClassType(fullyQualifiedName)));
+ })
.map(src -> (JavaSootClassSource) src)
.collect(Collectors.toList());
@@ -186,6 +185,15 @@ Collection walkDirectory(
}
}
+ @Nonnull
+ protected String fromPath(@Nonnull Path baseDirPath, Path packageNamePathAndClass) {
+ return FilenameUtils.removeExtension(
+ packageNamePathAndClass
+ .subpath(baseDirPath.getNameCount(), packageNamePathAndClass.getNameCount())
+ .toString()
+ .replace(packageNamePathAndClass.getFileSystem().getSeparator(), "."));
+ }
+
@Nonnull
protected Optional getClassSourceInternal(
@Nonnull JavaClassType signature, @Nonnull Path path, @Nonnull ClassProvider classProvider) {
@@ -196,9 +204,6 @@ protected Optional getClassSourceInternal(
.getPath(
signature.getFullyQualifiedName().replace('.', '/')
+ classProvider.getHandledFileType().getExtensionWithDot()));
- if (!Files.exists(pathToClass)) {
- return Optional.empty();
- }
Optional classSource =
classProvider.createClassSource(this, pathToClass, signature);
@@ -211,10 +216,6 @@ protected Optional getSingleClass(
Path pathToClass = Paths.get(path.toString());
- if (!Files.exists(pathToClass)) {
- return Optional.empty();
- }
-
Optional classSource =
classProvider.createClassSource(this, pathToClass, signature);
@@ -223,16 +224,27 @@ protected Optional getSingleClass(
public static class ClassFileBasedAnalysisInputLocation extends PathBasedAnalysisInputLocation {
+ @Nonnull private final String omittedPackageName;
+
public ClassFileBasedAnalysisInputLocation(
- @Nonnull Path classFilePath, @Nonnull SourceType srcType) {
- this(classFilePath, srcType, Collections.emptyList());
+ @Nonnull Path classFilePath,
+ @Nonnull String omittedPackageName,
+ @Nonnull SourceType srcType) {
+ this(classFilePath, omittedPackageName, srcType, Collections.emptyList());
}
public ClassFileBasedAnalysisInputLocation(
@Nonnull Path classFilePath,
+ @Nonnull String omittedPackageName,
@Nonnull SourceType srcType,
@Nonnull List bodyInterceptors) {
super(classFilePath, srcType, bodyInterceptors);
+ this.omittedPackageName = omittedPackageName;
+
+ if (!Files.isRegularFile(classFilePath) || Files.isDirectory(classFilePath)) {
+ throw new IllegalArgumentException(
+ "Needs to point to a regular file - not to a directory.");
+ }
}
@Override
@@ -248,12 +260,27 @@ public Collection getClassSources(@Nonnull View view) {
AsmJavaClassProvider classProvider = new AsmJavaClassProvider(view);
IdentifierFactory factory = view.getIdentifierFactory();
Path dirPath = this.path.getParent();
+
+ final String fullyQualifiedName = fromPath(dirPath, path);
+
Optional classSource =
classProvider
- .createClassSource(this, path, factory.fromPath(dirPath, path))
+ .createClassSource(this, path, factory.getClassType(fullyQualifiedName))
.map(src -> (JavaSootClassSource) src);
return Collections.singletonList(classSource.get());
}
+
+ @Nonnull
+ protected String fromPath(@Nonnull Path baseDirPath, Path packageNamePathAndClass) {
+ String str =
+ FilenameUtils.removeExtension(
+ packageNamePathAndClass
+ .subpath(baseDirPath.getNameCount(), packageNamePathAndClass.getNameCount())
+ .toString()
+ .replace(packageNamePathAndClass.getFileSystem().getSeparator(), "."));
+
+ return omittedPackageName.isEmpty() ? str : omittedPackageName + "." + str;
+ }
}
private static class DirectoryBasedAnalysisInputLocation extends PathBasedAnalysisInputLocation {
@@ -266,12 +293,22 @@ private DirectoryBasedAnalysisInputLocation(
@Nonnull Path path,
@Nonnull SourceType srcType,
@Nonnull List bodyInterceptors) {
- super(path, srcType, bodyInterceptors);
+ this(path, srcType, bodyInterceptors, Collections.emptyList());
+ }
+
+ public DirectoryBasedAnalysisInputLocation(
+ @Nonnull Path path,
+ @Nonnull SourceType srcType,
+ @Nonnull List bodyInterceptors,
+ @Nonnull Collection ignoredPaths) {
+ super(path, srcType, bodyInterceptors, ignoredPaths);
}
@Override
@Nonnull
public Collection getClassSources(@Nonnull View view) {
+ // FIXME: 1) store the classprovider reference as a field; 2) and above too; and 3) move view
+ // which is only used in SootNode to be just there?
return walkDirectory(path, view.getIdentifierFactory(), new AsmJavaClassProvider(view));
}
@@ -291,18 +328,20 @@ private static final class WarArchiveAnalysisInputLocation
private WarArchiveAnalysisInputLocation(@Nonnull Path warPath, @Nonnull SourceType srcType)
throws IOException {
- this(warPath, srcType, Collections.emptyList());
+ this(warPath, srcType, Collections.emptyList(), Collections.emptyList());
}
private WarArchiveAnalysisInputLocation(
@Nonnull Path warPath,
@Nonnull SourceType srcType,
- @Nonnull List bodyInterceptors)
+ @Nonnull List bodyInterceptors,
+ @Nonnull Collection ignoredPaths)
throws IOException {
super(
Files.createTempDirectory("sootUp-war-" + warPath.hashCode()).toAbsolutePath(),
srcType,
- bodyInterceptors);
+ bodyInterceptors,
+ ignoredPaths);
extractWarFile(warPath, path);
@@ -330,6 +369,11 @@ private WarArchiveAnalysisInputLocation(
}
}
+ public WarArchiveAnalysisInputLocation(
+ Path path, SourceType srcType, List bodyInterceptors) throws IOException {
+ this(path, srcType, bodyInterceptors, Collections.emptyList());
+ }
+
@Override
@Nonnull
public Collection getClassSources(@Nonnull View view) {
@@ -368,7 +412,7 @@ public Optional getClassSource(
*
* @param warFilePath The path to war file to be extracted
*/
- protected void extractWarFile(Path warFilePath, final Path destDirectory) {
+ void extractWarFile(Path warFilePath, final Path destDirectory) {
int extractedSize = 0;
try {
File dest = destDirectory.toFile();
@@ -380,8 +424,7 @@ protected void extractWarFile(Path warFilePath, final Path destDirectory) {
dest.deleteOnExit();
}
- ZipInputStream zis =
- new ZipInputStream(Files.newInputStream(Paths.get(warFilePath.toString())));
+ ZipInputStream zis = new ZipInputStream(Files.newInputStream(warFilePath));
ZipEntry zipEntry;
while ((zipEntry = zis.getNextEntry()) != null) {
Path filepath = destDirectory.resolve(zipEntry.getName());
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/StaticSingleAssignmentFormer.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/StaticSingleAssignmentFormer.java
index e2079e1b40a..fe06ac321ad 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/StaticSingleAssignmentFormer.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/StaticSingleAssignmentFormer.java
@@ -336,7 +336,7 @@ private boolean constainsPhiExpr(Stmt stmt) {
private JAssignStmt createEmptyPhiStmt(Local local) {
JPhiExpr phi = new JPhiExpr(Collections.emptyList(), Collections.emptyMap());
- return new JAssignStmt(local, phi, StmtPositionInfo.createNoStmtPositionInfo());
+ return new JAssignStmt(local, phi, StmtPositionInfo.getNoStmtPositionInfo());
}
private Local getOriginalLocal(Local local, Set oriLocals) {
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/UnusedLocalEliminator.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/UnusedLocalEliminator.java
index 45f455e9a0e..4f7409490eb 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/UnusedLocalEliminator.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/UnusedLocalEliminator.java
@@ -52,7 +52,7 @@ public void interceptBody(@Nonnull Body.BodyBuilder builder, @Nonnull View view)
Set locals = new LinkedHashSet<>();
// Traverse statements copying all used uses and defs
- for (Stmt stmt : builder.getStmtGraph()) {
+ for (Stmt stmt : builder.getStmtGraph().getNodes()) {
for (Value value : stmt.getUsesAndDefs()) {
if (value instanceof Local) {
Local local = (Local) value;
diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/typeresolving/TypeResolver.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/typeresolving/TypeResolver.java
index d88efdf6749..8d251e0b28b 100644
--- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/typeresolving/TypeResolver.java
+++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/interceptors/typeresolving/TypeResolver.java
@@ -197,7 +197,6 @@ private Collection applyAssignmentConstraint(
Type t_old = actualTyping.getType(local);
Type t_right = evalFunction.evaluate(actualTyping, defStmt.getRightOp(), defStmt, graph);
if (t_right == null) {
- // TODO: ms: is this correct to handle: null?
workQueue.removeFirst();
continue;
}
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/AsmMethodSourceTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/AsmMethodSourceTest.java
index 4cf78718820..9bc9c6e1ec8 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/AsmMethodSourceTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/AsmMethodSourceTest.java
@@ -39,6 +39,7 @@ public void testFix_StackUnderrun_convertPutFieldInsn_init() {
Arrays.asList(
"java.util.concurrent.Executor", "javax.management.MBeanNotificationInfo[]"));
+ assertTrue(idf.isConstructorSignature(mainMethodSignature));
assertTrue(idf.isConstructorSubSignature(mainMethodSignature.getSubSignature()));
final SootClass abstractClass = view.getClass(mainClassSignature).get();
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/JavaModuleViewTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/JavaModuleViewTest.java
index f8f9dd3b318..90d6b5585f2 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/JavaModuleViewTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/JavaModuleViewTest.java
@@ -3,6 +3,7 @@
import static org.junit.Assert.*;
import categories.Java9Test;
+import java.nio.file.Paths;
import java.util.*;
import org.junit.Ignore;
import org.junit.Test;
@@ -104,7 +105,7 @@ public void testAnnotation() {
List moduleInfoAnalysisInputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "annotations/jar"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "annotations/jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
ModulePackageName modMain =
@@ -145,7 +146,7 @@ public void testRequiresStatic() {
List inputLocations = Collections.emptyList();
List moduleInfoAnalysisInputLocations = new ArrayList<>();
moduleInfoAnalysisInputLocations.add(
- new JavaModulePathAnalysisInputLocation(testPath + "requires-static/jar"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "requires-static/jar")));
moduleInfoAnalysisInputLocations.add(new JrtFileSystemAnalysisInputLocation());
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
@@ -186,7 +187,7 @@ public void testRequiresExport() {
List inputLocations = Collections.emptyList();
List moduleInfoAnalysisInputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "requires_exports/jar"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "requires_exports/jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
ModulePackageName modMain =
@@ -236,7 +237,7 @@ public void testRequiresTransitiveExport() {
List moduleInfoAnalysisInputLocations = new ArrayList<>();
moduleInfoAnalysisInputLocations.add(
new JavaModulePathAnalysisInputLocation(
- testPath + "requires_exports_requires-transitive_exports-to/jar"));
+ Paths.get(testPath + "requires_exports_requires-transitive_exports-to/jar")));
moduleInfoAnalysisInputLocations.add(new JrtFileSystemAnalysisInputLocation());
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
@@ -285,7 +286,7 @@ public void testReflection() {
List inputLocations = Collections.emptyList();
List moduleInfoAnalysisInputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "reflection/jar"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "reflection/jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
ModuleJavaClassType mainClass =
@@ -338,7 +339,7 @@ public void testUsesProvide() {
List inputLocations = Collections.emptyList();
List moduleInfoAnalysisInputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "uses-provides/jar"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "uses-provides/jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
ModuleJavaClassType mainModmainSig =
@@ -385,7 +386,8 @@ public void testUsesProvideInClient() {
List inputLocations = Collections.emptyList();
List moduleInfoAnalysisInputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "uses-provides_uses-in-client/jar"));
+ new JavaModulePathAnalysisInputLocation(
+ Paths.get(testPath + "uses-provides_uses-in-client/jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
ModuleJavaClassType mainModmainSig =
@@ -435,7 +437,7 @@ public void testDerivedPrivatePackageProtected() {
List moduleInfoAnalysisInputLocations =
Collections.singletonList(
new JavaModulePathAnalysisInputLocation(
- testPath + "derived_private-package-protected/jar"));
+ Paths.get(testPath + "derived_private-package-protected/jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
ModuleJavaClassType mainClass =
@@ -482,7 +484,7 @@ public void testExceptions() {
List moduleInfoAnalysisInputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "exceptions/jar"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "exceptions/jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
ModuleJavaClassType mainClass =
@@ -519,7 +521,8 @@ public void testInterfaceCallback() {
List inputLocations = Collections.emptyList();
List moduleInfoAnalysisInputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "interface-callback/jar"));
+ new JavaModulePathAnalysisInputLocation(
+ Paths.get(testPath + "interface-callback/jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
ModuleJavaClassType mainClass =
@@ -555,7 +558,7 @@ public void testSplitpackageAutomaticModules() {
List inputLocations =
Collections.singletonList(
new JavaModulePathAnalysisInputLocation(
- testPath + "splitpackage_automatic-modules/jar"));
+ Paths.get(testPath + "splitpackage_automatic-modules/jar")));
List moduleInfoAnalysisInputLocations =
Collections.emptyList();
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
@@ -591,7 +594,7 @@ public void testSplitpackage() {
// TODO: adapt
List inputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "splitpackage"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "splitpackage")));
List moduleInfoAnalysisInputLocations =
Collections.emptyList();
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
@@ -608,7 +611,7 @@ public void testHiddenMain() {
// i.e. main is in non exported package
List inputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "hiddenmain/jar"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "hiddenmain/jar")));
List moduleInfoAnalysisInputLocations =
Collections.emptyList();
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
@@ -633,7 +636,8 @@ public void testAccessUnnamedModuleFromAutomaticModule() {
List moduleInfoAnalysisInputLocations = new ArrayList<>();
moduleInfoAnalysisInputLocations.add(
new JavaModulePathAnalysisInputLocation(
- testPath + "unnamed-module_access-from-automatic-module/jar/modmain.auto.jar"));
+ Paths.get(
+ testPath + "unnamed-module_access-from-automatic-module/jar/modmain.auto.jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
@@ -662,10 +666,10 @@ public void testAccessUnnamedModuleFromModule() {
List moduleInfoAnalysisInputLocations = new ArrayList<>();
moduleInfoAnalysisInputLocations.add(
new JavaModulePathAnalysisInputLocation(
- testPath + "unnamed-module_access-from-explicit-module/jar/modb.jar"));
+ Paths.get(testPath + "unnamed-module_access-from-explicit-module/jar/modb.jar")));
moduleInfoAnalysisInputLocations.add(
new JavaModulePathAnalysisInputLocation(
- testPath + "unnamed-module_access-from-explicit-module/jar/modmain.jar"));
+ Paths.get(testPath + "unnamed-module_access-from-explicit-module/jar/modmain.jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
ModulePackageName cpb = JavaModuleIdentifierFactory.getInstance().getPackageName("pkgb", "");
@@ -712,7 +716,7 @@ public void testAccessModuleFromUnnamedModule() {
List moduleInfoAnalysisInputLocations = new ArrayList<>();
moduleInfoAnalysisInputLocations.add(
new JavaModulePathAnalysisInputLocation(
- testPath + "unnamed-module_accessing-module-path/jar/modb.jar"));
+ Paths.get(testPath + "unnamed-module_accessing-module-path/jar/modb.jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
@@ -800,9 +804,9 @@ public void testEqualModulePath() {
List inputLocations = Collections.emptyList();
List moduleInfoAnalysisInputLocations = new ArrayList<>();
moduleInfoAnalysisInputLocations.add(
- new JavaModulePathAnalysisInputLocation(testPath + "requires_exports/jar"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "requires_exports/jar")));
moduleInfoAnalysisInputLocations.add(
- new JavaModulePathAnalysisInputLocation(testPath + "requires_exports/jar"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "requires_exports/jar")));
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/AnalysisInputLocationTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/AnalysisInputLocationTest.java
index 2274a28849d..07fdfd7a606 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/AnalysisInputLocationTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/AnalysisInputLocationTest.java
@@ -44,8 +44,6 @@ public abstract class AnalysisInputLocationTest {
final Path war = Paths.get("../shared-test-resources/java-warApp/dummyWarApp.war");
final Path jar = Paths.get("../shared-test-resources/java-miniapps/MiniApp.jar");
- final Path mrj = Paths.get("../shared-test-resources/multi-release-jar/mrjar.jar");
- final Path mmrj = Paths.get("../shared-test-resources/multi-release-jar-modular/mrjar.jar");
final Path apk = Paths.get("../shared-test-resources/apk/SimpleApk.apk");
final Path cls = Paths.get("../shared-test-resources/miniTestSuite/java6/binary/Employee.class");
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/JavaModulePathAnalysisInputLocationTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/JavaModulePathAnalysisInputLocationTest.java
index 243246dce26..57eafe4cdc1 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/JavaModulePathAnalysisInputLocationTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/JavaModulePathAnalysisInputLocationTest.java
@@ -2,11 +2,15 @@
import static org.junit.Assert.*;
+import categories.Java9Test;
+import java.nio.file.Paths;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
+import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import sootup.core.frontend.AbstractClassSource;
import sootup.core.frontend.SootClassSource;
import sootup.core.inputlocation.AnalysisInputLocation;
@@ -18,6 +22,7 @@
import sootup.java.core.types.JavaClassType;
import sootup.java.core.views.JavaModuleView;
+@Category(Java9Test.class)
public class JavaModulePathAnalysisInputLocationTest {
private final String testPath = "../shared-test-resources/jigsaw-examples/";
@@ -26,7 +31,7 @@ public class JavaModulePathAnalysisInputLocationTest {
public void testJarModule() {
List inputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "uses-provides/jar/"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "uses-provides/jar/")));
List moduleInfoAnalysisInputLocations =
Collections.emptyList();
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
@@ -45,7 +50,8 @@ public void testJarModule() {
public void testExplodedModule() {
List inputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "uses-provides/exploded_module/"));
+ new JavaModulePathAnalysisInputLocation(
+ Paths.get(testPath + "uses-provides/exploded_module/")));
List moduleInfoAnalysisInputLocations =
Collections.emptyList();
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
@@ -61,10 +67,11 @@ public void testExplodedModule() {
}
@Test
+ @Ignore("// FIXME does not find moduleInfo's ")
public void testGetModuleInfo() {
List inputLocations =
Collections.singletonList(
- new JavaModulePathAnalysisInputLocation(testPath + "requires_exports/jar"));
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "requires_exports/jar")));
List moduleInfoAnalysisInputLocations =
Collections.emptyList();
JavaModuleView view = new JavaModuleView(inputLocations, moduleInfoAnalysisInputLocations);
@@ -110,7 +117,7 @@ public void testGetClassSource() {
@Test
public void testGetClassSources() {
JavaModulePathAnalysisInputLocation inputLocation =
- new JavaModulePathAnalysisInputLocation(testPath + "requires_exports/jar");
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "requires_exports/jar"));
List inputLocations = Collections.emptyList();
List moduleInfoAnalysisInputLocations =
Collections.singletonList(inputLocation);
@@ -123,7 +130,7 @@ public void testGetClassSources() {
@Test
public void testGetModules() {
JavaModulePathAnalysisInputLocation inputLocation =
- new JavaModulePathAnalysisInputLocation(testPath + "requires_exports/jar");
+ new JavaModulePathAnalysisInputLocation(Paths.get(testPath + "requires_exports/jar"));
List inputLocations = Collections.emptyList();
List moduleInfoAnalysisInputLocations =
Collections.singletonList(inputLocation);
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/ModuleFinderTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/ModuleFinderTest.java
index 1f2600be4e0..42fe2e25fec 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/ModuleFinderTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/ModuleFinderTest.java
@@ -17,7 +17,7 @@ public class ModuleFinderTest extends AnalysisInputLocationTest {
@Test
public void discoverJarModuleByName() {
- ModuleFinder moduleFinder = new ModuleFinder(jar.toString());
+ ModuleFinder moduleFinder = new ModuleFinder(jar);
AnalysisInputLocation inputLocation =
moduleFinder.getModule(JavaModuleIdentifierFactory.getModuleSignature("MiniApp"));
assertTrue(inputLocation instanceof PathBasedAnalysisInputLocation);
@@ -25,14 +25,14 @@ public void discoverJarModuleByName() {
@Test
public void discoverJarModuleInAllModules() {
- ModuleFinder moduleFinder = new ModuleFinder(jar.toString());
+ ModuleFinder moduleFinder = new ModuleFinder(jar);
Collection modules = moduleFinder.getAllModules();
assertTrue(modules.contains(JavaModuleIdentifierFactory.getModuleSignature("MiniApp")));
}
@Test
public void discoverWarModuleByName() {
- ModuleFinder moduleFinder = new ModuleFinder(war.toString());
+ ModuleFinder moduleFinder = new ModuleFinder(war);
AnalysisInputLocation inputLocation =
moduleFinder.getModule(JavaModuleIdentifierFactory.getModuleSignature("dummyWarApp"));
assertTrue(inputLocation instanceof PathBasedAnalysisInputLocation);
@@ -40,7 +40,7 @@ public void discoverWarModuleByName() {
@Test
public void discoverWarModuleInAllModules() {
- ModuleFinder moduleFinder = new ModuleFinder(war.toString());
+ ModuleFinder moduleFinder = new ModuleFinder(war);
Collection modules = moduleFinder.getAllModules();
assertTrue(modules.contains(JavaModuleIdentifierFactory.getModuleSignature("dummyWarApp")));
}
@@ -48,7 +48,8 @@ public void discoverWarModuleInAllModules() {
@Test
public void testModuleJar() {
ModuleFinder moduleFinder =
- new ModuleFinder("../shared-test-resources/java9-target/de/upb/soot/namespaces/modules/");
+ new ModuleFinder(
+ Paths.get("../shared-test-resources/java9-target/de/upb/soot/namespaces/modules/"));
Collection discoveredModules = moduleFinder.getAllModules();
assertTrue(
discoveredModules.contains(JavaModuleIdentifierFactory.getModuleSignature("de.upb.mod")));
@@ -57,7 +58,8 @@ public void testModuleJar() {
@Test
public void testModuleExploded() {
ModuleFinder moduleFinder =
- new ModuleFinder("../shared-test-resources/java9-target/de/upb/soot/namespaces/modules/");
+ new ModuleFinder(
+ Paths.get("../shared-test-resources/java9-target/de/upb/soot/namespaces/modules/"));
Collection discoveredModules = moduleFinder.getAllModules();
assertTrue(
discoveredModules.contains(JavaModuleIdentifierFactory.getModuleSignature("fancyMod")));
@@ -77,7 +79,8 @@ public void testAutomaticModuleNamingViaManifest() {
ModuleFinder moduleFinder =
new ModuleFinder(
- "../shared-test-resources/java9-target/de/upb/soot/namespaces/modules/automaticModuleWithManifest");
+ Paths.get(
+ "../shared-test-resources/java9-target/de/upb/soot/namespaces/modules/automaticModuleWithManifest"));
assertNotNull(
moduleFinder.getModule(
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/MultiReleaseJarInputLocationTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/ModuleMultiReleaseJarAnalysisInputLocationTest.java
similarity index 55%
rename from sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/MultiReleaseJarInputLocationTest.java
rename to sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/ModuleMultiReleaseJarAnalysisInputLocationTest.java
index 60c1d025736..de5dd4c81bb 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/MultiReleaseJarInputLocationTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/ModuleMultiReleaseJarAnalysisInputLocationTest.java
@@ -21,126 +21,43 @@
* .
* #L%
*/
-
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import categories.Java8Test;
+import categories.Java9Test;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Collections;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import sootup.core.model.SourceType;
import sootup.core.types.ClassType;
import sootup.java.core.JavaModuleIdentifierFactory;
+import sootup.java.core.ModuleInfoAnalysisInputLocation;
import sootup.java.core.language.JavaLanguage;
import sootup.java.core.signatures.ModuleSignature;
import sootup.java.core.types.ModuleJavaClassType;
import sootup.java.core.views.JavaModuleView;
import sootup.java.core.views.JavaView;
-@Category(Java8Test.class)
-public class MultiReleaseJarInputLocationTest extends AnalysisInputLocationTest {
+@Category(Java9Test.class)
+public class ModuleMultiReleaseJarAnalysisInputLocationTest extends AnalysisInputLocationTest {
+ final Path mmrj = Paths.get("../shared-test-resources/multi-release-jar-modular/mrjar.jar");
@Test
- public void multiReleaseJar() {
- final ClassType classType =
- getIdentifierFactory().getClassType("de.upb.swt.multirelease.Utility");
- final ClassType classType2 =
- getIdentifierFactory().getClassType("de.upb.swt.multirelease.Main");
-
- final JavaLanguage minLanguage = new JavaLanguage(Integer.MIN_VALUE);
- final JavaView view_min =
- new JavaView(new MultiReleaseJarAnalysisInputLocation(mrj, null, minLanguage));
-
- final JavaLanguage language8 = new JavaLanguage(8);
- final JavaView view_8 =
- new JavaView(new MultiReleaseJarAnalysisInputLocation(mrj, null, language8));
-
- final JavaLanguage language9 = new JavaLanguage(9);
- final JavaView view_9 =
- new JavaView(new MultiReleaseJarAnalysisInputLocation(mrj, null, language9));
-
- final JavaLanguage language10 = new JavaLanguage(10);
- final JavaView view_10 =
- new JavaView(new MultiReleaseJarAnalysisInputLocation(mrj, null, language10));
-
- final JavaLanguage maxLanguage = new JavaLanguage(Integer.MAX_VALUE);
- final JavaView view_max =
- new JavaView(new MultiReleaseJarAnalysisInputLocation(mrj, null, maxLanguage));
-
- // for java10
- Assert.assertEquals(
- "/META-INF/versions/9/de/upb/swt/multirelease/Utility.class",
- view_10.getClass(classType).get().getClassSource().getSourcePath().toString());
- Assert.assertEquals(
- "/de/upb/swt/multirelease/Main.class",
- view_10.getClass(classType2).get().getClassSource().getSourcePath().toString());
-
- // assert that method is correctly resolved
- Assert.assertTrue(
- view_10
- .getClass(classType)
- .get()
- .getMethod(
- getIdentifierFactory()
- .getMethodSubSignature(
- "printVersion",
- getIdentifierFactory().getType("void"),
- Collections.emptyList()))
- .get()
- .getBody()
- .toString()
- .contains("java 9"));
-
- // for java 9
- Assert.assertEquals(
- "/META-INF/versions/9/de/upb/swt/multirelease/Utility.class",
- view_9.getClass(classType).get().getClassSource().getSourcePath().toString());
- Assert.assertEquals(
- "/de/upb/swt/multirelease/Main.class",
- view_9.getClass(classType2).get().getClassSource().getSourcePath().toString());
-
- // for java 8
- Assert.assertEquals(
- "/de/upb/swt/multirelease/Utility.class",
- view_8.getClass(classType).get().getClassSource().getSourcePath().toString());
- Assert.assertEquals(
- "/de/upb/swt/multirelease/Main.class",
- view_8.getClass(classType2).get().getClassSource().getSourcePath().toString());
- // assert that method is correctly resolved to base
- Assert.assertTrue(
- view_8
- .getClass(classType)
- .get()
- .getMethod(
- getIdentifierFactory()
- .getMethodSubSignature(
- "printVersion",
- getIdentifierFactory().getType("void"),
- Collections.emptyList()))
- .get()
- .getBody()
- .toString()
- .contains("java 8"));
+ @Ignore("// FIXME")
+ public void modularMultiReleaseJar() {
- // for max int
- Assert.assertEquals(
- "/META-INF/versions/9/de/upb/swt/multirelease/Utility.class",
- view_max.getClass(classType).get().getClassSource().getSourcePath().toString());
- Assert.assertEquals(
- "/de/upb/swt/multirelease/Main.class",
- view_max.getClass(classType2).get().getClassSource().getSourcePath().toString());
+ // TODO: test & create multiple types of input
+ // - [x] no module-info.class in root; module-info.class in version
+ // - [ ] no module-info.class in root; no module-info.class in version
+ // - [ ] module-info.class in root; no module-info.class in version
+ // - [ ] no module-info.class in root; no module-info.class in version -> non modular
- // for min int
- Assert.assertEquals(
- "/de/upb/swt/multirelease/Utility.class",
- view_min.getClass(classType).get().getClassSource().getSourcePath().toString());
- Assert.assertEquals(
- "/de/upb/swt/multirelease/Main.class",
- view_min.getClass(classType2).get().getClassSource().getSourcePath().toString());
- }
+ assertTrue(MultiReleaseJarAnalysisInputLocation.isMultiReleaseJar(mmrj));
- @Test
- public void modularMultiReleaseJar() {
final ClassType utilityNoModule =
getIdentifierFactory().getClassType("de.upb.swt.multirelease.Utility");
@@ -151,17 +68,22 @@ public void modularMultiReleaseJar() {
final ClassType classType2 =
getIdentifierFactory().getClassType("de.upb.swt.multirelease.Main");
- final JavaLanguage language8 = new JavaLanguage(8);
+ ModuleInfoAnalysisInputLocation moduleMultiReleaseJarAnalysisInputLocation8 =
+ new ModuleMultiReleaseJarAnalysisInputLocation(
+ mmrj, SourceType.Application, new JavaLanguage(8));
+
final JavaView view_8 =
- new JavaView(new MultiReleaseJarAnalysisInputLocation(mmrj, null, language8));
+ new JavaModuleView(
+ Collections.emptyList(),
+ Collections.singletonList(moduleMultiReleaseJarAnalysisInputLocation8));
- final JavaLanguage language9 = new JavaLanguage(9);
+ ModuleMultiReleaseJarAnalysisInputLocation moduleMultiReleaseJarAnalysisInputLocation9 =
+ new ModuleMultiReleaseJarAnalysisInputLocation(
+ mmrj, SourceType.Application, new JavaLanguage(9));
final JavaModuleView view_9 =
new JavaModuleView(
Collections.emptyList(),
- Collections.singletonList(
- new MultiReleaseJarAnalysisInputLocation(mmrj, null, language9)));
-
+ Collections.singletonList(moduleMultiReleaseJarAnalysisInputLocation9));
ModuleSignature moduleSignature =
JavaModuleIdentifierFactory.getModuleSignature("de.upb.swt.multirelease");
@@ -229,5 +151,24 @@ public void modularMultiReleaseJar() {
.getBody()
.toString()
.contains("java 8"));
+
+ Assert.assertTrue(
+ view_8
+ .getClass(utilityNoModule)
+ .get()
+ .getMethod(
+ getIdentifierFactory()
+ .getMethodSubSignature(
+ "printVersion",
+ getIdentifierFactory().getType("void"),
+ Collections.emptyList()))
+ .get()
+ .getBody()
+ .toString()
+ .contains("java 8"));
+
+ // TODO: test what happens if we put a *non* ModuleClassType into a
+ // ModuleMultiReleaseAnalysisInoutLocation
+
}
}
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/MultiReleaseJarAnalysisInputLocationTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/MultiReleaseJarAnalysisInputLocationTest.java
new file mode 100644
index 00000000000..909e0fb5ed3
--- /dev/null
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/MultiReleaseJarAnalysisInputLocationTest.java
@@ -0,0 +1,176 @@
+package sootup.java.bytecode.inputlocation;
+
+/*-
+ * #%L
+ * Soot
+ * %%
+ * Copyright (C) 06.06.2018 Manuel Benz
+ * %%
+ * 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
+ * .
+ * #L%
+ */
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import categories.Java8Test;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import sootup.core.model.SourceType;
+import sootup.core.signatures.MethodSubSignature;
+import sootup.core.types.ClassType;
+import sootup.java.core.language.JavaLanguage;
+import sootup.java.core.views.JavaView;
+
+@Category(Java8Test.class)
+public class MultiReleaseJarAnalysisInputLocationTest extends AnalysisInputLocationTest {
+
+ final Path mrj = Paths.get("../shared-test-resources/multi-release-jar/mrjar.jar");
+ JavaView view_min;
+ JavaView view_8;
+ JavaView view_9;
+ JavaView view_10;
+ JavaView view_max;
+ ClassType classType;
+ ClassType classType2;
+
+ @Test
+ public void multiReleaseJar() {
+
+ view_min =
+ new JavaView(
+ new MultiReleaseJarAnalysisInputLocation(
+ mrj, SourceType.Application, new JavaLanguage(1)));
+ view_8 =
+ new JavaView(
+ new MultiReleaseJarAnalysisInputLocation(
+ mrj, SourceType.Application, new JavaLanguage(8)));
+ view_9 =
+ new JavaView(
+ new MultiReleaseJarAnalysisInputLocation(
+ mrj, SourceType.Application, new JavaLanguage(9)));
+ view_10 =
+ new JavaView(
+ new MultiReleaseJarAnalysisInputLocation(
+ mrj, SourceType.Application, new JavaLanguage(10)));
+ view_max =
+ new JavaView(
+ new MultiReleaseJarAnalysisInputLocation(
+ mrj, SourceType.Application, new JavaLanguage(Integer.MAX_VALUE)));
+
+ classType = getIdentifierFactory().getClassType("de.upb.sse.multirelease.Utility");
+ classType2 = getIdentifierFactory().getClassType("de.upb.sse.multirelease.Main");
+
+ assertTrue(MultiReleaseJarAnalysisInputLocation.isMultiReleaseJar(mrj));
+
+ // for java 8
+ Assert.assertEquals(
+ "/de/upb/sse/multirelease/Utility.class",
+ view_8.getClass(classType).get().getClassSource().getSourcePath().toString());
+ Assert.assertEquals(
+ "/de/upb/sse/multirelease/Main.class",
+ view_8.getClass(classType2).get().getClassSource().getSourcePath().toString());
+ // assert that method is correctly resolved to base
+ MethodSubSignature printBodyMethodSubSig =
+ getIdentifierFactory()
+ .getMethodSubSignature(
+ "printVersion", getIdentifierFactory().getType("void"), Collections.emptyList());
+ Assert.assertTrue(
+ view_8
+ .getClass(classType)
+ .get()
+ .getMethod(printBodyMethodSubSig)
+ .get()
+ .getBody()
+ .toString()
+ .contains("java 8"));
+
+ // for java 9
+ Assert.assertEquals(
+ "/META-INF/versions/9/de/upb/sse/multirelease/Utility.class",
+ view_9.getClass(classType).get().getClassSource().getSourcePath().toString());
+ Assert.assertEquals(
+ "/de/upb/sse/multirelease/Main.class",
+ view_9.getClass(classType2).get().getClassSource().getSourcePath().toString());
+
+ // for java10
+ Assert.assertEquals(
+ "/META-INF/versions/10/de/upb/sse/multirelease/Utility.class",
+ view_10.getClass(classType).get().getClassSource().getSourcePath().toString());
+ Assert.assertEquals(
+ "/de/upb/sse/multirelease/Main.class",
+ view_10.getClass(classType2).get().getClassSource().getSourcePath().toString());
+
+ // assert that method is correctly resolved
+ Assert.assertTrue(
+ view_10
+ .getClass(classType)
+ .get()
+ .getMethod(printBodyMethodSubSig)
+ .get()
+ .getBody()
+ .toString()
+ .contains("java 10"));
+
+ // for min int
+ Assert.assertEquals(
+ "/de/upb/sse/multirelease/Utility.class",
+ view_min.getClass(classType).get().getClassSource().getSourcePath().toString());
+ Assert.assertEquals(
+ "/de/upb/sse/multirelease/Main.class",
+ view_min.getClass(classType2).get().getClassSource().getSourcePath().toString());
+
+ // for max int
+ Assert.assertEquals(
+ "/META-INF/versions/10/de/upb/sse/multirelease/Utility.class",
+ view_max.getClass(classType).get().getClassSource().getSourcePath().toString());
+ Assert.assertEquals(
+ "/de/upb/sse/multirelease/Main.class",
+ view_max.getClass(classType2).get().getClassSource().getSourcePath().toString());
+
+ // getClasses
+ List collectedClassesWPrintBody9 =
+ view_9.getClasses().stream()
+ .map(c -> c.getMethod(printBodyMethodSubSig))
+ .filter(Optional::isPresent)
+ .map(m -> m.get().getBody().toString())
+ .collect(Collectors.toList());
+ assertEquals(1, collectedClassesWPrintBody9.size());
+ assertTrue(collectedClassesWPrintBody9.get(0).contains("java 9"));
+
+ List collectedClassesWPrintBody10 =
+ view_10.getClasses().stream()
+ .map(c -> c.getMethod(printBodyMethodSubSig))
+ .filter(Optional::isPresent)
+ .map(m -> m.get().getBody().toString())
+ .collect(Collectors.toList());
+ assertEquals(1, collectedClassesWPrintBody10.size());
+ assertTrue(collectedClassesWPrintBody10.get(0).contains("java 10"));
+ }
+
+ @Test
+ public void testVersions() {
+ List languageVersions = MultiReleaseJarAnalysisInputLocation.getLanguageVersions(mrj);
+ Assert.assertTrue(languageVersions.contains(9));
+ Assert.assertTrue(languageVersions.contains(10));
+ }
+}
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocationTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocationTest.java
index 5c13b319d59..b4467c90e49 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocationTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocationTest.java
@@ -24,7 +24,6 @@
import static junit.framework.TestCase.assertEquals;
import static org.junit.Assert.*;
-import static org.junit.Assert.assertTrue;
import categories.Java8Test;
import java.io.File;
@@ -32,9 +31,13 @@
import java.util.*;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import sootup.core.inputlocation.AnalysisInputLocation;
import sootup.core.inputlocation.EagerInputLocation;
import sootup.core.jimple.basic.NoPositionInformation;
-import sootup.core.model.*;
+import sootup.core.model.ClassModifier;
+import sootup.core.model.FieldModifier;
+import sootup.core.model.SootClass;
+import sootup.core.model.SourceType;
import sootup.core.signatures.FieldSubSignature;
import sootup.core.signatures.MethodSubSignature;
import sootup.core.types.ClassType;
@@ -50,10 +53,20 @@
@Category(Java8Test.class)
public class PathBasedAnalysisInputLocationTest extends AnalysisInputLocationTest {
+ @Test
+ public void testApk() {
+ PathBasedAnalysisInputLocation pathBasedNamespace =
+ new ApkAnalysisInputLocation(apk, SourceType.Application);
+ final ClassType mainClass =
+ getIdentifierFactory().getClassType("de.upb.futuresoot.fields.MainActivity");
+ testClassReceival(pathBasedNamespace, Collections.singletonList(mainClass), 1392);
+ }
+
@Test
public void testSingleClass() {
PathBasedAnalysisInputLocation pathBasedNamespace =
- PathBasedAnalysisInputLocation.create(cls, null);
+ new PathBasedAnalysisInputLocation.ClassFileBasedAnalysisInputLocation(
+ cls, "", SourceType.Application);
ArrayList sigs = new ArrayList<>();
sigs.add(getIdentifierFactory().getClassType("Employee"));
testClassReceival(pathBasedNamespace, sigs, 1);
@@ -62,13 +75,26 @@ public void testSingleClass() {
@Test(expected = IllegalArgumentException.class)
public void testSingleClassDoesNotExist() {
PathBasedAnalysisInputLocation pathBasedNamespace =
- PathBasedAnalysisInputLocation.create(Paths.get("NonExisting.class"), null);
+ PathBasedAnalysisInputLocation.create(
+ Paths.get("NonExisting.class"), SourceType.Application);
+ }
+
+ @Test
+ public void testSingleClassWPackageName() {
+ AnalysisInputLocation pathBasedNamespace =
+ new PathBasedAnalysisInputLocation.ClassFileBasedAnalysisInputLocation(
+ Paths.get("../shared-test-resources/ClassWithPackageName.class"),
+ "ClassesPackageName",
+ SourceType.Application);
+ ArrayList sigs = new ArrayList<>();
+ sigs.add(getIdentifierFactory().getClassType("ClassesPackageName.ClassWithPackageName"));
+ testClassReceival(pathBasedNamespace, sigs, 1);
}
@Test
public void testJar() {
PathBasedAnalysisInputLocation pathBasedNamespace =
- PathBasedAnalysisInputLocation.create(jar, null);
+ PathBasedAnalysisInputLocation.create(jar, SourceType.Application);
ArrayList sigs = new ArrayList<>();
sigs.add(getIdentifierFactory().getClassType("Employee", "ds"));
sigs.add(getIdentifierFactory().getClassType("MiniApp"));
@@ -78,7 +104,7 @@ public void testJar() {
@Test
public void testWar() {
PathBasedAnalysisInputLocation pathBasedNamespace =
- PathBasedAnalysisInputLocation.create(war, null);
+ PathBasedAnalysisInputLocation.create(war, SourceType.Application);
final ClassType warClass1 = getIdentifierFactory().getClassType("SimpleWarRead");
testClassReceival(pathBasedNamespace, Collections.singletonList(warClass1), 19);
}
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/AggregatorTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/AggregatorTest.java
index a67b7f0df15..ad95f86a77c 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/AggregatorTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/AggregatorTest.java
@@ -83,7 +83,7 @@ public void testNoAggregation() {
public void noAggregationWithUse() {
Body.BodyBuilder builder = Body.builder();
- StmtPositionInfo noPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType fileType = JavaIdentifierFactory.getInstance().getClassType("File");
@@ -119,7 +119,7 @@ public void noAggregationWithUse() {
}
private static Body.BodyBuilder createBodyBuilder(boolean withAggregation) {
- StmtPositionInfo noPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
Local a = JavaJimple.newLocal("a", PrimitiveType.getInt());
Local b = JavaJimple.newLocal("b", PrimitiveType.getInt());
@@ -183,6 +183,7 @@ public void testIssue739() {
AnalysisInputLocation inputLocation =
new PathBasedAnalysisInputLocation.ClassFileBasedAnalysisInputLocation(
Paths.get("../shared-test-resources/bugfixes/Issue739_Aggregator.class"),
+ "",
SourceType.Application,
BytecodeClassLoadingOptions.Default.getBodyInterceptors());
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/CastAndReturnInlinerTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/CastAndReturnInlinerTest.java
index 74a3d910db7..11713bb93c4 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/CastAndReturnInlinerTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/CastAndReturnInlinerTest.java
@@ -46,7 +46,7 @@ public class CastAndReturnInlinerTest {
public void testModification() {
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
JavaJimple javaJimple = JavaJimple.getInstance();
- StmtPositionInfo noPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType objectType = factory.getClassType("java.lang.Object");
JavaClassType stringType = factory.getClassType("java.lang.String");
@@ -100,7 +100,7 @@ public void testModification() {
public void testNoModification() {
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
JavaJimple javaJimple = JavaJimple.getInstance();
- StmtPositionInfo noPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType objectType = factory.getClassType("java.lang.Object");
JavaClassType stringType = factory.getClassType("java.lang.String");
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/ConditionalBranchFolderTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/ConditionalBranchFolderTest.java
index 1e497dd2ce9..455fb9fe40a 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/ConditionalBranchFolderTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/ConditionalBranchFolderTest.java
@@ -86,7 +86,7 @@ public void testConditionalBranchingWithNoConclusiveIfCondition() {
private static Body.BodyBuilder createBodyBuilder(int constantCondition) {
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
JavaJimple javaJimple = JavaJimple.getInstance();
- StmtPositionInfo noPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType stringType = factory.getClassType("java.lang.String");
Local a = JavaJimple.newLocal("a", stringType);
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/ConstantPropagatorAndFolderTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/ConstantPropagatorAndFolderTest.java
index 0115027299e..2936651b65e 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/ConstantPropagatorAndFolderTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/ConstantPropagatorAndFolderTest.java
@@ -39,6 +39,8 @@ public class ConstantPropagatorAndFolderTest {
public void testModification() {
Body.BodyBuilder testBuilder = createBody(true);
Body testBody = testBuilder.build();
+
+ testBuilder = Body.builder(testBody, testBuilder.getModifiers());
new ConstantPropagatorAndFolder().interceptBody(testBuilder, null);
Body processedBody = testBuilder.build();
List originalStmts = testBody.getStmts();
@@ -75,7 +77,7 @@ public void testNoModification() {
}
private static Body.BodyBuilder createBody(boolean constantFolding) {
- StmtPositionInfo noPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
Local a = JavaJimple.newLocal("a", PrimitiveType.getInt());
Local b = JavaJimple.newLocal("b", PrimitiveType.getInt());
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/CopyPropagatorTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/CopyPropagatorTest.java
index 58eb579b316..93a86dbc391 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/CopyPropagatorTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/CopyPropagatorTest.java
@@ -33,7 +33,7 @@ public class CopyPropagatorTest {
// Preparation
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
- StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType intType = factory.getClassType("int");
JavaClassType refType = factory.getClassType("ref");
JavaClassType classType = factory.getClassType("Test");
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/DeadAssignmentEliminatorTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/DeadAssignmentEliminatorTest.java
index cb5679b72a0..554177ca4bc 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/DeadAssignmentEliminatorTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/DeadAssignmentEliminatorTest.java
@@ -50,7 +50,7 @@ public class DeadAssignmentEliminatorTest {
*/
@Test
public void conditionalToRemovedBlock() {
- StmtPositionInfo noPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
Local a = JavaJimple.newLocal("a", PrimitiveType.getInt());
Set locals = ImmutableUtils.immutableSet(a);
@@ -112,7 +112,7 @@ public void testNoModification() {
private static Body.BodyBuilder createBody(boolean essentialOption) {
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
JavaJimple javaJimple = JavaJimple.getInstance();
- StmtPositionInfo noPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType objectType = factory.getClassType("java.lang.Object");
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/EmptySwitchEliminatorTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/EmptySwitchEliminatorTest.java
index 731ab9d26cd..4b16b298a47 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/EmptySwitchEliminatorTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/EmptySwitchEliminatorTest.java
@@ -28,7 +28,7 @@ public class EmptySwitchEliminatorTest {
// Preparation
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
- StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType intType = factory.getClassType("int");
JavaClassType classType = factory.getClassType("Test");
MethodSignature methodSignature =
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalLivenessAnalyserTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalLivenessAnalyserTest.java
index f900d0f4da8..248dc02dd67 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalLivenessAnalyserTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalLivenessAnalyserTest.java
@@ -29,7 +29,7 @@ public class LocalLivenessAnalyserTest {
// Preparation
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
- StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType intType = factory.getClassType("int");
JavaClassType classType = factory.getClassType("Test");
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalNameStandardizerTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalNameStandardizerTest.java
index 7b7cb7af8f2..fd2b7aa1440 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalNameStandardizerTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalNameStandardizerTest.java
@@ -30,7 +30,7 @@
public class LocalNameStandardizerTest {
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
- StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType classType = factory.getClassType("Test");
MethodSignature methodSignature =
new MethodSignature(classType, "test", Collections.emptyList(), VoidType.getInstance());
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalPackerTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalPackerTest.java
index 538e9205bae..72870d859ce 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalPackerTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalPackerTest.java
@@ -32,7 +32,7 @@ public class LocalPackerTest {
// Preparation
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
JavaJimple javaJimple = JavaJimple.getInstance();
- StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType classType = factory.getClassType("Test");
JavaClassType intType = factory.getClassType("int");
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalSplitterTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalSplitterTest.java
index 54e2b956ecb..c2ff3c08f3a 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalSplitterTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/LocalSplitterTest.java
@@ -31,7 +31,7 @@ public class LocalSplitterTest {
// Preparation
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
- StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType intType = factory.getClassType("int");
JavaClassType classType = factory.getClassType("Test");
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/NopEliminatorTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/NopEliminatorTest.java
index b31546f57ac..d16d532ae57 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/NopEliminatorTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/NopEliminatorTest.java
@@ -37,6 +37,7 @@ public void testJNopEnd() {
Body.BodyBuilder builder = createBody(true);
Body testBody = builder.build();
+ builder = Body.builder(testBody, builder.getModifiers());
new NopEliminator().interceptBody(builder, null);
Body processedBody = builder.build();
@@ -72,7 +73,7 @@ public void testNoJNops() {
private static Body.BodyBuilder createBody(boolean withNop) {
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
JavaJimple javaJimple = JavaJimple.getInstance();
- StmtPositionInfo noPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType objectType = factory.getClassType("java.lang.Object");
JavaClassType stringType = factory.getClassType("java.lang.String");
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/StaticSingleAssignmentFormerTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/StaticSingleAssignmentFormerTest.java
index 3174630aaf6..a4a6f02c290 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/StaticSingleAssignmentFormerTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/StaticSingleAssignmentFormerTest.java
@@ -31,7 +31,7 @@ public class StaticSingleAssignmentFormerTest {
// Preparation
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
- StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaJimple javaJimple = JavaJimple.getInstance();
JavaClassType intType = factory.getClassType("int");
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/TrapTightenerTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/TrapTightenerTest.java
index f5990ed4e06..a17243ee5c8 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/TrapTightenerTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/TrapTightenerTest.java
@@ -32,7 +32,7 @@
@Ignore("FIXME: needs .setTraps() adapted to MutableBlockStmtGraph")
public class TrapTightenerTest {
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
- StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType intType = factory.getClassType("int");
JavaClassType classType = factory.getClassType("Test");
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/UnreachableCodeEliminatorTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/UnreachableCodeEliminatorTest.java
index 7c47b97a0f9..95248d05d72 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/UnreachableCodeEliminatorTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/UnreachableCodeEliminatorTest.java
@@ -12,7 +12,6 @@
import sootup.core.jimple.basic.Local;
import sootup.core.jimple.basic.NoPositionInformation;
import sootup.core.jimple.basic.StmtPositionInfo;
-import sootup.core.jimple.basic.Trap;
import sootup.core.jimple.common.constant.IntConstant;
import sootup.core.jimple.common.ref.IdentityRef;
import sootup.core.jimple.common.stmt.BranchingStmt;
@@ -35,7 +34,7 @@ public class UnreachableCodeEliminatorTest {
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
JavaJimple javaJimple = JavaJimple.getInstance();
- StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noStmtPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType classType = factory.getClassType("Test");
MethodSignature methodSignature =
new MethodSignature(classType, "test", Collections.emptyList(), VoidType.getInstance());
@@ -73,8 +72,6 @@ public class UnreachableCodeEliminatorTest {
FallsThroughStmt endStmt =
JavaJimple.newAssignStmt(l4, IntConstant.getInstance(4), noStmtPositionInfo);
- Trap trap2 = JavaJimple.newTrap(exception, beginStmt, beginStmt, handlerStmt);
-
/**
* Test the simpleBody l0:= @this Test -> l1 = 1 -> return l2 = 2 -> l3 = 3 -> return l2 = 2 and
* l3 = 3 are unreachable
diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/UnusedLocalEliminatorTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/UnusedLocalEliminatorTest.java
index db3492cccb1..04f56c0086e 100644
--- a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/UnusedLocalEliminatorTest.java
+++ b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/UnusedLocalEliminatorTest.java
@@ -57,7 +57,7 @@ public void testRemoveNothing() {
private static Body.BodyBuilder createBody(boolean unusedLocals) {
JavaIdentifierFactory factory = JavaIdentifierFactory.getInstance();
JavaJimple javaJimple = JavaJimple.getInstance();
- StmtPositionInfo noPositionInfo = StmtPositionInfo.createNoStmtPositionInfo();
+ StmtPositionInfo noPositionInfo = StmtPositionInfo.getNoStmtPositionInfo();
JavaClassType objectType = factory.getClassType("java.lang.Object");
JavaClassType stringType = factory.getClassType("java.lang.String");
diff --git a/sootup.java.core/src/main/java/sootup/java/core/AnnotationUsage.java b/sootup.java.core/src/main/java/sootup/java/core/AnnotationUsage.java
index c89b37917af..6f4f163c295 100644
--- a/sootup.java.core/src/main/java/sootup/java/core/AnnotationUsage.java
+++ b/sootup.java.core/src/main/java/sootup/java/core/AnnotationUsage.java
@@ -1,5 +1,27 @@
package sootup.java.core;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
diff --git a/sootup.java.core/src/main/java/sootup/java/core/JavaAnnotationSootMethod.java b/sootup.java.core/src/main/java/sootup/java/core/JavaAnnotationSootMethod.java
index 81227e5c845..fa2038788d1 100644
--- a/sootup.java.core/src/main/java/sootup/java/core/JavaAnnotationSootMethod.java
+++ b/sootup.java.core/src/main/java/sootup/java/core/JavaAnnotationSootMethod.java
@@ -1,5 +1,27 @@
package sootup.java.core;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import sootup.core.frontend.BodySource;
diff --git a/sootup.java.core/src/main/java/sootup/java/core/JavaIdentifierFactory.java b/sootup.java.core/src/main/java/sootup/java/core/JavaIdentifierFactory.java
index 19732777fd7..f5bd6c16012 100644
--- a/sootup.java.core/src/main/java/sootup/java/core/JavaIdentifierFactory.java
+++ b/sootup.java.core/src/main/java/sootup/java/core/JavaIdentifierFactory.java
@@ -25,13 +25,11 @@
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Maps;
-import java.nio.file.Path;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
-import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.ClassUtils;
import sootup.core.IdentifierFactory;
import sootup.core.signatures.FieldSignature;
@@ -56,14 +54,24 @@ public class JavaIdentifierFactory implements IdentifierFactory {
@Nonnull private static final JavaIdentifierFactory INSTANCE = new JavaIdentifierFactory();
+ @Nonnull
+ public static final MethodSubSignature STATIC_INITIALIZER =
+ new MethodSubSignature("", Collections.emptyList(), VoidType.getInstance());
+
@Override
public boolean isStaticInitializerSubSignature(@Nonnull MethodSubSignature methodSubSignature) {
- return methodSubSignature.getName().equals("");
+ return methodSubSignature.equals(STATIC_INITIALIZER);
+ }
+
+ @Override
+ public boolean isConstructorSignature(@Nonnull MethodSignature methodSignature) {
+ return isConstructorSubSignature(methodSignature.getSubSignature());
}
@Override
public boolean isConstructorSubSignature(@Nonnull MethodSubSignature methodSubSignature) {
- return methodSubSignature.getName().equals("");
+ return methodSubSignature.getName().equals("")
+ && methodSubSignature.getType() == VoidType.getInstance();
}
@Override
@@ -250,22 +258,6 @@ public AnnotationType getAnnotationType(final String fullyQualifiedClassName) {
(k) -> new AnnotationType(className, getPackageName(packageName)));
}
- @Override
- @Nonnull
- public JavaClassType fromPath(@Nonnull final Path rootDirectory, @Nonnull final Path file) {
-
- final int nameCountBaseDir =
- rootDirectory.toString().isEmpty() ? 0 : rootDirectory.getNameCount();
-
- String fullyQualifiedName =
- FilenameUtils.removeExtension(
- file.subpath(nameCountBaseDir, file.getNameCount())
- .toString()
- .replace(file.getFileSystem().getSeparator(), "."));
-
- return getClassType(fullyQualifiedName);
- }
-
/**
* Returns a unique PackageName. The method looks up a cache if it already contains a signature
* with the given package name. If the cache lookup fails a new signature is created.
diff --git a/sootup.java.core/src/main/java/sootup/java/core/ModuleInfoAnalysisInputLocation.java b/sootup.java.core/src/main/java/sootup/java/core/ModuleInfoAnalysisInputLocation.java
index 7b36f0cf013..5becf5e5217 100644
--- a/sootup.java.core/src/main/java/sootup/java/core/ModuleInfoAnalysisInputLocation.java
+++ b/sootup.java.core/src/main/java/sootup/java/core/ModuleInfoAnalysisInputLocation.java
@@ -1,5 +1,27 @@
package sootup.java.core;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
import java.util.Collection;
import java.util.Optional;
import java.util.Set;
diff --git a/sootup.java.core/src/main/java/sootup/java/core/ModuleModifier.java b/sootup.java.core/src/main/java/sootup/java/core/ModuleModifier.java
index 43b765e71d0..d02068ac814 100644
--- a/sootup.java.core/src/main/java/sootup/java/core/ModuleModifier.java
+++ b/sootup.java.core/src/main/java/sootup/java/core/ModuleModifier.java
@@ -1,5 +1,27 @@
package sootup.java.core;
+/*-
+ * #%L
+ * SootUp
+ * %%
+ * Copyright (C) 1997 - 2024 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
+ * .
+ * #L%
+ */
+
// Modifier for java 9 modules corresponding to the bytecodes used in module-info.class
public enum ModuleModifier {
OPENS(0x0020), // a module is accessible to reflection (deep&shallow)
diff --git a/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java b/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java
index ecbd71f10c4..6fca0f044b1 100644
--- a/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java
+++ b/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java
@@ -27,12 +27,10 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nonnull;
-import sootup.core.SourceTypeSpecifier;
import sootup.core.cache.provider.ClassCacheProvider;
import sootup.core.cache.provider.FullCacheProvider;
import sootup.core.inputlocation.AnalysisInputLocation;
import sootup.core.inputlocation.ClassLoadingOptions;
-import sootup.core.inputlocation.DefaultSourceTypeSpecifier;
import sootup.core.inputlocation.EmptyClassLoadingOptions;
import sootup.core.signatures.PackageName;
import sootup.core.types.ClassType;
@@ -68,19 +66,6 @@ public JavaModuleView(
analysisInputLocation -> EmptyClassLoadingOptions.Default);
}
- public JavaModuleView(
- @Nonnull List inputLocations,
- @Nonnull List moduleInputLocations,
- @Nonnull ClassCacheProvider cacheProvider,
- @Nonnull Function classLoadingOptionsSpecifier) {
- this(
- inputLocations,
- moduleInputLocations,
- cacheProvider,
- classLoadingOptionsSpecifier,
- DefaultSourceTypeSpecifier.getInstance());
- }
-
/**
* Creates a new instance of the {@link JavaModuleView} class.
*
@@ -92,13 +77,8 @@ public JavaModuleView(
@Nonnull List inputLocations,
@Nonnull List moduleInputLocations,
@Nonnull ClassCacheProvider cacheProvider,
- @Nonnull Function classLoadingOptionsSpecifier,
- @Nonnull SourceTypeSpecifier sourceTypeSpecifier) {
- super(
- inputLocations,
- cacheProvider,
- sourceTypeSpecifier,
- JavaModuleIdentifierFactory.getInstance());
+ @Nonnull Function classLoadingOptionsSpecifier) {
+ super(inputLocations, cacheProvider, JavaModuleIdentifierFactory.getInstance());
this.moduleInfoAnalysisInputLocations = moduleInputLocations;
JavaModuleInfo unnamedModuleInfo = JavaModuleInfo.getUnnamedModuleInfo();
moduleInfoMap.put(unnamedModuleInfo.getModuleSignature(), unnamedModuleInfo);
diff --git a/sootup.java.core/src/main/java/sootup/java/core/views/JavaView.java b/sootup.java.core/src/main/java/sootup/java/core/views/JavaView.java
index 94311b9b003..10dec87392c 100644
--- a/sootup.java.core/src/main/java/sootup/java/core/views/JavaView.java
+++ b/sootup.java.core/src/main/java/sootup/java/core/views/JavaView.java
@@ -25,14 +25,12 @@
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
-import sootup.core.SourceTypeSpecifier;
import sootup.core.cache.ClassCache;
import sootup.core.cache.FullCache;
import sootup.core.cache.provider.ClassCacheProvider;
import sootup.core.cache.provider.FullCacheProvider;
import sootup.core.frontend.AbstractClassSource;
import sootup.core.inputlocation.AnalysisInputLocation;
-import sootup.core.inputlocation.DefaultSourceTypeSpecifier;
import sootup.core.signatures.FieldSignature;
import sootup.core.signatures.MethodSignature;
import sootup.core.types.ClassType;
@@ -52,7 +50,6 @@ public class JavaView extends AbstractView {
@Nonnull protected final List inputLocations;
@Nonnull protected final ClassCache cache;
- @Nonnull protected final SourceTypeSpecifier sourceTypeSpecifier;
protected volatile boolean isFullyResolved = false;
@@ -64,33 +61,18 @@ public JavaView(@Nonnull List inputLocations) {
this(inputLocations, new FullCacheProvider());
}
- /**
- * Creates a new instance of the {@link JavaView} class.
- *
- * {@link AnalysisInputLocation}, simply return null, otherwise the desired
- * options.
- */
public JavaView(
@Nonnull List inputLocations,
@Nonnull ClassCacheProvider cacheProvider) {
- this(inputLocations, cacheProvider, DefaultSourceTypeSpecifier.getInstance());
- }
-
- public JavaView(
- @Nonnull List inputLocations,
- @Nonnull ClassCacheProvider cacheProvider,
- @Nonnull SourceTypeSpecifier sourceTypeSpecifier) {
- this(inputLocations, cacheProvider, sourceTypeSpecifier, JavaIdentifierFactory.getInstance());
+ this(inputLocations, cacheProvider, JavaIdentifierFactory.getInstance());
}
protected JavaView(
@Nonnull List