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

support for replication-based translation of Do loops in Java, so that the standard LOOP node type can be used. 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@3596 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
dolby-oss 2009-05-15 16:06:09 +00:00
parent 031d95194d
commit 2e8da872c0
5 changed files with 68 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
com.ibm.wala.cast.java.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java
View File

@ -328,6 +328,10 @@ public class JDTJava2CAstTranslator implements TranslatorToCAst {
public CAstType getNodeType(CAstNode node) {
throw new UnsupportedOperationException();
}
public Collection<CAstNode> getMappedNodes() {
throw new UnsupportedOperationException();
}
};
}

51
com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java
View File

@ -129,10 +129,12 @@ import com.ibm.wala.cast.tree.CAstSymbol;
import com.ibm.wala.cast.tree.CAstType;
import com.ibm.wala.cast.tree.CAstTypeDictionary;
import com.ibm.wala.cast.tree.impl.AbstractSourcePosition;
import com.ibm.wala.cast.tree.impl.CAstCloner;
import com.ibm.wala.cast.tree.impl.CAstControlFlowRecorder;
import com.ibm.wala.cast.tree.impl.CAstImpl;
import com.ibm.wala.cast.tree.impl.CAstNodeTypeMapRecorder;
import com.ibm.wala.cast.tree.impl.CAstOperator;
import com.ibm.wala.cast.tree.impl.CAstRewriter;
import com.ibm.wala.cast.tree.impl.CAstSourcePositionRecorder;
import com.ibm.wala.cast.tree.impl.CAstSymbolImpl;
import com.ibm.wala.classLoader.CallSiteReference;
@ -174,6 +176,8 @@ public class PolyglotJava2CAstTranslator implements TranslatorToCAst {
protected PolyglotIdentityMapper fIdentityMapper;
protected boolean replicateForDoLoop = false;
protected final boolean DEBUG = true;
final protected TranslatingVisitor getTranslator() {
@ -1086,23 +1090,46 @@ public class PolyglotJava2CAstTranslator implements TranslatorToCAst {
}
public CAstNode visit(Do d, WalkContext wc) {
Node header = fNodeFactory.Empty(Position.COMPILER_GENERATED);
Node breakTarget = makeBreakTarget(d);
Node continueTarget = makeContinueTarget(d);
CAstNode loopGoto = makeNode(wc, fFactory, d, CAstNode.IFGOTO, walkNodes(d.cond(), wc));
wc.cfg().map(loopGoto, loopGoto);
wc.cfg().add(loopGoto, header, Boolean.TRUE);
String loopLabel = (String) wc.getLabelMap().get(d);
WalkContext lc = new LoopContext(wc, loopLabel, breakTarget, continueTarget);
CAstNode continueNode = walkNodes(continueTarget, wc);
CAstNode breakBody = walkNodes(breakTarget, wc);
return makeNode(wc, fFactory, d, CAstNode.BLOCK_STMT, walkNodes(header, wc), makeNode(wc, fFactory, d, CAstNode.BLOCK_STMT,
walkNodes(d.body(), lc), continueNode), loopGoto, walkNodes(breakTarget, wc));
WalkContext lc = new LoopContext(wc, loopLabel, breakTarget, continueTarget);
CAstNode loopBody = walkNodes(d.body(), lc);
if (replicateForDoLoop) {
CAstRewriter.Rewrite x = (new CAstCloner(fFactory, false)).copy(loopBody, wc.cfg(), wc.pos(), wc.getNodeTypeMap(), null);
CAstNode otherBody = x.newRoot();
wc.cfg().addAll(x.newCfg());
wc.pos().addAll(x.newPos());
wc.getNodeTypeMap().addAll(x.newTypes());
return makeNode(wc, fFactory, d, CAstNode.BLOCK_STMT,
loopBody,
makeNode(wc, fFactory, d, CAstNode.LOOP,
walkNodes(d.cond(), wc),
makeNode(wc, fFactory, d, CAstNode.BLOCK_STMT, otherBody, continueNode)),
breakBody);
} else {
Node header = fNodeFactory.Empty(Position.COMPILER_GENERATED);
CAstNode loopGoto = makeNode(wc, fFactory, d, CAstNode.IFGOTO, walkNodes(d.cond(), wc));
wc.cfg().map(loopGoto, loopGoto);
wc.cfg().add(loopGoto, header, Boolean.TRUE);
return makeNode(wc, fFactory, d, CAstNode.BLOCK_STMT,
walkNodes(header, wc),
makeNode(wc, fFactory, d, CAstNode.BLOCK_STMT, loopBody, continueNode),
loopGoto,
breakBody);
}
}
public CAstNode visit(For f, WalkContext wc) {
@ -1562,6 +1589,10 @@ public class PolyglotJava2CAstTranslator implements TranslatorToCAst {
public CAstType getNodeType(CAstNode node) {
throw new UnsupportedOperationException();
}
public Collection<CAstNode> getMappedNodes() {
throw new UnsupportedOperationException();
}
};
}

5
com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstNodeTypeMap.java
View File

@ -13,6 +13,11 @@
*/
package com.ibm.wala.cast.tree;
import java.util.Collection;
public interface CAstNodeTypeMap {
Collection<CAstNode> getMappedNodes();
CAstType getNodeType(CAstNode node);
}

8
com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstControlFlowRecorder.java
View File

@ -146,6 +146,14 @@ public class CAstControlFlowRecorder implements CAstControlFlowMap {
CAstToNode.put(ast, node);
}
public void addAll(CAstControlFlowMap other) {
for(CAstNode n : other.getMappedNodes()) {
for(Object l : other.getTargetLabels(n)) {
add(n, l, other.getTarget(n, l));
}
}
}
public boolean isMapped(Object node) {
return nodeToCAst.containsKey(node);
}

10
com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstNodeTypeMapRecorder.java
View File

@ -13,6 +13,7 @@
*/
package com.ibm.wala.cast.tree.impl;
import java.util.Collection;
import java.util.HashMap;
import com.ibm.wala.cast.tree.CAstNode;
@ -33,4 +34,13 @@ public class CAstNodeTypeMapRecorder
put(node, type);
}
public Collection<CAstNode> getMappedNodes() {
return keySet();
}
public void addAll(CAstNodeTypeMap other) {
for(CAstNode o : other.getMappedNodes()) {
put(o, other.getNodeType(o));
}
}
}