From 6afd1eb322bf67e13b35d22ccaebf1fbbab8c55f Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Fri, 12 Sep 2014 12:42:15 +0000 Subject: [PATCH] Fixing a -Woverflow warning from GCC by using a more natural datatype for this operation. NFC. llvm-svn: 217670 --- clang/include/clang/Analysis/Analyses/ThreadSafetyTIL.h | 2 +- clang/lib/Analysis/ThreadSafetyTIL.cpp | 4 ++-- 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 da0657990a23..e06593c6905c 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 9374733e8a31..ebe374ea609d 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& 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& 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)