Skip to content

Commit e1916b0

Browse files
committed
Always require manager in addResult to adapt to the change in 62686a4
1 parent 6a4bbb0 commit e1916b0

4 files changed

Lines changed: 3 additions & 10 deletions

File tree

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/ContextInsensitivePathBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private boolean checkForSource(Abstraction abs, SourceContextAndPath scap) {
129129
SourceContext sourceContext = abs.getSourceContext();
130130
results.addResult(scap.getDefinition(), scap.getAccessPath(), scap.getStmt(), sourceContext.getDefinition(),
131131
sourceContext.getAccessPath(), sourceContext.getStmt(), sourceContext.getUserData(),
132-
scap.getAbstractionPath());
132+
scap.getAbstractionPath(), manager);
133133
return true;
134134
}
135135

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/ContextInsensitiveSourceFinder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void run() {
8787
results.addResult(flagAbs.getSinkDefinition(), flagAbs.getAbstraction().getAccessPath(),
8888
flagAbs.getSinkStmt(), abstraction.getSourceContext().getDefinition(),
8989
abstraction.getSourceContext().getAccessPath(), abstraction.getSourceContext().getStmt(),
90-
abstraction.getSourceContext().getUserData(), null);
90+
abstraction.getSourceContext().getUserData(), null, manager);
9191

9292
// Sources may not have predecessors
9393
assert abstraction.getPredecessor() == null;

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/RecursivePathBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void run() {
145145
for (SourceContextAndPath context : getPaths(lastTaskId++, abs.getAbstraction(), initialStack)) {
146146
results.addResult(abs.getSinkDefinition(), abs.getAbstraction().getAccessPath(),
147147
abs.getSinkStmt(), context.getDefinition(), context.getAccessPath(), context.getStmt(),
148-
context.getUserData(), context.getAbstractionPath());
148+
context.getUserData(), context.getAbstractionPath(), manager);
149149
}
150150
}
151151

soot-infoflow/src/soot/jimple/infoflow/results/InfoflowResults.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,6 @@ public void addResult(ISourceSinkDefinition sinkDefinition, AccessPath sink, Stm
153153
new ResultSourceInfo(sourceDefinition, source, sourceStmt, pathAgnosticResults));
154154
}
155155

156-
public Pair<ResultSourceInfo, ResultSinkInfo> addResult(ISourceSinkDefinition sinkDefinition, AccessPath sink,
157-
Stmt sinkStmt, ISourceSinkDefinition sourceDefinition, AccessPath source, Stmt sourceStmt, Object userData,
158-
List<Abstraction> propagationPath) {
159-
return addResult(sinkDefinition, sink, sinkStmt, sourceDefinition, source, sourceStmt, userData,
160-
propagationPath, null);
161-
}
162-
163156
public Pair<ResultSourceInfo, ResultSinkInfo> addResult(ISourceSinkDefinition sinkDefinition, AccessPath sink,
164157
Stmt sinkStmt, ISourceSinkDefinition sourceDefinition, AccessPath source, Stmt sourceStmt, Object userData,
165158
List<Abstraction> propagationPath, InfoflowManager manager) {

0 commit comments

Comments
 (0)