Moved logic for -dump-cfg and -view-cfg into AnalysisConsumer.

Renamed -dump-cfg to -cfg-dump, and -view-cfg to -cfg-view.  This naming better matches the same options for asts (e.g. -ast-dump).


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

1 files changed, 18 insertions, 0 deletions

diff --git a/Driver/AnalysisConsumer.cpp b/Driver/AnalysisConsumer.cpp
index ecb4ad23a0..f8d9a250ba 100644
--- a/Driver/AnalysisConsumer.cpp
+++ b/Driver/AnalysisConsumer.cpp
@@ -337,6 +337,16 @@ static void ActionLiveness(AnalysisManager& mgr) {
   mgr.getLiveVariables()->dumpBlockLiveness(mgr.getSourceManager());
 }
 
+static void ActionCFGDump(AnalysisManager& mgr) {
+  mgr.DisplayFunction();
+  mgr.getCFG()->dump();
+}
+
+static void ActionCFGView(AnalysisManager& mgr) {
+  mgr.DisplayFunction();
+  mgr.getCFG()->viewCFG();  
+}
+
 //===----------------------------------------------------------------------===//
 // AnalysisConsumer creation.
 //===----------------------------------------------------------------------===//
@@ -376,6 +386,14 @@ ASTConsumer* clang::CreateAnalysisConsumer(Analyses* Beg, Analyses* End,
         C->addCodeAction(&ActionSimpleChecks);
         break;
         
+      case CFGDump:
+        C->addCodeAction(&ActionCFGDump);
+        break;
+        
+      case CFGView:
+        C->addCodeAction(&ActionCFGView);
+        break;
+        
       default: break;
     }