summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2014-09-12 12:42:15 +0000
committerAaron Ballman <aaron@aaronballman.com>2014-09-12 12:42:15 +0000
commit6afd1eb322bf67e13b35d22ccaebf1fbbab8c55f (patch)
tree0b20dd3a0d20aa88545240c1da3f8f959230166e
parentc287f4a3581925841608db2b061669c66e957329 (diff)
downloadbcm5719-llvm-6afd1eb322bf67e13b35d22ccaebf1fbbab8c55f.tar.gz
bcm5719-llvm-6afd1eb322bf67e13b35d22ccaebf1fbbab8c55f.zip
Fixing a -Woverflow warning from GCC by using a more natural datatype for this operation. NFC.
llvm-svn: 217670
-rw-r--r--clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h2
-rw-r--r--clang/lib/Analysis/ThreadSafetyTIL.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h b/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
index da0657990a2..e06593c6905 100644
--- a/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
+++ b/clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
@@ -1669,7 +1669,7 @@ private:
SCFG *CFGPtr; // The CFG that contains this block.
int BlockID : 31; // unique id for this BB in the containing CFG.
// IDs are in topological order.
- int Visited : 1; // Bit to determine if a block has been visited
+ bool Visited : 1; // Bit to determine if a block has been visited
// during a traversal.
BlockArray Predecessors; // Predecessor blocks in the CFG.
InstrArray Args; // Phi nodes. One argument per predecessor.
diff --git a/clang/lib/Analysis/ThreadSafetyTIL.cpp b/clang/lib/Analysis/ThreadSafetyTIL.cpp
index 9374733e8a3..ebe374ea609 100644
--- a/clang/lib/Analysis/ThreadSafetyTIL.cpp
+++ b/clang/lib/Analysis/ThreadSafetyTIL.cpp
@@ -170,7 +170,7 @@ int BasicBlock::renumberInstrs(int ID) {
// block, and ID should be the total number of blocks.
int BasicBlock::topologicalSort(SimpleArray<BasicBlock*>& Blocks, int ID) {
if (Visited) return ID;
- Visited = 1;
+ Visited = true;
for (auto *Block : successors())
ID = Block->topologicalSort(Blocks, ID);
// set ID and update block array in place.
@@ -195,7 +195,7 @@ int BasicBlock::topologicalFinalSort(SimpleArray<BasicBlock*>& Blocks, int ID) {
// Visited is assumed to have been set by the topologicalSort. This pass
// assumes !Visited means that we've visited this node before.
if (!Visited) return ID;
- Visited = 0;
+ Visited = false;
if (DominatorNode.Parent)
ID = DominatorNode.Parent->topologicalFinalSort(Blocks, ID);
for (auto *Pred : Predecessors)
OpenPOWER on IntegriCloud