diff options
| author | dim <dim@FreeBSD.org> | 2013-12-22 00:07:40 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2013-12-22 00:07:40 +0000 |
| commit | 952eddef9aff85b1e92626e89baaf7a360e2ac85 (patch) | |
| tree | df8df0b0067b381eab470a3b8f28d14a552a6340 /lib/Analysis/ReachableCode.cpp | |
| parent | ea266cad53e3d49771fa38103913d3ec7a166694 (diff) | |
| download | FreeBSD-src-952eddef9aff85b1e92626e89baaf7a360e2ac85.zip FreeBSD-src-952eddef9aff85b1e92626e89baaf7a360e2ac85.tar.gz | |
Vendor import of clang release_34 branch r197841 (effectively, 3.4 RC3):
https://llvm.org/svn/llvm-project/cfe/branches/release_34@197841
Diffstat (limited to 'lib/Analysis/ReachableCode.cpp')
| -rw-r--r-- | lib/Analysis/ReachableCode.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/Analysis/ReachableCode.cpp b/lib/Analysis/ReachableCode.cpp index a90aebb..a2d19c0 100644 --- a/lib/Analysis/ReachableCode.cpp +++ b/lib/Analysis/ReachableCode.cpp @@ -110,10 +110,13 @@ const Stmt *DeadCodeScan::findDeadCode(const clang::CFGBlock *Block) { return 0; } -static int SrcCmp(const void *p1, const void *p2) { - return - ((const std::pair<const CFGBlock *, const Stmt *>*) p2)->second->getLocStart() < - ((const std::pair<const CFGBlock *, const Stmt *>*) p1)->second->getLocStart(); +static int SrcCmp(const std::pair<const CFGBlock *, const Stmt *> *p1, + const std::pair<const CFGBlock *, const Stmt *> *p2) { + if (p1->second->getLocStart() < p2->second->getLocStart()) + return -1; + if (p2->second->getLocStart() < p1->second->getLocStart()) + return 1; + return 0; } unsigned DeadCodeScan::scanBackwards(const clang::CFGBlock *Start, @@ -227,7 +230,7 @@ static SourceLocation GetUnreachableLoc(const Stmt *S, case Expr::CXXFunctionalCastExprClass: { const CXXFunctionalCastExpr *CE = cast <CXXFunctionalCastExpr>(S); R1 = CE->getSubExpr()->getSourceRange(); - return CE->getTypeBeginLoc(); + return CE->getLocStart(); } case Stmt::CXXTryStmtClass: { return cast<CXXTryStmt>(S)->getHandler(0)->getCatchLoc(); |
