Based on comments from Chris, switch to using CFG::getNumBlockIDs()

rather than a computed std::distance(). At some point I had convinced
myself that these two were different; but as far as I can tell on
re-exampination they aren't, and the number of block IDs is actually
just a count of the blocks in the CFG.

While this removes the primary motivation for guarding all of this with
CollectStats, I have a patch coming up that will almost certainly make
it important again.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134552 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/AnalysisBasedWarnings.cpp b/lib/Sema/AnalysisBasedWarnings.cpp
index 8a4634df2f4d39f7814616d2819295b8c9ca711c..089fe7bf3cd80b32b73f9dea222d1e71f1ecbaca 100644 (file)
--- a/lib/Sema/AnalysisBasedWarnings.cpp
+++ b/lib/Sema/AnalysisBasedWarnings.cpp
@@ -741,10 +741,9 @@ AnalysisBasedWarnings::IssueWarnings(sema::AnalysisBasedWarnings::Policy P,
     if (CFG *cfg = AC.getCFG()) {
       // If we successfully built a CFG for this context, record some more
       // detail information about it.
-      unsigned NumBlocks = std::distance(cfg->begin(), cfg->end());
-      NumCFGBlocks += NumBlocks;
+      NumCFGBlocks += cfg->getNumBlockIDs();
       MaxCFGBlocksPerFunction = std::max(MaxCFGBlocksPerFunction,
-                                         NumBlocks);
+                                         cfg->getNumBlockIDs());
     } else {
       ++NumFunctionsWithBadCFGs;
     }