|
35 | 35 | import it.unive.lisa.analysis.nonrelational.inference.InferenceSystem; |
36 | 36 | import it.unive.lisa.analysis.nonrelational.value.TypeEnvironment; |
37 | 37 | import it.unive.lisa.analysis.nonrelational.value.ValueEnvironment; |
38 | | -import it.unive.lisa.analysis.string.tarsis.RegexAutomaton; |
39 | 38 | import it.unive.lisa.analysis.string.tarsis.Tarsis; |
40 | 39 | import it.unive.lisa.analysis.types.InferredTypes; |
41 | 40 | import it.unive.lisa.conf.LiSAConfiguration; |
@@ -324,21 +323,21 @@ public static void main(String[] args) throws AnalysisSetupException { |
324 | 323 | Set<Statement> cchisToCheck; |
325 | 324 |
|
326 | 325 | LiSAConfiguration cchis2 = new LiSAConfiguration(); |
327 | | - cchis2.workdir = outputDir + File.separatorChar +"xcontract" + File.separatorChar+ "Result"+fileInfos.hashCode(); |
| 326 | + cchis2.workdir = conf.workdir + File.separatorChar +"xcontract" + File.separatorChar+ "Result"+fileInfos.hashCode(); |
328 | 327 | cchis2.jsonOutput = true; |
329 | 328 | cchis2.optimize = false; |
330 | 329 |
|
331 | 330 | cchis2.analysisGraphs = cmd.hasOption(dump_opt) ? GraphType.HTML_WITH_SUBNODES : GraphType.NONE; |
332 | 331 |
|
333 | | - conf.openCallPolicy = RelaxedOpenCallPolicy.INSTANCE; |
334 | | - conf.abstractState = new SimpleAbstractState<>(new PointBasedHeap(), new ValueEnvironment<>(new Tarsis()), |
| 332 | + cchis2.openCallPolicy = RelaxedOpenCallPolicy.INSTANCE; |
| 333 | + cchis2.abstractState = new SimpleAbstractState<>(new PointBasedHeap(), new ValueEnvironment<>(new Tarsis()), |
335 | 334 | new TypeEnvironment<>(new InferredTypes())); |
336 | 335 |
|
337 | 336 | cchisToCheck = CchiUtils.computeCchisToCheck(fi, cchis); |
338 | 337 |
|
339 | 338 | if(cchisToCheck != null && !cchisToCheck.isEmpty()) { |
340 | | - conf.semanticChecks.add(new CrossChannelInvocationsWriteOpsChecker(cchisToCheck, cmd.hasOption(dumpAdditionalAnalysisInfo))); |
341 | | - lisaExecution(fi.getInput(), annotationSet, cmd.getOptionValue("framework"), "cchi-write", conf); |
| 339 | + cchis2.semanticChecks.add(new CrossChannelInvocationsWriteOpsChecker(cchisToCheck, cmd.hasOption(dumpAdditionalAnalysisInfo))); |
| 340 | + lisaExecution(fi.getInput(), annotationSet, cmd.getOptionValue("framework"), "cchi-write", cchis2); |
342 | 341 | } |
343 | 342 | } |
344 | 343 |
|
|
0 commit comments