[cfe-commits] r122468 - /cfe/trunk/lib/GR/MemRegion.cpp

[Ted Kremenek]

Author: kremenek
Date: Wed Dec 22 20:42:36 2010
New Revision: 122468

URL: http://llvm.org/viewvc/llvm-project?rev=122468&view=rev
Log:
Change MemRegion extent type to be the same type used
for array indices.

Modified:
    cfe/trunk/lib/GR/MemRegion.cpp

Modified: cfe/trunk/lib/GR/MemRegion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/GR/MemRegion.cpp?rev=122468&r1=122467&r2=122468&view=diff
==============================================================================
--- cfe/trunk/lib/GR/MemRegion.cpp (original)
+++ cfe/trunk/lib/GR/MemRegion.cpp Wed Dec 22 20:42:36 2010
@@ -186,9 +186,9 @@
   if (isa<IncompleteArrayType>(T))
     return UnknownVal();
 
-  CharUnits Size = Ctx.getTypeSizeInChars(T);
-  QualType SizeTy = Ctx.getSizeType();
-  return svalBuilder.makeIntVal(Size.getQuantity(), SizeTy);
+  CharUnits size = Ctx.getTypeSizeInChars(T);
+  QualType sizeTy = svalBuilder.getArrayIndexType();
+  return svalBuilder.makeIntVal(size.getQuantity(), sizeTy);
 }
 
 DefinedOrUnknownSVal FieldRegion::getExtent(SValBuilder &svalBuilder) const {
@@ -215,8 +215,8 @@
 }
 
 DefinedOrUnknownSVal StringRegion::getExtent(SValBuilder &svalBuilder) const {
-  QualType SizeTy = svalBuilder.getContext().getSizeType();
-  return svalBuilder.makeIntVal(getStringLiteral()->getByteLength()+1, SizeTy);
+  return svalBuilder.makeIntVal(getStringLiteral()->getByteLength()+1,
+                                svalBuilder.getArrayIndexType());
 }
 
 QualType CXXBaseObjectRegion::getValueType() const {