diff options
-rw-r--r-- | clang/include/clang/Analysis/FlowSensitive/DataflowSolver.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/clang/include/clang/Analysis/FlowSensitive/DataflowSolver.h b/clang/include/clang/Analysis/FlowSensitive/DataflowSolver.h index 169417c3d2b..0ed4c8667f1 100644 --- a/clang/include/clang/Analysis/FlowSensitive/DataflowSolver.h +++ b/clang/include/clang/Analysis/FlowSensitive/DataflowSolver.h @@ -187,7 +187,10 @@ private: /// SolveDataflowEquations - Perform the actual worklist algorithm /// to compute dataflow values. void SolveDataflowEquations(CFG& cfg, bool recordStmtValues) { - EnqueueFirstBlock(cfg,AnalysisDirTag()); + // Enqueue all blocks to ensure the dataflow values are computed + // for every block. Not all blocks are guaranteed to reach the exit block. + for (CFG::iterator I=cfg.begin(), E=cfg.end(); I!=E; ++I) + WorkList.enqueue(&*I); while (!WorkList.isEmpty()) { const CFGBlock* B = WorkList.dequeue(); @@ -195,14 +198,6 @@ private: ProcessBlock(B, recordStmtValues, AnalysisDirTag()); UpdateEdges(cfg,B,TF.getVal()); } - } - - void EnqueueFirstBlock(const CFG& cfg, dataflow::forward_analysis_tag) { - WorkList.enqueue(&cfg.getEntry()); - } - - void EnqueueFirstBlock(const CFG& cfg, dataflow::backward_analysis_tag) { - WorkList.enqueue(&cfg.getExit()); } void ResetValues(CFG& cfg, ValTy& V, const CFGBlock* B, |