diff options
4 files changed, 14 insertions, 11 deletions
diff --git a/include/clang/StaticAnalyzer/AnalyzerOptions.h b/include/clang/StaticAnalyzer/AnalyzerOptions.h index b97fe37eba..5b5fe3ac11 100644 --- a/include/clang/StaticAnalyzer/AnalyzerOptions.h +++ b/include/clang/StaticAnalyzer/AnalyzerOptions.h @@ -118,8 +118,8 @@ public: unsigned eagerlyAssumeBinOpBifurcation : 1; unsigned TrimGraph : 1; - unsigned VisualizeEGDot : 1; - unsigned VisualizeEGUbi : 1; + unsigned visualizeExplodedGraphWithGraphViz : 1; + unsigned visualizeExplodedGraphWithUbiGraph : 1; unsigned UnoptimizedCFG : 1; unsigned CFGAddImplicitDtors : 1; unsigned eagerlyTrimExplodedGraph : 1; @@ -151,8 +151,8 @@ public: AnalyzeNestedBlocks = 0; eagerlyAssumeBinOpBifurcation = 0; TrimGraph = 0; - VisualizeEGDot = 0; - VisualizeEGUbi = 0; + visualizeExplodedGraphWithGraphViz = 0; + visualizeExplodedGraphWithUbiGraph = 0; UnoptimizedCFG = 0; CFGAddImplicitDtors = 0; eagerlyTrimExplodedGraph = 0; diff --git a/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h b/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h index b010372014..4e7e2c11c1 100644 --- a/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h +++ b/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h @@ -95,7 +95,8 @@ public: void FlushDiagnostics(); bool shouldVisualize() const { - return options.VisualizeEGDot || options.VisualizeEGUbi; + return options.visualizeExplodedGraphWithGraphViz || + options.visualizeExplodedGraphWithUbiGraph; } bool shouldInlineCall() const { diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 24cca3ed7e..b82b9d0783 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -163,9 +163,9 @@ static void AnalyzerOptsToArgs(const AnalyzerOptions &Opts, ToArgsList &Res) { Res.push_back("-analyzer-eagerly-assume"); if (Opts.TrimGraph) Res.push_back("-trim-egraph"); - if (Opts.VisualizeEGDot) + if (Opts.visualizeExplodedGraphWithGraphViz) Res.push_back("-analyzer-viz-egraph-graphviz"); - if (Opts.VisualizeEGUbi) + if (Opts.visualizeExplodedGraphWithUbiGraph) Res.push_back("-analyzer-viz-egraph-ubigraph"); if (Opts.NoRetryExhausted) Res.push_back("-analyzer-disable-retry-exhausted"); @@ -1116,8 +1116,10 @@ static bool ParseAnalyzerArgs(AnalyzerOptions &Opts, ArgList &Args, } Opts.ShowCheckerHelp = Args.hasArg(OPT_analyzer_checker_help); - Opts.VisualizeEGDot = Args.hasArg(OPT_analyzer_viz_egraph_graphviz); - Opts.VisualizeEGUbi = Args.hasArg(OPT_analyzer_viz_egraph_ubigraph); + Opts.visualizeExplodedGraphWithGraphViz = + Args.hasArg(OPT_analyzer_viz_egraph_graphviz); + Opts.visualizeExplodedGraphWithUbiGraph = + Args.hasArg(OPT_analyzer_viz_egraph_ubigraph); Opts.NoRetryExhausted = Args.hasArg(OPT_analyzer_disable_retry_exhausted); Opts.AnalyzeAll = Args.hasArg(OPT_analyzer_opt_analyze_headers); Opts.AnalyzerDisplayProgress = Args.hasArg(OPT_analyzer_display_progress); diff --git a/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp b/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp index 2c96115bbc..a10a36481d 100644 --- a/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp +++ b/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp @@ -573,7 +573,7 @@ void AnalysisConsumer::ActionExprEngine(Decl *D, bool ObjCGCEnabled, // Set the graph auditor. OwningPtr<ExplodedNode::Auditor> Auditor; - if (Mgr->options.VisualizeEGUbi) { + if (Mgr->options.visualizeExplodedGraphWithUbiGraph) { Auditor.reset(CreateUbiViz()); ExplodedNode::SetAuditor(Auditor.get()); } @@ -587,7 +587,7 @@ void AnalysisConsumer::ActionExprEngine(Decl *D, bool ObjCGCEnabled, ExplodedNode::SetAuditor(0); // Visualize the exploded graph. - if (Mgr->options.VisualizeEGDot) + if (Mgr->options.visualizeExplodedGraphWithGraphViz) Eng.ViewGraph(Mgr->options.TrimGraph); // Display warnings. |