Enhance SimpleSValuator to handle nonloc::LocAsInteger -> location casts.

llvm-svn: 76481

1 files changed, 8 insertions, 3 deletions

diff --git a/clang/lib/Analysis/SimpleSValuator.cpp b/clang/lib/Analysis/SimpleSValuator.cpp
index 58b169658d0..4f8c29c0710 100644
--- a/clang/lib/Analysis/SimpleSValuator.cpp
+++ b/clang/lib/Analysis/SimpleSValuator.cpp
@@ -44,11 +44,16 @@ SValuator *clang::CreateSimpleSValuator(ValueManager &valMgr) {
 // Transfer function for Casts.
 //===----------------------------------------------------------------------===//
 
-SVal SimpleSValuator::EvalCastNL(NonLoc val, QualType castTy) {  
+SVal SimpleSValuator::EvalCastNL(NonLoc val, QualType castTy) {
+  
+  bool isLocType = Loc::IsLocType(castTy);
+  
+  if (isLocType)
+    if (nonloc::LocAsInteger *LI = dyn_cast<nonloc::LocAsInteger>(&val))
+      return LI->getLoc();
+  
   if (!isa<nonloc::ConcreteInt>(val))
     return UnknownVal();
-
-  bool isLocType = Loc::IsLocType(castTy);
   
   // Only handle casts from integers to integers.
   if (!isLocType && !castTy->isIntegerType())