clean up this code, add the fixme back.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@76180 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp
index 02fe22c..7ad688f 100644
--- a/lib/Analysis/CFG.cpp
+++ b/lib/Analysis/CFG.cpp
@@ -473,19 +473,13 @@
return WalkAST(cast<ParenExpr>(Terminator)->getSubExpr(), AlwaysAddStmt);
case Stmt::CallExprClass: {
- bool NoReturn = false;
- CallExpr *C = cast<CallExpr>(Terminator);
- if (FunctionDecl *FD = C->getDirectCallee())
- if (FD->hasAttr<NoReturnAttr>())
- NoReturn = true;
-
- if (!NoReturn)
+ // If this is a call to a no-return function, this stops the block here.
+ FunctionDecl *FD = cast<CallExpr>(Terminator)->getDirectCallee();
+ if (FD == 0 || !FD->hasAttr<NoReturnAttr>())
break;
- if (Block) {
- if (!FinishBlock(Block))
- return 0;
- }
+ if (Block && !FinishBlock(Block))
+ return 0;
// Create new block with no successor for the remaining pieces.
Block = createBlock(false);
@@ -498,6 +492,7 @@
}
default:
+ // TODO: We can follow objective-c methods (message sends).
break;
};