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

fix for missing Java 8 feature

This commit is contained in:
Julian Dolby 2017-02-24 22:29:14 -05:00
parent 583cf37e59
commit 7b393a7da2
3 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
com.ibm.wala.core.testdata/src/special/A.java Normal file
View File

@ -0,0 +1,30 @@
package special;
class A {
String name;
A() {
setX("silly");
}
public void setX(String name) {
this.name = name;
}
@Override
public
String toString() {
return name;
}
interface Ctor<T> {
T make();
}
public static void main(String[] args) {
Ctor<A> o = A::new;
Object a = o.make();
a.toString();
}
}

20
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/LambdaTest.java
View File

@ -41,6 +41,26 @@ import com.ibm.wala.util.strings.Atom;
*/
public class LambdaTest extends WalaTestCase {
@Test public void testStreamExample_137() throws IOException, ClassHierarchyException, IllegalArgumentException, CancelException {
AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
ClassHierarchy cha = ClassHierarchyFactory.make(scope);
Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
"Lspecial/A");
AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
TypeReference A = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lspecial/A");
MethodReference ct = MethodReference.findOrCreate(A, Atom.findOrCreateUnicodeAtom("<init>"), Descriptor.findOrCreateUTF8("()V"));
Set<CGNode> ctnodes = cg.getNodes(ct);
Assert.assertEquals(1, ctnodes.size());
MethodReference ts = MethodReference.findOrCreate(A, Atom.findOrCreateUnicodeAtom("toString"), Descriptor.findOrCreateUTF8("()Ljava/lang/String;"));
Set<CGNode> tsnodes = cg.getNodes(ts);
Assert.assertEquals(1, tsnodes.size());
}
@Test public void testSortingExample() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);

19
com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/LambdaSummaryClass.java
View File

@ -20,6 +20,7 @@ import com.ibm.wala.classLoader.CallSiteReference;
import com.ibm.wala.classLoader.IClass;
import com.ibm.wala.classLoader.IField;
import com.ibm.wala.classLoader.IMethod;
import com.ibm.wala.classLoader.NewSiteReference;
import com.ibm.wala.classLoader.SyntheticClass;
import com.ibm.wala.ipa.callgraph.CGNode;
import com.ibm.wala.ipa.cha.IClassHierarchy;
@ -257,27 +258,39 @@ public class LambdaSummaryClass extends SyntheticClass {
MethodReference callee = MethodReference.findOrCreate(ClassLoaderReference.Application, getLambdaCalleeClass(), getLambdaCalleeName(), getLambdaCalleeSignature());
Dispatch code;
boolean isNew = false;
int new_v = -1;
int kind = getLambdaCalleeKind();
switch (kind) {
case 5: code = Dispatch.VIRTUAL; break;
case 6: code = Dispatch.STATIC; break;
case 7: code = Dispatch.SPECIAL; break;
case 8: code = Dispatch.SPECIAL; isNew = true; break;
case 9: code = Dispatch.INTERFACE; break;
default:
throw new Error("unexpected dynamic invoke type " + kind);
}
int numParams = getClassHierarchy().resolveMethod(callee).getNumberOfParameters();
int params[] = new int[ numParams ];
for(int i = 0; i < invoke.getNumberOfParameters(); i++) {
for(int i = isNew? 1: 0; i < invoke.getNumberOfParameters(); i++) {
params[i] = args + i + 1;
}
for(int n = 2, i = invoke.getNumberOfParameters(); i < numParams; i++) {
params[i] = n++;
}
if (isNew) {
v++;
summary.addStatement(insts.NewInstruction(inst++, new_v=v++, NewSiteReference.make(inst, callee.getDeclaringClass())));
params[0] = new_v;
}
if (callee.getReturnType().equals(TypeReference.Void)) {
summary.addStatement(insts.InvokeInstruction(inst++, params, v++, CallSiteReference.make(inst, callee, code), null));
if (isNew) {
summary.addStatement(insts.ReturnInstruction(inst++, new_v, false));
}
} else {
int ret = v++;
summary.addStatement(insts.InvokeInstruction(inst++, ret, params, v++, CallSiteReference.make(inst, callee, code), null));