Fix PR 4594 by refactoring almost all casting logic from GRExprEngine::VisitCast

to SValuator::EvalCast. In the process, the StoreManagers now use this new cast
machinery, and the hack in GRExprEngine::EvalBind to handle implicit casts
involving OSAtomicCompareAndSwap and friends has been removed (and replaced with
logic closer to the logic specific to those functions).

llvm-svn: 76641

1 files changed, 4 insertions, 1 deletions

diff --git a/clang/lib/Analysis/ValueManager.cpp b/clang/lib/Analysis/ValueManager.cpp
index 658dfa1186c..ee6b5cbeeb3 100644
--- a/clang/lib/Analysis/ValueManager.cpp
+++ b/clang/lib/Analysis/ValueManager.cpp
@@ -56,6 +56,9 @@ NonLoc ValueManager::makeNonLoc(const SymExpr *lhs, BinaryOperator::Opcode op,
 
 
 SVal ValueManager::convertToArrayIndex(SVal V) {
+  if (V.isUnknownOrUndef())
+    return V;
+  
   // Common case: we have an appropriately sized integer.
   if (nonloc::ConcreteInt* CI = dyn_cast<nonloc::ConcreteInt>(&V)) {
     const llvm::APSInt& I = CI->getValue();
@@ -63,7 +66,7 @@ SVal ValueManager::convertToArrayIndex(SVal V) {
       return V;
   }
   
-  return SVator->EvalCast(V, ArrayIndexTy);
+  return SVator->EvalCastNL(cast<NonLoc>(V), ArrayIndexTy);
 }
 
 SVal ValueManager::getRegionValueSymbolVal(const MemRegion* R, QualType T) {