Make 'RangeConstraintManager' the default ConstraintManager.

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

diff --git a/Driver/Analyses.def b/Driver/Analyses.def
index 333055f929db1ffb17eb196a7a89e84dd21d0fa4..3492d09c10aa4b6c8d9b8b02aa2e982d634fc7db 100644 (file)
--- a/Driver/Analyses.def
+++ b/Driver/Analyses.def
@@ -60,7 +60,7 @@ ANALYSIS_STORE(RegionStore, "region", "Use region-based analyzer store", CreateR
 #endif
 
 ANALYSIS_CONSTRAINTS(BasicConstraints, "basic", "Use basic constraint tracking", CreateBasicConstraintManager)
-ANALYSIS_CONSTRAINTS(RangeContraints, "range", "Use constraint tracking of concrete value ranges", CreateRangeConstraintManager)
+ANALYSIS_CONSTRAINTS(RangeConstraints, "range", "Use constraint tracking of concrete value ranges", CreateRangeConstraintManager)
 
 #ifndef ANALYSIS_DIAGNOSTICS
 #define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATEFN, AUTOCREATE)

diff --git a/Driver/AnalysisConsumer.cpp b/Driver/AnalysisConsumer.cpp
index 66fe299e371270bf0ec3475599ac2ff3401d7c7e..fd74f7dcd1790dcdd7e87f3ea1ac5a6ded2ab612 100644 (file)
--- a/Driver/AnalysisConsumer.cpp
+++ b/Driver/AnalysisConsumer.cpp
@@ -96,7 +96,7 @@ NumConstraints
 static llvm::cl::opt<AnalysisConstraints> 
 AnalysisConstraintsOpt("analyzer-constraints",
   llvm::cl::desc("Source Code Analysis - Symbolic Constraint Engines"),
-  llvm::cl::init(BasicConstraintsModel),
+  llvm::cl::init(RangeConstraintsModel),
   llvm::cl::values(
 #define ANALYSIS_CONSTRAINTS(NAME, CMDFLAG, DESC, CREATFN)\
 clEnumValN(NAME##Model, CMDFLAG, DESC),

diff --git a/utils/ccc-analyzer b/utils/ccc-analyzer
index 57dab8d99c2150f39d9ff8022b5c3870dbb5208c..9e0474b59945eea7a47294c64e756598ac7f672e 100755 (executable)
--- a/utils/ccc-analyzer
+++ b/utils/ccc-analyzer
@@ -309,7 +309,7 @@ if (!defined $StoreModel) { $StoreModel = "basic"; }
 
 # Get the constraints engine.
 my $ConstraintsModel = $ENV{'CCC_ANALYZER_CONSTRAINTS_MODEL'};
-if (!defined $ConstraintsModel) { $ConstraintsModel = "basic"; }
+if (!defined $ConstraintsModel) { $ConstraintsModel = "range"; }
 
 # Get the output format.
 my $OutputFormat = $ENV{'CCC_ANALYZER_OUTPUT_FORMAT'};

diff --git a/utils/scan-build b/utils/scan-build
index 4f2a68ff9ea20a86cfdff5b928a2b239909bb3f9..5fea80b48a602a51a00e0e0ce2db3f96ae63b1b9 100755 (executable)
--- a/utils/scan-build
+++ b/utils/scan-build
@@ -908,9 +908,10 @@ OPTIONS:
 
 ADVANCED OPTIONS:
 
- -constraints [model] - Specify the contraint model used by the analyzer.
-                        By default the 'basic' model is used.  'range' adds
-                        experimental range tracking for program values.
+ -constraints [model] - Specify the contraint engine used by the analyzer.
+                        By default the 'range' model is used.  Specifying 
+                        'basic' uses a simpler, less powerful constraint model
+                        used by checker-0.161 and earlier.
 
  -store [model] - Specify the store model used by the analyzer. By default,
                   the 'basic' store model is used. 'region' specifies a field-