[cfe-commits] r59154 - in /cfe/trunk: include/clang/Analysis/PathSensitive/SymbolManager.h lib/Analysis/SymbolManager.cpp

[Ted Kremenek]

Author: kremenek
Date: Wed Nov 12 13:22:47 2008
New Revision: 59154

URL: http://llvm.org/viewvc/llvm-project?rev=59154&view=rev
Log:
Conjured symbols now bind to Stmt* instead of Expr*.

Modified:
    cfe/trunk/include/clang/Analysis/PathSensitive/SymbolManager.h
    cfe/trunk/lib/Analysis/SymbolManager.cpp

Modified: cfe/trunk/include/clang/Analysis/PathSensitive/SymbolManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/PathSensitive/SymbolManager.h?rev=59154&r1=59153&r2=59154&view=diff

==============================================================================
--- cfe/trunk/include/clang/Analysis/PathSensitive/SymbolManager.h (original)
+++ cfe/trunk/include/clang/Analysis/PathSensitive/SymbolManager.h Wed Nov 12 13:22:47 2008
@@ -166,30 +166,29 @@
 };
   
 class SymbolConjured : public SymbolData {
-  Expr* E;
+  Stmt* S;
   QualType T;
   unsigned Count;
 
 public:
-  SymbolConjured(SymbolID Sym, Expr* exp, QualType t, unsigned count)
-    : SymbolData(ConjuredKind, Sym), E(exp), T(t), Count(count) {}
-  
-  Expr* getExpr() const { return E; }
-  unsigned getCount() const { return Count; }  
+  SymbolConjured(SymbolID Sym, Stmt* s, QualType t, unsigned count)
+    : SymbolData(ConjuredKind, Sym), S(s), T(t), Count(count) {}
   
+  Stmt* getStmt() const { return S; }
+  unsigned getCount() const { return Count; }    
   QualType getType() const { return T; }
   
   static void Profile(llvm::FoldingSetNodeID& profile,
-                      Expr* E, QualType T, unsigned Count) {
+                      Stmt* S, QualType T, unsigned Count) {
     
     profile.AddInteger((unsigned) ConjuredKind);
-    profile.AddPointer(E);
+    profile.AddPointer(S);
     profile.Add(T);
     profile.AddInteger(Count);
   }
   
   virtual void Profile(llvm::FoldingSetNodeID& profile) {
-    Profile(profile, E, T, Count);
+    Profile(profile, S, T, Count);
   }
   
   // Implement isa<T> support.
@@ -247,7 +246,7 @@
   
   SymbolID getSymbol(VarDecl* D);
   SymbolID getContentsOfSymbol(SymbolID sym);
-  SymbolID getConjuredSymbol(Expr* E, QualType T, unsigned VisitCount);
+  SymbolID getConjuredSymbol(Stmt* E, QualType T, unsigned VisitCount);
   SymbolID getConjuredSymbol(Expr* E, unsigned VisitCount) {
     return getConjuredSymbol(E, E->getType(), VisitCount);
   }

Modified: cfe/trunk/lib/Analysis/SymbolManager.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/SymbolManager.cpp?rev=59154&r1=59153&r2=59154&view=diff

==============================================================================
--- cfe/trunk/lib/Analysis/SymbolManager.cpp (original)
+++ cfe/trunk/lib/Analysis/SymbolManager.cpp Wed Nov 12 13:22:47 2008
@@ -73,7 +73,7 @@
   return SymbolCounter++;
 }
   
-SymbolID SymbolManager::getConjuredSymbol(Expr* E, QualType T, unsigned Count) {
+SymbolID SymbolManager::getConjuredSymbol(Stmt* E, QualType T, unsigned Count) {
   
   llvm::FoldingSetNodeID profile;
   SymbolConjured::Profile(profile, E, T, Count);