clean up code with new API.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68687 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index 376ccc0..cab1439 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -1759,14 +1759,10 @@
unsigned Count = Builder.getCurrentBlockCount();
QualType T = R->getRValueType(Ctx);
- if (Loc::IsLocType(T) || (T->isIntegerType() && T->isScalarType())) {
- SymbolRef NewSym =
- Eng.getSymbolManager().getConjuredSymbol(*I, T, Count);
-
- state = state.BindLoc(Loc::MakeVal(R),
- Loc::IsLocType(T)
- ? cast<SVal>(loc::SymbolVal(NewSym))
- : cast<SVal>(nonloc::SymbolVal(NewSym)));
+ if (Loc::IsLocType(T) || (T->isIntegerType() && T->isScalarType())){
+ SVal V = SVal::GetRValueSymbolVal(Eng.getSymbolManager(),
+ Eng.getStoreManager().getRegionManager(), R);
+ state = state.BindLoc(Loc::MakeVal(R), V);
}
else if (const RecordType *RT = T->getAsStructureType()) {
// Handle structs in a not so awesome way. Here we just