Fix up the Equation System generation. Now there's a bug in the solver.

The solver seems to work fine when run as a tool by itself, but not in the clang stuff. Very annoying.

4 files changed, 27 insertions, 4 deletions

diff --git a/clang/lib/StaticAnalyzer/Checkers/.#ArrayBoundCheckerV2_flymake.cpp b/clang/lib/StaticAnalyzer/Checkers/.#ArrayBoundCheckerV2_flymake.cpp
deleted file mode 120000
index 235903b..0000000
--- a/clang/lib/StaticAnalyzer/Checkers/.#ArrayBoundCheckerV2_flymake.cpp
+++ /dev/null
@@ -1 +0,0 @@
-carlo@pc-4w14-0.cs.usyd.edu.au.1585:1347012043
\ No newline at end of file
diff --git a/clang/lib/StaticAnalyzer/Checkers/.#Checkers.td b/clang/lib/StaticAnalyzer/Checkers/.#Checkers.td
deleted file mode 120000
index 235903b..0000000
--- a/clang/lib/StaticAnalyzer/Checkers/.#Checkers.td
+++ /dev/null
@@ -1 +0,0 @@
-carlo@pc-4w14-0.cs.usyd.edu.au.1585:1347012043
\ No newline at end of file
diff --git a/clang/lib/StaticAnalyzer/Checkers/Checkers.td b/clang/lib/StaticAnalyzer/Checkers/Checkers.td
index f577a89..3c211a3 100644
--- a/clang/lib/StaticAnalyzer/Checkers/Checkers.td
+++ b/clang/lib/StaticAnalyzer/Checkers/Checkers.td
@@ -28,7 +28,7 @@ def DeadCodeExperimental : Package<"deadcode">, InPackage<Experimental>, Hidden;
 
 def Security : Package <"security">;
 def InsecureAPI : Package<"insecureAPI">, InPackage<Security>;
-def SecurityExperimental : Package<"security">, InPackage<Experimental>, Hidden;
+def SecurityExperimental : Package<"security">, InPackage<Experimental>; //, Hidden;
 def Taint : Package<"taint">, InPackage<SecurityExperimental>, Hidden;  
 
 def Unix : Package<"unix">;
diff --git a/clang/lib/StaticAnalyzer/Core/IntervalConstraintManager.cpp b/clang/lib/StaticAnalyzer/Core/IntervalConstraintManager.cpp
index 9d04720..dc2f0d9 100644
--- a/clang/lib/StaticAnalyzer/Core/IntervalConstraintManager.cpp
+++ b/clang/lib/StaticAnalyzer/Core/IntervalConstraintManager.cpp
@@ -254,6 +254,7 @@ private:
 
 ConstraintManager* ento::CreateIntervalConstraintManager(ProgramStateManager&,
                                                          SubEngine &subeng) {
+  llvm::errs() << "Creating interval constraint manager\n";
   return new IntervalConstraintManager(subeng);
 }
 
@@ -294,7 +295,7 @@ IntervalConstraintManager::GetRange(ProgramStateRef state, SymbolRef sym) {
 }
 
 //===------------------------------------------------------------------------===
-// assumeSymX methods: public interface for IntervalConstraintManager.
+// eSymX methods: public interface for IntervalConstraintManager.
 //===------------------------------------------------------------------------===/
 
 // The syntax for ranges below is mathematical, using [x, y] for closed ranges
@@ -309,6 +310,10 @@ ProgramStateRef
 IntervalConstraintManager::assumeSymNE(ProgramStateRef state, SymbolRef sym,
                                     const llvm::APSInt& Int,
                                     const llvm::APSInt& Adjustment) {
+  llvm::errs() << "AssumeNE\n";
+  state->dump();
+  sym->dump();
+
   BasicValueFactory &BV = state->getBasicVals();
 
   llvm::APSInt Lower = Int-Adjustment;
@@ -326,6 +331,10 @@ ProgramStateRef
 IntervalConstraintManager::assumeSymEQ(ProgramStateRef state, SymbolRef sym,
                                     const llvm::APSInt& Int,
                                     const llvm::APSInt& Adjustment) {
+  llvm::errs() << "AssumeEQ\n";
+  state->dump();
+  sym->dump();
+
   // [Int-Adjustment, Int-Adjustment]
   BasicValueFactory &BV = state->getBasicVals();
   llvm::APSInt AdjInt = Int-Adjustment;
@@ -337,6 +346,10 @@ ProgramStateRef
 IntervalConstraintManager::assumeSymLT(ProgramStateRef state, SymbolRef sym,
                                     const llvm::APSInt& Int,
                                     const llvm::APSInt& Adjustment) {
+  llvm::errs() << "AssumeLT\n";
+  state->dump();
+  sym->dump();
+
   BasicValueFactory &BV = state->getBasicVals();
 
   QualType T = state->getSymbolManager().getType(sym);
@@ -358,6 +371,10 @@ ProgramStateRef
 IntervalConstraintManager::assumeSymGT(ProgramStateRef state, SymbolRef sym,
                                     const llvm::APSInt& Int,
                                     const llvm::APSInt& Adjustment) {
+  llvm::errs() << "AssumeGT\n";
+  state->dump();
+  sym->dump();
+
   BasicValueFactory &BV = state->getBasicVals();
 
   QualType T = state->getSymbolManager().getType(sym);
@@ -379,6 +396,10 @@ ProgramStateRef
 IntervalConstraintManager::assumeSymGE(ProgramStateRef state, SymbolRef sym,
                                     const llvm::APSInt& Int,
                                     const llvm::APSInt& Adjustment) {
+  llvm::errs() << "AssumeGE\n";
+  state->dump();
+  sym->dump();
+
   BasicValueFactory &BV = state->getBasicVals();
 
   QualType T = state->getSymbolManager().getType(sym);
@@ -401,6 +422,10 @@ ProgramStateRef
 IntervalConstraintManager::assumeSymLE(ProgramStateRef state, SymbolRef sym,
                                     const llvm::APSInt& Int,
                                     const llvm::APSInt& Adjustment) {
+  llvm::errs() << "AssumeLE\n";
+  state->dump();
+  sym->dump();
+
   BasicValueFactory &BV = state->getBasicVals();
 
   QualType T = state->getSymbolManager().getType(sym);