DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/wala/WALA

This commit is contained in:
Julian Dolby 2016-02-11 12:09:50 -05:00
parent eb7748a745 a76486ef94
commit 57a8c7d019
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
com.ibm.wala.core/src/com/ibm/wala/properties/WalaProperties.java
View File

@ -59,7 +59,10 @@ public final class WalaProperties {
}
String dir = p.getProperty(WalaProperties.J2SE_DIR);
Assertions.productionAssertion(dir != null);
if (dir == null || !(new File(dir)).isDirectory()) {
System.err.println("WARNING: java_runtime_dir " + dir + " in wala.properties is invalid. Using boot class path instead.");
return PlatformUtil.getBootClassPathJars();
}
return getJarsInDirectory(dir);
}

12
com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/IFDSExplorerExample.java
View File

@ -33,7 +33,6 @@ import com.ibm.wala.ipa.cha.IClassHierarchy;
import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
import com.ibm.wala.util.WalaException;
import com.ibm.wala.util.collections.Pair;
import com.ibm.wala.util.config.AnalysisScopeReader;
import com.ibm.wala.util.io.CommandLine;
/**
@ -54,17 +53,20 @@ public class IFDSExplorerExample {
public static void main(String[] args) throws IOException, IllegalArgumentException, CallGraphBuilderCancelException,
WalaException {
Properties p = CommandLine.parse(args);
AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, null, IFDSExplorer.class.getClassLoader());
AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, "Java60RegressionExclusions.txt");
IClassHierarchy cha = ClassHierarchy.make(scope);
Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
"Ldataflow/StaticDataflow");
AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
CallGraph cg = builder.makeCallGraph(options, null);
AnalysisCache cache = new AnalysisCache();
CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, cache, cha, scope);
System.out.println("building CG");
CallGraph cg = builder.makeCallGraph(options, null);
System.out.println("done with CG");
System.out.println("computing reaching defs");
ContextSensitiveReachingDefs reachingDefs = new ContextSensitiveReachingDefs(cg, cache);
TabulationResult<BasicBlockInContext<IExplodedBasicBlock>, CGNode, Pair<CGNode, Integer>> result = reachingDefs.analyze();
System.out.println("done with reaching defs");
IFDSExplorer.setDotExe(p.getProperty("dotExe"));
IFDSExplorer.setGvExe(p.getProperty("viewerExe"));
IFDSExplorer.viewIFDS(result);

3
com.ibm.wala.ide/META-INF/MANIFEST.MF
View File

@ -17,7 +17,8 @@ Require-Bundle: com.ibm.wala.core,
org.eclipse.jdt.core,
org.eclipse.ui.ide,
org.eclipse.jdt,
org.eclipse.jdt.launching
org.eclipse.jdt.launching,
org.eclipse.e4.ui.workbench;bundle-version="1.2.2";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: com.ibm.wala.ide.classloader,