diff options
| -rw-r--r-- | lib/Analysis/CFG.cpp | 4 | ||||
| -rw-r--r-- | lib/Analysis/UninitializedValues.cpp | 17 | ||||
| -rw-r--r-- | test/SemaCXX/uninit-variables.cpp | 8 |
3 files changed, 25 insertions, 4 deletions
diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp index c193112131..e91de0366c 100644 --- a/lib/Analysis/CFG.cpp +++ b/lib/Analysis/CFG.cpp @@ -428,8 +428,8 @@ private: if (!BuildOpts.PruneTriviallyFalseEdges) return false; return !S->isTypeDependent() && - !S->isValueDependent() && - S->Evaluate(outResult, *Context); + !S->isValueDependent() && + S->Evaluate(outResult, *Context); } /// tryEvaluateBool - Try and evaluate the Stmt and return 0 or 1 diff --git a/lib/Analysis/UninitializedValues.cpp b/lib/Analysis/UninitializedValues.cpp index 58191ec0b0..f775cc5b50 100644 --- a/lib/Analysis/UninitializedValues.cpp +++ b/lib/Analysis/UninitializedValues.cpp @@ -156,6 +156,8 @@ public: return declToIndex.getValueIndex(vd).hasValue(); } + bool hasValues(const CFGBlock *block); + void resetScratch(); ValueVector &getScratch() { return scratch; } @@ -231,6 +233,11 @@ ValueVector &CFGBlockValues::getValueVector(const CFGBlock *block, return lazyCreate(vals[idx].first); } +bool CFGBlockValues::hasValues(const CFGBlock *block) { + unsigned idx = block->getBlockID(); + return vals[idx].second != 0; +} + BVPair &CFGBlockValues::getValueVectors(const clang::CFGBlock *block, bool shouldLazyCreate) { unsigned idx = block->getBlockID(); @@ -603,9 +610,12 @@ void TransferFunctions::VisitUnaryExprOrTypeTraitExpr( static bool runOnBlock(const CFGBlock *block, const CFG &cfg, AnalysisContext &ac, CFGBlockValues &vals, + llvm::BitVector &wasAnalyzed, UninitVariablesHandler *handler = 0, bool flagBlockUses = false) { + wasAnalyzed[block->getBlockID()] = true; + if (const BinaryOperator *b = getLogicalOperatorInChain(block)) { CFGBlock::const_pred_iterator itr = block->pred_begin(); BVPair vA = vals.getValueVectors(*itr, false); @@ -663,10 +673,11 @@ void clang::runUninitializedVariablesAnalysis(const DeclContext &dc, llvm::BitVector previouslyVisited(cfg.getNumBlockIDs()); worklist.enqueueSuccessors(&cfg.getEntry()); + llvm::BitVector wasAnalyzed(cfg.getNumBlockIDs(), false); while (const CFGBlock *block = worklist.dequeue()) { // Did the block change? - bool changed = runOnBlock(block, cfg, ac, vals); + bool changed = runOnBlock(block, cfg, ac, vals, wasAnalyzed); if (changed || !previouslyVisited[block->getBlockID()]) worklist.enqueueSuccessors(block); previouslyVisited[block->getBlockID()] = true; @@ -674,7 +685,9 @@ void clang::runUninitializedVariablesAnalysis(const DeclContext &dc, // Run through the blocks one more time, and report uninitialized variabes. for (CFG::const_iterator BI = cfg.begin(), BE = cfg.end(); BI != BE; ++BI) { - runOnBlock(*BI, cfg, ac, vals, &handler, /* flagBlockUses */ true); + if (wasAnalyzed[(*BI)->getBlockID()]) + runOnBlock(*BI, cfg, ac, vals, wasAnalyzed, &handler, + /* flagBlockUses */ true); } } diff --git a/test/SemaCXX/uninit-variables.cpp b/test/SemaCXX/uninit-variables.cpp index 77cbcf72a3..6fa59fe2a1 100644 --- a/test/SemaCXX/uninit-variables.cpp +++ b/test/SemaCXX/uninit-variables.cpp @@ -70,3 +70,11 @@ class Rdar9188004C : public Rdar9188004B<Rdar9188004A> { virtual void bar(void) const; }; void Rdar9188004C::bar(void) const {} + +// Don't warn about uninitialized variables in unreachable code. +void PR9625() { + if (false) { + int x; + (void)static_cast<float>(x); // no-warning + } +} |