mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 09:16:02 +02:00
Code Issues Wiki Activity

Bug 455828 - General cleanup in ControlFlowGraphBuilder

Browse source 
Change-Id: I46cfe23fc10bed235d091afaec8eec29dd7d62ac
Signed-off-by: Nathan Ridge <zeratul976@hotmail.com>
This commit is contained in:
Nathan Ridge 2015-02-17 01:39:56 -05:00 • committed by Gerrit Code Review @ Eclipse.org
parent cd65a29016
commit d0ef9d1d82
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/ControlFlowGraphBuilder.java
View file

@ -146,14 +146,11 @@ public class ControlFlowGraphBuilder {
return node; return node;
} }
private IBasicBlock createSubGraph(IBasicBlock prev, IASTNode body) { private IBasicBlock createSubGraph(IBasicBlock prev, IASTStatement body) {
if (body instanceof IASTCompoundStatement) { if (body instanceof IASTCompoundStatement) {
IASTCompoundStatement comp = (IASTCompoundStatement) body; IASTCompoundStatement comp = (IASTCompoundStatement) body;
IASTNode[] children = comp.getChildren(); for (IASTStatement statement : comp.getStatements()) {
for (int i = 0; i < children.length; i++) { prev = createSubGraph(prev, statement);
IASTNode node = children[i];
IBasicBlock last = createSubGraph(prev, node);
prev = last;
} }
} else if (body instanceof IASTExpressionStatement || body instanceof IASTDeclarationStatement || body instanceof IASTNullStatement) { } else if (body instanceof IASTExpressionStatement || body instanceof IASTDeclarationStatement || body instanceof IASTNullStatement) {
if (isThrowStatement(body) || isExitStatement(body)) { if (isThrowStatement(body) || isExitStatement(body)) {
@ -327,20 +324,17 @@ public class ControlFlowGraphBuilder {
return conn; return conn;
} }
private void createSwitchBody(DecisionNode switchNode, IConnectorNode mergeNode, IASTStatement body) { private void createSwitchBody(IDecisionNode switchNode, IConnectorNode mergeNode, IASTStatement body) {
if (!(body instanceof IASTCompoundStatement)) if (!(body instanceof IASTCompoundStatement))
return; // bad return; // bad
IASTCompoundStatement comp = (IASTCompoundStatement) body; IASTCompoundStatement comp = (IASTCompoundStatement) body;
IASTNode[] children = comp.getChildren();
IBasicBlock prev = switchNode; IBasicBlock prev = switchNode;
for (int i = 0; i < children.length; i++) { for (IASTStatement statement : comp.getStatements()) {
IASTNode elem = children[i]; if (statement instanceof IASTCaseStatement || statement instanceof IASTDefaultStatement) {
if (elem instanceof IASTCaseStatement || elem instanceof IASTDefaultStatement) {
IBranchNode lbl = null; IBranchNode lbl = null;
if (elem instanceof IASTCaseStatement) { if (statement instanceof IASTCaseStatement) {
IASTCaseStatement caseSt = (IASTCaseStatement) elem; lbl = factory.createBranchNode(statement);
lbl = factory.createBranchNode(caseSt); } else if (statement instanceof IASTDefaultStatement) {
} else if (elem instanceof IASTDefaultStatement) {
lbl = factory.createBranchNode(IBranchNode.DEFAULT); lbl = factory.createBranchNode(IBranchNode.DEFAULT);
} }
if (!(prev instanceof IExitNode) && prev != switchNode) { if (!(prev instanceof IExitNode) && prev != switchNode) {
@ -354,12 +348,11 @@ public class ControlFlowGraphBuilder {
addOutgoing(switchNode, lbl); addOutgoing(switchNode, lbl);
continue; continue;
} }
if (elem instanceof IASTBreakStatement) { if (statement instanceof IASTBreakStatement) {
prev = addJump(prev, mergeNode); prev = addJump(prev, mergeNode);
continue; continue;
} }
IBasicBlock last = createSubGraph(prev, elem); prev = createSubGraph(prev, statement);
prev = last;
} }
addJump(prev, mergeNode); addJump(prev, mergeNode);
} }