Add support for initializing array with string literal.
This fixes PR3127
http://llvm.org/bugs/show_bug.cgi?id=3127
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60280 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp
index 1b62cc5..92f4a6e 100644
--- a/lib/Analysis/RegionStore.cpp
+++ b/lib/Analysis/RegionStore.cpp
@@ -637,17 +637,42 @@
ConstantArrayType* CAT = cast<ConstantArrayType>(T.getTypePtr());
- llvm::APInt Size = CAT->getSize();
+ llvm::APSInt Size(CAT->getSize(), false);
- llvm::APInt i = llvm::APInt::getNullValue(Size.getBitWidth());
+ llvm::APSInt i = getBasicVals().getZeroWithPtrWidth(false);
+
+ // Check if the init expr is a StringLiteral.
+ if (isa<loc::MemRegionVal>(Init)) {
+ const MemRegion* InitR = cast<loc::MemRegionVal>(Init).getRegion();
+ const StringLiteral* S = cast<StringRegion>(InitR)->getStringLiteral();
+ const char* str = S->getStrData();
+ unsigned len = S->getByteLength();
+ unsigned j = 0;
+
+ for (; i < Size; ++i, ++j) {
+ SVal Idx = NonLoc::MakeVal(getBasicVals(), i);
+ ElementRegion* ER = MRMgr.getElementRegion(Idx, R);
+
+ // Copy bytes from the string literal into the target array. Trailing
+ // bytes in the array that are not covered by the string literal are
+ // initialized to zero.
+ SVal V = (j < len)
+ ? NonLoc::MakeVal(getBasicVals(), str[j], sizeof(char)*8, true)
+ : NonLoc::MakeVal(getBasicVals(), 0, sizeof(char)*8, true);
+
+ store = Bind(store, loc::MemRegionVal(ER), V);
+ }
+
+ return store;
+ }
+
nonloc::CompoundVal& CV = cast<nonloc::CompoundVal>(Init);
nonloc::CompoundVal::iterator VI = CV.begin(), VE = CV.end();
- for (; i != Size; ++i) {
- nonloc::ConcreteInt Idx(getBasicVals().getValue(llvm::APSInt(i, false)));
-
+ for (; i < Size; ++i) {
+ SVal Idx = NonLoc::MakeVal(getBasicVals(), i);
ElementRegion* ER = MRMgr.getElementRegion(Idx, R);
store = Bind(store, loc::MemRegionVal(ER), (VI!=VE) ? *VI : UndefinedVal());