Skip to content

Commit 2ae303a

Browse files
StevenArztStevenArzt
authored
Merge branch 'develop' into develop
2 parents 19a9278 + 395b878 commit 2ae303a

File tree

679 files changed

+10497
-38614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

679 files changed

+10497
-38614
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/soot-oss/soot)
33

44
# IMPORTANT: Soot is now succeeded by SootUp!
5-
**In December 2022, we have officially released [SootUp](https://soot-oss.github.io/SootUp/announce/), a version of Soot with a completely overhauled, more modular, testable, maintainable and usable architecture. Please check this out in case you wish to start a new program-analysis project.**
5+
**In December 2022, we have officially released [SootUp](https://soot-oss.github.io/SootUp/), a version of Soot with a completely overhauled, more modular, testable, maintainable and usable architecture. Please check this out in case you wish to start a new program-analysis project.**
66

77
# Using Soot? Let us know about it!
88
We are regularly applying for funding to help us maintain Soot. You can help us immensely by letting us know about [**projects that use Soot**](https://github.com/soot-oss/soot/wiki/Users-of-Soot), both commercially or in the form of research tools.

‎doc/soot_options.html

-4
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,6 @@ <H1><A NAME="description">DESCRIPTION</A></H1>
445445
<H1><A NAME="options">OPTIONS</A></H1>
446446
<H2><A name="section_1">General Options</A></H2>
447447
<table border="3">
448-
<tr>
449-
<td><tt>-coffi </tt><br></td>
450-
<td colspan="2">Use the good old Coffi front end for parsing Java bytecode (instead of using ASM).</td>
451-
</tr>
452448
<tr>
453449
<td><tt>-jasmin-backend </tt><br></td>
454450
<td colspan="2">Use the Jasmin back end for generating Java bytecode (instead of using ASM).</td>

‎eclipse/ca.mcgill.sable.soot/src/ca/mcgill/sable/soot/ui/PhaseOptionsDialog.java

-27
Original file line numberDiff line numberDiff line change
@@ -996,12 +996,6 @@ private boolean createNewConfig() {
996996
String nextListToken;
997997

998998

999-
boolRes = getGeneral_Optionscoffi_widget().getButton().getSelection();
1000-
defBoolRes = false;
1001-
1002-
if (boolRes != defBoolRes) {
1003-
getConfig().put(getGeneral_Optionscoffi_widget().getAlias(), new Boolean(boolRes));
1004-
}
1005999
boolRes = getGeneral_Optionsjasmin_backend_widget().getButton().getSelection();
10061000
defBoolRes = false;
10071001

@@ -4559,16 +4553,6 @@ protected SootOption getInitialInput() {
45594553

45604554

45614555

4562-
private BooleanOptionWidget General_Optionscoffi_widget;
4563-
4564-
private void setGeneral_Optionscoffi_widget(BooleanOptionWidget widget) {
4565-
General_Optionscoffi_widget = widget;
4566-
}
4567-
4568-
public BooleanOptionWidget getGeneral_Optionscoffi_widget() {
4569-
return General_Optionscoffi_widget;
4570-
}
4571-
45724556
private BooleanOptionWidget General_Optionsjasmin_backend_widget;
45734557

45744558
private void setGeneral_Optionsjasmin_backend_widget(BooleanOptionWidget widget) {
@@ -8636,17 +8620,6 @@ private Composite General_OptionsCreate(Composite parent) {
86368620

86378621

86388622

8639-
defKey = ""+" "+""+" "+"coffi";
8640-
defKey = defKey.trim();
8641-
8642-
if (isInDefList(defKey)) {
8643-
defaultBool = getBoolDef(defKey);
8644-
} else {
8645-
defaultBool = false;
8646-
}
8647-
8648-
setGeneral_Optionscoffi_widget(new BooleanOptionWidget(editGroupGeneral_Options, SWT.NONE, new OptionData("Coffi Frontend", "", "","coffi", "\n", defaultBool)));
8649-
86508623
defKey = ""+" "+""+" "+"jasmin-backend";
86518624
defKey = defKey.trim();
86528625

‎pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@
5555
<maven.compiler.source>1.8</maven.compiler.source>
5656
<maven.compiler.target>1.8</maven.compiler.target>
5757
<xml-maven-plugin.version>1.0.2</xml-maven-plugin.version>
58-
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
59-
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
60-
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
61-
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
62-
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
63-
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
64-
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
65-
<maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
58+
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
59+
<build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
60+
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
61+
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
62+
<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
63+
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
64+
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
65+
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
6666
<maven-nexus-staging-plugin.version>1.6.13</maven-nexus-staging-plugin.version>
67-
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
67+
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
6868
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
69-
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
69+
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
7070
<checkstyle.version>8.18</checkstyle.version>
7171
<checkstyle.dir.path>${basedir}/codingstyle</checkstyle.dir.path>
7272
<checkstyle.file.path>${checkstyle.dir.path}/soot_checkstyle_checks.xml</checkstyle.file.path>

‎src/main/generated/jastadd/soot/JastAddJ/ASTNode$State.java

-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
import soot.*;
1313
import soot.util.*;
1414
import soot.jimple.*;
15-
import soot.coffi.ClassFile;
16-
import soot.coffi.method_info;
17-
import soot.coffi.CONSTANT_Utf8_info;
1815
import soot.tagkit.SourceFileTag;
19-
import soot.coffi.CoffiMethodSource;
2016
/**
2117
* @apilevel internal
2218
* @ast class

‎src/main/generated/jastadd/soot/JastAddJ/ASTNode.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production ASTNode;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AbstractDot.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AbstractDot : {@link Access} ::= <span class="component">Left:{@link Expr}</span> <span class="component">Right:{@link Access}</span>;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AbstractWildcard.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AbstractWildcard : {@link Access};
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AbstractWildcardType.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AbstractWildcardType : {@link TypeDecl};
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/Access.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production Access : {@link Expr};
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AddExpr.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AddExpr : {@link AdditiveExpr};
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AdditiveExpr.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AdditiveExpr : {@link ArithmeticExpr};
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AmbiguousAccess.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AmbiguousAccess : {@link Access} ::= <span class="component">&lt;ID:String&gt;</span>;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AndBitwiseExpr.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AndBitwiseExpr : {@link BitwiseExpr};
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AndLogicalExpr.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AndLogicalExpr : {@link LogicalExpr};
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AnnotatedCompilationUnit.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117

2218
/**
2319
* @production AnnotatedCompilationUnit : {@link CompilationUnit} ::= <span class="component">{@link Modifiers}</span>;

‎src/main/generated/jastadd/soot/JastAddJ/Annotation.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117

2218
/**
2319
* @production Annotation : {@link Modifier} ::= <span class="component">&lt;ID:String&gt;</span> <span class="component">{@link Access}</span> <span class="component">{@link ElementValuePair}*</span>;

‎src/main/generated/jastadd/soot/JastAddJ/AnnotationDecl.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117

2218
/**
2319
* @production AnnotationDecl : {@link InterfaceDecl} ::= <span class="component">SuperInterfaceId:{@link Access}*</span>;

‎src/main/generated/jastadd/soot/JastAddJ/AnnotationMethodDecl.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AnnotationMethodDecl : {@link MethodDecl} ::= <span class="component">[DefaultValue:{@link ElementValue}]</span>;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AnonymousDecl.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AnonymousDecl : {@link ClassDecl} ::= <span class="component">{@link Modifiers}</span> <span class="component">&lt;ID:String&gt;</span> <span class="component">[SuperClassAccess:{@link Access}]</span> <span class="component">Implements:{@link Access}*</span> <span class="component">{@link BodyDecl}*</span>;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/ArithmeticExpr.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production ArithmeticExpr : {@link Binary};
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/ArrayAccess.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production ArrayAccess : {@link Access} ::= <span class="component">{@link Expr}</span>;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/ArrayCreationExpr.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production ArrayCreationExpr : {@link PrimaryExpr} ::= <span class="component">TypeAccess:{@link Access}</span> <span class="component">[{@link ArrayInit}]</span>;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/ArrayDecl.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production ArrayDecl : {@link ClassDecl};
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/ArrayInit.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production ArrayInit : {@link Expr} ::= <span class="component">Init:{@link Expr}*</span>;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/ArrayTypeAccess.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production ArrayTypeAccess : {@link TypeAccess} ::= <span class="component">&lt;Package:String&gt;</span> <span class="component">&lt;ID:String&gt;</span> <span class="component">{@link Access}</span>;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/ArrayTypeWithSizeAccess.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production ArrayTypeWithSizeAccess : {@link ArrayTypeAccess} ::= <span class="component">{@link Expr}</span>;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AssertStmt.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AssertStmt : {@link Stmt} ::= <span class="component">first:{@link Expr}</span> <span class="component">[{@link Expr}]</span>;
2319
* @ast node

‎src/main/generated/jastadd/soot/JastAddJ/AssignAdditiveExpr.java

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
import soot.*;
1414
import soot.util.*;
1515
import soot.jimple.*;
16-
import soot.coffi.ClassFile;
17-
import soot.coffi.method_info;
18-
import soot.coffi.CONSTANT_Utf8_info;
1916
import soot.tagkit.SourceFileTag;
20-
import soot.coffi.CoffiMethodSource;
2117
/**
2218
* @production AssignAdditiveExpr : {@link AssignExpr};
2319
* @ast node

0 commit comments

Comments
 (0)