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

java 8 changes 

minor fixes, such as making CheckForFrontEndErrors more accessible
minor hacks to make stuff compile with TeaVM
This commit is contained in:
Julian Dolby 2017-08-25 10:58:00 -04:00
parent 2d829a339e
commit b6af5267f1
53 changed files with 62 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF
View File

@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
Bundle-SymbolicName: com.ibm.wala.cast.java.ecj
Bundle-Version: 1.4.4.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.ibm.wala.cast.java,
com.ibm.wala.core,
org.eclipse.core.runtime,

2
com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF
View File

@ -4,4 +4,4 @@ Bundle-Name: %Bundle-Name
Bundle-SymbolicName: com.ibm.wala.cast.java.test.data
Bundle-Version: 1.4.4.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

2
com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
View File

@ -14,4 +14,4 @@ Require-Bundle: com.ibm.wala.core.tests,
org.junit;bundle-version="4.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: com.ibm.wala.cast.java.test
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

2
com.ibm.wala.cast.java/META-INF/MANIFEST.MF
View File

@ -20,4 +20,4 @@ Export-Package: com.ibm.wala.cast.java.analysis.typeInference,
com.ibm.wala.cast.java.translator,
com.ibm.wala.cast.java.types
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

2
com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
View File

@ -13,6 +13,6 @@ Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.0.0",
com.ibm.wala.core.tests;bundle-version="1.1.3",
com.ibm.wala.core;bundle-version="1.1.3",
org.junit;bundle-version="4.8.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .,
lib/htmlparser-1.4.jar

2
com.ibm.wala.cast.js.html.nu_validator/build.properties
View File

@ -8,4 +8,4 @@ bin.includes = META-INF/,\
jars.extra.classpath = lib/htmlparser-1.4.jar
javacProjectSettings = true
output.. = bin/

2
com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF
View File

@ -18,4 +18,4 @@ Require-Bundle: com.ibm.wala.cast.js.nodejs;bundle-version="1.3.10",
com.ibm.wala.cast.js.rhino;bundle-version="1.3.10",
com.ibm.wala.core;bundle-version="1.3.10",
org.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

2
com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
View File

@ -9,4 +9,4 @@ Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.3.10",
com.ibm.wala.cast.js.rhino;bundle-version="1.3.10"
Bundle-ClassPath: lib/json-20160212.jar,
.
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

1
com.ibm.wala.cast.js.nodejs/build.properties
View File

@ -11,3 +11,4 @@ javacProjectSettings = true
bin.excludes = dat/core-modules/.eslintrc,\
dat/core-modules/.gitignore,\
dat/core-modules/.gitkeep
javacDefaultEncoding.. = UTF-8

2
com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java
View File

@ -80,7 +80,7 @@ public class NodejsCallGraphBuilderUtil extends JSCallGraphUtil {
CAstAnalysisScope scope = new CAstAnalysisScope(files, loaders, languages);
IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, language, null);
com.ibm.wala.cast.js.util.Util.checkForFrontEndErrors(cha);
com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
// Make Script Roots
Iterable<Entrypoint> roots = new JavaScriptEntryPoints(cha, loaders.getTheLoader());

2
com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
View File

@ -14,7 +14,7 @@ Require-Bundle: com.ibm.wala.cast.js.rhino;bundle-version="1.0.0",
com.ibm.wala.cast.js.test.data;bundle-version="1.3.4",
com.ibm.wala.shrike;bundle-version="1.3.4",
org.junit;bundle-version="4.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: com.ibm.wala.cast.js.examples.hybrid,
com.ibm.wala.cast.js.rhino.callgraph.fieldbased.test,

3
com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/PrintIRs.java
View File

@ -28,7 +28,6 @@ import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
import com.ibm.wala.cast.js.loader.JavaScriptLoader;
import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
import com.ibm.wala.cast.js.util.Util;
import com.ibm.wala.cast.loader.AstMethod;
import com.ibm.wala.cast.types.AstMethodReference;
import com.ibm.wala.classLoader.IClass;
@ -101,7 +100,7 @@ public class PrintIRs {
JavaScriptLoaderFactory loaders = new WebPageLoaderFactory(JSCallGraphUtil.getTranslatorFactory());
CAstAnalysisScope scope = new CAstAnalysisScope(scripts, loaders, Collections.singleton(JavaScriptLoader.JS));
IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS);
Util.checkForFrontEndErrors(cha);
com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
printIRsForCHA(cha, new Predicate<String>() {
@Override

3
com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShapeRhino.java
View File

@ -17,7 +17,6 @@ import org.junit.Test;
import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
import com.ibm.wala.cast.js.util.Util;
import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
import com.ibm.wala.util.CancelException;
import com.ibm.wala.util.WalaException;
@ -82,7 +81,7 @@ public class TestSimpleCallGraphShapeRhino extends TestSimpleCallGraphShape {
public void testParseError() throws IllegalArgumentException, IOException, CancelException, WalaException {
PropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "portal-example-simple.html");
B.makeCallGraph(B.getOptions());
Util.checkForFrontEndErrors(B.getClassHierarchy());
com.ibm.wala.cast.util.Util.checkForFrontEndErrors(B.getClassHierarchy());
}
}

3
com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhino.java
View File

@ -22,7 +22,6 @@ import com.ibm.wala.cast.js.html.JSSourceExtractor;
import com.ibm.wala.cast.js.html.WebUtil;
import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
import com.ibm.wala.cast.js.util.Util;
import com.ibm.wala.ipa.callgraph.CallGraph;
import com.ibm.wala.util.CancelException;
import com.ibm.wala.util.WalaException;
@ -45,7 +44,7 @@ public abstract class TestSimplePageCallGraphShapeRhino extends TestSimplePageCa
URL url = getClass().getClassLoader().getResource("pages/garbage2.html");
JSCFABuilder B = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url, DefaultSourceExtractor.factory);
B.makeCallGraph(B.getOptions());
Util.checkForFrontEndErrors(B.getClassHierarchy());
com.ibm.wala.cast.util.Util.checkForFrontEndErrors(B.getClassHierarchy());
}
public static void main(String[] args) {

3
com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhinoJericho.java
View File

@ -18,7 +18,6 @@ import com.ibm.wala.cast.js.html.DefaultSourceExtractor;
import com.ibm.wala.cast.js.html.IHtmlParser;
import com.ibm.wala.cast.js.html.jericho.JerichoHtmlParser;
import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
import com.ibm.wala.cast.js.util.Util;
import com.ibm.wala.ipa.callgraph.CallGraph;
import com.ibm.wala.util.CancelException;
import com.ibm.wala.util.WalaException;
@ -36,7 +35,7 @@ public class TestSimplePageCallGraphShapeRhinoJericho extends TestSimplePageCall
URL url = getClass().getClassLoader().getResource("pages/garbage.html");
JSCFABuilder B = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url, DefaultSourceExtractor.factory);
B.makeCallGraph(B.getOptions());
Util.checkForFrontEndErrors(B.getClassHierarchy());
com.ibm.wala.cast.util.Util.checkForFrontEndErrors(B.getClassHierarchy());
}
public static void main(String[] args) {

2
com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
View File

@ -7,7 +7,7 @@ Bundle-Vendor: %Bundle-Vendor
Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
com.ibm.wala.cast.js;bundle-version="1.0.0",
com.ibm.wala.core;bundle-version="1.1.3"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: com.ibm.wala.cast.js.translator,
org.mozilla.classfile,

2
com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.container
View File

@ -1 +1 @@
org.eclipse.wst.jsdt.launching.JRE_CONTAINER
org.eclipse.wst.jsdt.launching.JRE_CONTAINER

2
com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.name
View File

@ -1 +1 @@
Global
Global

2
com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF
View File

@ -7,4 +7,4 @@ Bundle-Version: 1.4.4.qualifier
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: examples-src/
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

2
com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF
View File

@ -13,4 +13,4 @@ Require-Bundle: com.ibm.wala.cast.js,
com.ibm.wala.cast.js.test.data;bundle-version="1.3.4",
org.junit;bundle-version="4.0.0"
Export-Package: com.ibm.wala.cast.js.test
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

3
com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/FieldBasedCGUtil.java
View File

@ -31,7 +31,6 @@ import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
import com.ibm.wala.cast.js.loader.JavaScriptLoader;
import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory;
import com.ibm.wala.cast.js.util.Util;
import com.ibm.wala.classLoader.Module;
import com.ibm.wala.classLoader.SourceModule;
import com.ibm.wala.classLoader.SourceURLModule;
@ -126,7 +125,7 @@ public class FieldBasedCGUtil {
public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildCG(JavaScriptLoaderFactory loaders, Module[] scripts, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis) throws WalaException, CancelException {
CAstAnalysisScope scope = new CAstAnalysisScope(scripts, loaders, Collections.singleton(JavaScriptLoader.JS));
IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS);
Util.checkForFrontEndErrors(cha);
com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
Iterable<Entrypoint> roots = JSCallGraphUtil.makeScriptRoots(cha);
IAnalysisCacheView cache = new AnalysisCacheImpl(AstIRFactory.makeDefaultFactory());
final FieldBasedCallGraphBuilder builder = builderType.fieldBasedCallGraphBuilderFactory(cha,

2
com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java
View File

@ -227,7 +227,7 @@ public class JSCallGraphBuilderUtil extends com.ibm.wala.cast.js.ipa.callgraph.J
protected static JSCFABuilder makeCG(JavaScriptLoaderFactory loaders, AnalysisScope scope, CGBuilderType builderType, IRFactory<IMethod> irFactory) throws WalaException {
try {
IClassHierarchy cha = makeHierarchy(scope, loaders);
com.ibm.wala.cast.js.util.Util.checkForFrontEndErrors(cha);
com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
Iterable<Entrypoint> roots = makeScriptRoots(cha);
JSAnalysisOptions options = makeOptions(scope, cha, roots);
options.setHandleCallApply(builderType.handleCallApply());

2
com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestArgumentSensitivity.java
View File

@ -46,7 +46,7 @@ public abstract class TestArgumentSensitivity extends TestJSCallGraphShape {
AnalysisScope scope = JSCallGraphBuilderUtil.makeScriptScope("tests", "args.js", loaders);
IClassHierarchy cha = JSCallGraphUtil.makeHierarchy(scope, loaders);
com.ibm.wala.cast.js.util.Util.checkForFrontEndErrors(cha);
com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
Iterable<Entrypoint> roots = JSCallGraphUtil.makeScriptRoots(cha);
JSAnalysisOptions options = JSCallGraphUtil.makeOptions(scope, cha, roots);

2
com.ibm.wala.cast.js/META-INF/MANIFEST.MF
View File

@ -34,4 +34,4 @@ Require-Bundle: com.ibm.wala.cast,
com.ibm.wala.cast,
com.ibm.wala.shrike;bundle-version="1.1.3"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

3
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java
View File

@ -35,7 +35,6 @@ import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
import com.ibm.wala.cast.js.loader.JavaScriptLoader;
import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory;
import com.ibm.wala.cast.js.util.Util;
import com.ibm.wala.cast.loader.AstMethod;
import com.ibm.wala.cast.loader.AstMethod.LexicalInformation;
import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
@ -287,7 +286,7 @@ public class CorrelationFinder {
CAstAnalysisScope scope = new CAstAnalysisScope(scripts_array, loaders, Collections.singleton(JavaScriptLoader.JS));
IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS);
try {
Util.checkForFrontEndErrors(cha);
com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
} catch (WalaException e) {
return Collections.emptyMap();
}

33
com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/Util.java
View File

@ -13,50 +13,17 @@ package com.ibm.wala.cast.js.util;
import java.util.Iterator;
import com.ibm.wala.cast.js.ssa.PrototypeLookup;
import com.ibm.wala.cast.loader.CAstAbstractLoader;
import com.ibm.wala.classLoader.IClassLoader;
import com.ibm.wala.classLoader.ModuleEntry;
import com.ibm.wala.ipa.cha.IClassHierarchy;
import com.ibm.wala.ssa.DefUse;
import com.ibm.wala.ssa.IR;
import com.ibm.wala.ssa.SSAInstruction;
import com.ibm.wala.ssa.SSAPhiInstruction;
import com.ibm.wala.util.WalaException;
import com.ibm.wala.util.intset.IntSet;
import com.ibm.wala.util.intset.IntSetAction;
import com.ibm.wala.util.intset.IntSetUtil;
import com.ibm.wala.util.intset.MutableIntSet;
import com.ibm.wala.util.warnings.Warning;
public class Util {
public static void checkForFrontEndErrors(IClassHierarchy cha) throws WalaException {
StringBuffer message = null;
for(IClassLoader loader : cha.getLoaders()) {
if (loader instanceof CAstAbstractLoader) {
Iterator<ModuleEntry> errors = ((CAstAbstractLoader)loader).getModulesWithParseErrors();
if (errors.hasNext()) {
if (message == null) {
message = new StringBuffer("front end errors:\n");
}
while (errors.hasNext()) {
ModuleEntry errorModule = errors.next();
for(Warning w : (((CAstAbstractLoader)loader).getMessages(errorModule))) {
message.append("error in ").append(errorModule.getName()).append(":\n");
message.append(w.toString()).append("\n");
}
}
}
// clear out the errors to free some memory
((CAstAbstractLoader)loader).clearMessages();
}
}
if (message != null) {
message.append("end of front end errors\n");
throw new WalaException(String.valueOf(message));
}
}
public static IntSet getArgumentsArrayVns(IR ir, final DefUse du) {
int originalArgsVn = getArgumentsArrayVn(ir);
final MutableIntSet result = IntSetUtil.make();

2
com.ibm.wala.cast.test/META-INF/MANIFEST.MF
View File

@ -12,5 +12,5 @@ Require-Bundle:
com.ibm.wala.shrike,
org.eclipse.core.runtime
Export-Package: com.ibm.wala.cast.test
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

2
com.ibm.wala.cast.test/harness-src/c/Makefile
View File

@ -16,7 +16,7 @@ CAST_OBJS = $(wildcard $(C_GENERATED)/*.o)
default: $(CAST_TEST_BIN)$(LIBPREFIX)xlator_test.$(DLLEXT)
$(TEST_JNI_BRIDGE_HEADER): $(CAST_TEST_BIN)com/ibm/wala/cast/test/TestNativeTranslator.class
$(JAVA_SDK)bin/javah -classpath "$(CAST_TEST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.test.TestNativeTranslator
$(JAVA_HOME)bin/javah -classpath "$(CAST_TEST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.test.TestNativeTranslator
$(C_GENERATED)/smoke.o: $(TEST_JNI_BRIDGE_HEADER) smoke.cpp
$(CC) $(ALL_FLAGS) -o $@ -c smoke.cpp

2
com.ibm.wala.cast/META-INF/MANIFEST.MF
View File

@ -28,5 +28,5 @@ Export-Package: com.ibm.wala.cast.analysis.typeInference,
com.ibm.wala.cast.util,
org.apache.commons.io,
org.apache.commons.io.input
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

4
com.ibm.wala.cast/source/c/Makefile
View File

@ -13,10 +13,10 @@ bindir:
mkdir -p $(C_GENERATED)
$(CAPA_JNI_BRIDGE_HEADER): $(DOMO_AST_BIN)com/ibm/wala/cast/ir/translator/NativeBridge.class bindir
$(JAVA_SDK)bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeBridge
$(JAVA_HOME)bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeBridge
$(CAPA_JNI_XLATOR_HEADER): $(DOMO_AST_BIN)com/ibm/wala/cast/ir/translator/NativeTranslatorToCAst.class bindir
$(JAVA_SDK)bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeTranslatorToCAst
$(JAVA_HOME)bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeTranslatorToCAst
$(CAPA_OBJECTS): $(C_GENERATED)%.o: %.cpp $(CAPA_JNI_HEADERS) bindir
echo $(CAPA_OBJECTS)

2
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/DelegatingAstPointerKeys.java
View File

@ -123,6 +123,6 @@ public class DelegatingAstPointerKeys implements AstPointerKeyFactory {
return new NonNullSingletonIterator<>(ifk);
}
}
return new NonNullSingletonIterator<PointerKey>(ReflectedFieldPointerKey.mapped(new ConcreteTypeKey(getFieldNameType(F)), I));
return new NonNullSingletonIterator<>(ReflectedFieldPointerKey.mapped(new ConcreteTypeKey(getFieldNameType(F)), I));
}
}

2
com.ibm.wala.core.testdata/build.properties
View File

@ -10,4 +10,4 @@ bin.includes = META-INF/,\
com.ibm.wala.core.testdata_1.0.0a.jar,\
OSGI-INF/l10n/bundle.properties,\
OSGI-INF/

2
com.ibm.wala.core.tests/META-INF/MANIFEST.MF
View File

@ -35,7 +35,7 @@ Export-Package: com.ibm.wala.core.tests.arraybounds,
com.ibm.wala.examples.drivers,
com.ibm.wala.examples.properties,
com.ibm.wala.util.io
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Activator: com.ibm.wala.core.tests.plugin.CoreTestsPlugin
Eclipse-RegisterBuddy: com.ibm.wala.core, com.ibm.wala.core.testdata

2
com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java
View File

@ -104,7 +104,7 @@ public class ContextInsensitiveReachingDefs {
}
}
}
return new ObjectArrayMapping<Pair<CGNode, Integer>>(putInstrs.toArray(new Pair[putInstrs.size()]));
return new ObjectArrayMapping<>(putInstrs.toArray(new Pair[putInstrs.size()]));
}
private class TransferFunctions implements ITransferFunctionProvider<BasicBlockInContext<IExplodedBasicBlock>, BitVectorVariable> {

2
com.ibm.wala.core/META-INF/MANIFEST.MF
View File

@ -76,6 +76,6 @@ Export-Package: .,
com.ibm.wala.viz,
com.ibm.wala.viz.viewer,
com.ibm.wala.viz.viewer.images
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-BuddyPolicy: registered
Bundle-ClassPath: .

20
com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/SimpleDemandPointsTo.java
View File

@ -50,7 +50,7 @@ import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
import com.ibm.wala.ipa.callgraph.propagation.LocalPointerKey;
import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
import com.ibm.wala.ipa.cha.IClassHierarchy;
import com.ibm.wala.util.Predicate;
import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.debug.UnimplementedError;
import com.ibm.wala.util.graph.traverse.SlowDFSDiscoverTimeIterator;
@ -70,7 +70,6 @@ public class SimpleDemandPointsTo extends AbstractDemandPointsTo {
}
@Override
@SuppressWarnings("unchecked")
public Collection<InstanceKey> getPointsTo(PointerKey pk) throws IllegalArgumentException, UnimplementedError {
if (pk == null) {
@ -93,15 +92,16 @@ public class SimpleDemandPointsTo extends AbstractDemandPointsTo {
System.err.println(g.toString());
}
Predicate iKeyFilter = new Predicate() {
@Override
public boolean test(Object o) {
return o instanceof InstanceKey;
}
};
SlowDFSDiscoverTimeIterator<Object> dfs = new SlowDFSDiscoverTimeIterator<Object>(g, pk);
return Predicate.filter(dfs, iKeyFilter);
Collection<InstanceKey> keys = HashSetFactory.make();
while (dfs.hasNext()) {
Object o = dfs.next();
if (o instanceof InstanceKey) {
keys.add((InstanceKey) o);
}
}
return keys;
}
}

2
com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Slicer.java
View File

@ -302,7 +302,7 @@ public class Slicer {
private final Collection<Statement> roots;
private final ISupergraph<Statement, PDG<?>> supergraph;
private final ISupergraph<Statement, PDG<? extends InstanceKey>> supergraph;
private final SliceFunctions f;

2
com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java
View File

@ -329,7 +329,7 @@ public final class TypeName implements Serializable {
result.append("&");
break;
default:
throw new UnsupportedOperationException(String.format("unexpected masked type-name component %X", masked));
throw new UnsupportedOperationException("unexpected masked type-name component " + masked);
}
}
}

2
com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
View File

@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
com.ibm.wala.shrike;bundle-version="1.3.4",
org.junit;bundle-version="4.11.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .,
lib/dx.jar
Export-Package: com.ibm.wala.dalvik.drivers,

2
com.ibm.wala.dalvik.test/build.properties
View File

@ -7,5 +7,5 @@ bin.includes = META-INF/,\
OSGI-INF/l10n/bundle.properties,\
OSGI-INF/
jars.extra.classpath = lib/dx.jar
jre.compilation.profile = JavaSE-1.7
jre.compilation.profile = JavaSE-1.8
javacProjectSettings = true

2
com.ibm.wala.dalvik/META-INF/MANIFEST.MF
View File

@ -6,7 +6,7 @@ Bundle-Version: 1.4.4.qualifier
Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3",
com.ibm.wala.shrike;bundle-version="1.3.1",
com.ibm.wala.cast;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: com.google.common.annotations,
com.google.common.base,

2
com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
View File

@ -28,7 +28,7 @@ Require-Bundle: com.ibm.wala.cast.java.test;bundle-version="1.0.0",
org.eclipse.ant.launching,
com.ibm.wala.cast.java.ecj
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.ibm.wala.cast.java.jdt.test,
com.ibm.wala.cast.java.test,
com.ibm.wala.demandpa.driver

2
com.ibm.wala.ide.jdt.test/build.properties
View File

@ -5,5 +5,5 @@ bin.includes = META-INF/,\
.,\
OSGI-INF/l10n/bundle.properties,\
OSGI-INF/
jre.compilation.profile = JavaSE-1.7
jre.compilation.profile = JavaSE-1.8
javacProjectSettings = true

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

@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jdt.launching,
org.eclipse.jdt,
com.ibm.wala.cast.java.ecj
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: com.ibm.wala.cast.java.client,
com.ibm.wala.cast.java.translator.jdt,

2
com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF
View File

@ -23,5 +23,5 @@ Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3",
org.eclipse.ui.ide.application;bundle-version="1.0.501"
Bundle-Activator: com.ibm.wala.ide.jsdt.tests.Activator
Export-Package: com.ibm.wala.ide.jsdt.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy

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

@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.ide;bundle-version="3.8.2",
org.eclipse.pde;bundle-version="3.8.0",
org.eclipse.pde.core;bundle-version="3.8.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.wst.jsdt.internal.corext.callhierarchy
Export-Package: com.ibm.wala.cast.js.client,

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

@ -19,7 +19,7 @@ Require-Bundle: com.ibm.wala.shrike,
org.eclipse.e4.core.di;bundle-version="1.2.0";resolution:=optional,
org.junit;bundle-version="4.0.0"
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: com.ibm.wala.examples.drivers,
com.ibm.wala.ide.test,

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

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

2
com.ibm.wala.scandroid/META-INF/MANIFEST.MF
View File

@ -7,5 +7,5 @@ Bundle-Vendor: %Bundle-Vendor
Require-Bundle: com.ibm.wala.dalvik;bundle-version="1.3.4",
com.ibm.wala.core;bundle-version="1.3.4",
com.ibm.wala.shrike;bundle-version="1.3.4"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy

2
com.ibm.wala.shrike/META-INF/MANIFEST.MF
View File

@ -18,5 +18,5 @@ Export-Package: com.ibm.wala.shrike.bench,
com.ibm.wala.shrikeBT.tools,
com.ibm.wala.shrikeCT,
com.ibm.wala.sourcepos
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.ibm.wala.util

2
com.ibm.wala.util/META-INF/MANIFEST.MF
View File

@ -25,4 +25,4 @@ Export-Package: com.ibm.wala.dataflow.graph,
com.ibm.wala.util.tables,
com.ibm.wala.viz
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

1
pom.xml
View File

@ -116,6 +116,7 @@
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<compilerId>jdt</compilerId>
<useProjectSettings>true</useProjectSettings>
</configuration>
</plugin>

2
targets/e47/e47.target
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="WALA Eclipse Luna Target Platform" sequenceNumber="130">
<?pde version="3.8"?><target name="WALA Eclipse Oxygen Target Platform" sequenceNumber="130">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>