diff --git a/clang/include/clang/Analysis/PathSensitive/SymbolManager.h b/clang/include/clang/Analysis/PathSensitive/SymbolManager.h
index e4ccbf0d43b2..66f214e43621 100644
--- a/clang/include/clang/Analysis/PathSensitive/SymbolManager.h
+++ b/clang/include/clang/Analysis/PathSensitive/SymbolManager.h
@@ -166,30 +166,29 @@ public:
 };
   
 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 @@ public:
   
   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);
   }
diff --git a/clang/lib/Analysis/SymbolManager.cpp b/clang/lib/Analysis/SymbolManager.cpp
index 24d2ed725309..7829e3ace3a1 100644
--- a/clang/lib/Analysis/SymbolManager.cpp
+++ b/clang/lib/Analysis/SymbolManager.cpp
@@ -73,7 +73,7 @@ SymbolID SymbolManager::getContentsOfSymbol(SymbolID sym) {
   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);