[cfe-commits] r58418 - in /cfe/trunk: include/clang/Analysis/PathSensitive/BasicValueFactory.h include/clang/Analysis/PathSensitive/SVals.h lib/Analysis/BasicValueFactory.cpp lib/Analysis/SVals.cpp
Zhongxing Xu
xuzhongxing at gmail.com
Wed Oct 29 21:58:01 PDT 2008
Author: zhongxingxu
Date: Wed Oct 29 23:58:00 2008
New Revision: 58418
URL: http://llvm.org/viewvc/llvm-project?rev=58418&view=rev
Log:
Add CompoundVal and CompoundValData for representing the value of InitListExpr.
Modified:
cfe/trunk/include/clang/Analysis/PathSensitive/BasicValueFactory.h
cfe/trunk/include/clang/Analysis/PathSensitive/SVals.h
cfe/trunk/lib/Analysis/BasicValueFactory.cpp
cfe/trunk/lib/Analysis/SVals.cpp
Modified: cfe/trunk/include/clang/Analysis/PathSensitive/BasicValueFactory.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/PathSensitive/BasicValueFactory.h?rev=58418&r1=58417&r2=58418&view=diff
==============================================================================
--- cfe/trunk/include/clang/Analysis/PathSensitive/BasicValueFactory.h (original)
+++ cfe/trunk/include/clang/Analysis/PathSensitive/BasicValueFactory.h Wed Oct 29 23:58:00 2008
@@ -28,7 +28,24 @@
namespace clang {
class SVal;
-
+
+class CompoundValData : public llvm::FoldingSetNode {
+ QualType T;
+ unsigned NumVals;
+ SVal* Vals;
+
+public:
+ CompoundValData(QualType t, const SVal* vals, unsigned n,
+ llvm::BumpPtrAllocator& A);
+
+ static void Profile(llvm::FoldingSetNodeID& ID, QualType T, unsigned N,
+ const SVal* Vals);
+
+ void Profile(llvm::FoldingSetNodeID& ID) {
+ Profile(ID, T, NumVals, Vals);
+ }
+};
+
class BasicValueFactory {
typedef llvm::FoldingSet<llvm::FoldingSetNodeWrapper<llvm::APSInt> >
APSIntSetTy;
@@ -45,6 +62,8 @@
void* PersistentSVals;
void* PersistentSValPairs;
+ llvm::FoldingSet<CompoundValData> CompoundValDataSet;
+
public:
BasicValueFactory(ASTContext& ctx, llvm::BumpPtrAllocator& Alloc)
: Ctx(ctx), BPAlloc(Alloc), PersistentSVals(0), PersistentSValPairs(0) {}
@@ -68,6 +87,9 @@
const SymIntConstraint& getConstraint(SymbolID sym, BinaryOperator::Opcode Op,
const llvm::APSInt& V);
+ const CompoundValData* getCompoundValData(QualType T, const SVal* Vals,
+ unsigned NumVals);
+
const llvm::APSInt* EvaluateAPSInt(BinaryOperator::Opcode Op,
const llvm::APSInt& V1,
const llvm::APSInt& V2);
Modified: cfe/trunk/include/clang/Analysis/PathSensitive/SVals.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/PathSensitive/SVals.h?rev=58418&r1=58417&r2=58418&view=diff
==============================================================================
--- cfe/trunk/include/clang/Analysis/PathSensitive/SVals.h (original)
+++ cfe/trunk/include/clang/Analysis/PathSensitive/SVals.h Wed Oct 29 23:58:00 2008
@@ -45,6 +45,7 @@
: Data(D), Kind(k) {}
public:
+ SVal() : Data(0), Kind(0) {}
~SVal() {};
/// BufferTy - A temporary buffer to hold a set of SVals.
@@ -58,7 +59,7 @@
ID.AddInteger((unsigned) getRawKind());
ID.AddPointer(reinterpret_cast<void*>(Data));
}
-
+
inline bool operator==(const SVal& R) const {
return getRawKind() == R.getRawKind() && Data == R.Data;
}
@@ -168,7 +169,10 @@
static NonLoc MakeVal(BasicValueFactory& BasicVals, IntegerLiteral* I);
static NonLoc MakeIntTruthVal(BasicValueFactory& BasicVals, bool b);
-
+
+ static NonLoc MakeCompoundVal(QualType T, SVal* Vals, unsigned NumSVals,
+ BasicValueFactory& BasicVals);
+
// Implement isa<T> support.
static inline bool classof(const SVal* V) {
return V->getBaseKind() == NonLocKind;
@@ -210,7 +214,7 @@
namespace nonloc {
enum Kind { ConcreteIntKind, SymbolValKind, SymIntConstraintValKind,
- LocAsIntegerKind };
+ LocAsIntegerKind, CompoundValKind };
class SymbolVal : public NonLoc {
public:
@@ -313,6 +317,25 @@
return LocAsInteger(Vals.getPersistentSValWithData(V, Bits));
}
};
+
+class CompoundVal : public NonLoc {
+ friend class NonLoc;
+
+ CompoundVal(const CompoundValData* D) : NonLoc(CompoundValKind, D) {}
+
+public:
+ const CompoundValData* getValue() {
+ return static_cast<CompoundValData*>(Data);
+ }
+
+ static bool classof(const SVal* V) {
+ return V->getBaseKind() == NonLocKind && V->getSubKind() == CompoundValKind;
+ }
+
+ static bool classof(const NonLoc* V) {
+ return V->getSubKind() == CompoundValKind;
+ }
+};
} // end namespace clang::nonloc
Modified: cfe/trunk/lib/Analysis/BasicValueFactory.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/BasicValueFactory.cpp?rev=58418&r1=58417&r2=58418&view=diff
==============================================================================
--- cfe/trunk/lib/Analysis/BasicValueFactory.cpp (original)
+++ cfe/trunk/lib/Analysis/BasicValueFactory.cpp Wed Oct 29 23:58:00 2008
@@ -18,6 +18,26 @@
using namespace clang;
+CompoundValData::CompoundValData(QualType t, const SVal* vals, unsigned n,
+ llvm::BumpPtrAllocator& A)
+ : T(t), NumVals(n) {
+
+ Vals = (SVal*) A.Allocate<SVal>(n);
+
+ new (Vals) SVal[n];
+
+ for (unsigned i = 0; i < n; ++i)
+ Vals[i] = vals[i];
+}
+
+void CompoundValData::Profile(llvm::FoldingSetNodeID& ID, QualType T,
+ unsigned N, const SVal* Vals) {
+ T.Profile(ID);
+ ID.AddInteger(N);
+ for (unsigned i = 0; i < N; ++i)
+ Vals[i].Profile(ID);
+}
+
typedef std::pair<SVal, uintptr_t> SValData;
typedef std::pair<SVal, SVal> SValPair;
@@ -106,6 +126,24 @@
return *C;
}
+const CompoundValData*
+BasicValueFactory::getCompoundValData(QualType T, const SVal* Vals,
+ unsigned NumVals) {
+ llvm::FoldingSetNodeID ID;
+ CompoundValData::Profile(ID, T, NumVals, Vals);
+ void* InsertPos;
+
+ CompoundValData* D = CompoundValDataSet.FindNodeOrInsertPos(ID, InsertPos);
+
+ if (!D) {
+ D = (CompoundValData*) BPAlloc.Allocate<CompoundValData>();
+ new (D) CompoundValData(T, Vals, NumVals, BPAlloc);
+ CompoundValDataSet.InsertNode(D, InsertPos);
+ }
+
+ return D;
+}
+
const llvm::APSInt*
BasicValueFactory::EvaluateAPSInt(BinaryOperator::Opcode Op,
const llvm::APSInt& V1, const llvm::APSInt& V2) {
Modified: cfe/trunk/lib/Analysis/SVals.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/SVals.cpp?rev=58418&r1=58417&r2=58418&view=diff
==============================================================================
--- cfe/trunk/lib/Analysis/SVals.cpp (original)
+++ cfe/trunk/lib/Analysis/SVals.cpp Wed Oct 29 23:58:00 2008
@@ -245,6 +245,11 @@
return nonloc::ConcreteInt(BasicVals.getTruthValue(b));
}
+NonLoc NonLoc::MakeCompoundVal(QualType T, SVal* Vals, unsigned NumSVals,
+ BasicValueFactory& BasicVals) {
+ return nonloc::CompoundVal(BasicVals.getCompoundValData(T, Vals, NumSVals));
+}
+
SVal SVal::GetSymbolValue(SymbolManager& SymMgr, VarDecl* D) {
QualType T = D->getType();
More information about the cfe-commits
mailing list