[cfe-commits] r47661 - in /cfe/trunk: Analysis/GRExprEngine.cpp Analysis/GRSimpleVals.cpp Analysis/ValueState.cpp Analysis/ValueState.h include/clang/Analysis/PathSensitive/GRCoreEngine.h include/clang/Analysis/PathSensitive/GRExprEngine.h include/clang/Analysis/PathSensitive/ValueManager.h include/clang/Analysis/PathSensitive/ValueState.h
Ted Kremenek
kremenek at apple.com
Tue Feb 26 22:07:00 PST 2008
Author: kremenek
Date: Wed Feb 27 00:07:00 2008
New Revision: 47661
URL: http://llvm.org/viewvc/llvm-project?rev=47661&view=rev
Log:
Header file cleanups: reduce number of includes; move ValueState.h into include directory tree.
Added:
cfe/trunk/include/clang/Analysis/PathSensitive/ValueState.h
- copied unchanged from r47659, cfe/trunk/Analysis/ValueState.h
Removed:
cfe/trunk/Analysis/ValueState.h
Modified:
cfe/trunk/Analysis/GRExprEngine.cpp
cfe/trunk/Analysis/GRSimpleVals.cpp
cfe/trunk/Analysis/ValueState.cpp
cfe/trunk/include/clang/Analysis/PathSensitive/GRCoreEngine.h
cfe/trunk/include/clang/Analysis/PathSensitive/GRExprEngine.h
cfe/trunk/include/clang/Analysis/PathSensitive/ValueManager.h
Modified: cfe/trunk/Analysis/GRExprEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/GRExprEngine.cpp?rev=47661&r1=47660&r2=47661&view=diff
==============================================================================
--- cfe/trunk/Analysis/GRExprEngine.cpp (original)
+++ cfe/trunk/Analysis/GRExprEngine.cpp Wed Feb 27 00:07:00 2008
@@ -14,10 +14,13 @@
//===----------------------------------------------------------------------===//
#include "clang/Analysis/PathSensitive/GRExprEngine.h"
-#include "clang/Analysis/PathSensitive/GRTransferFuncs.h"
-
#include "llvm/Support/Streams.h"
+#ifndef NDEBUG
+#include "llvm/Support/GraphWriter.h"
+#include <sstream>
+#endif
+
using namespace clang;
using llvm::dyn_cast;
using llvm::cast;
Modified: cfe/trunk/Analysis/GRSimpleVals.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/GRSimpleVals.cpp?rev=47661&r1=47660&r2=47661&view=diff
==============================================================================
--- cfe/trunk/Analysis/GRSimpleVals.cpp (original)
+++ cfe/trunk/Analysis/GRSimpleVals.cpp Wed Feb 27 00:07:00 2008
@@ -14,7 +14,7 @@
//===----------------------------------------------------------------------===//
#include "GRSimpleVals.h"
-#include "ValueState.h"
+#include "clang/Analysis/PathSensitive/ValueState.h"
#include "clang/Basic/Diagnostic.h"
using namespace clang;
Modified: cfe/trunk/Analysis/ValueState.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/ValueState.cpp?rev=47661&r1=47660&r2=47661&view=diff
==============================================================================
--- cfe/trunk/Analysis/ValueState.cpp (original)
+++ cfe/trunk/Analysis/ValueState.cpp Wed Feb 27 00:07:00 2008
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "ValueState.h"
+#include "clang/Analysis/PathSensitive/ValueState.h"
#include "llvm/ADT/SmallSet.h"
using namespace clang;
Removed: cfe/trunk/Analysis/ValueState.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/ValueState.h?rev=47660&view=auto
==============================================================================
--- cfe/trunk/Analysis/ValueState.h (original)
+++ cfe/trunk/Analysis/ValueState.h (removed)
@@ -1,277 +0,0 @@
-//== ValueState.h - Path-Sens. "State" for tracking valuues -----*- C++ -*--==//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This files defines SymbolID, ExprBindKey, and ValueState.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_ANALYSIS_VALUESTATE_H
-#define LLVM_CLANG_ANALYSIS_VALUESTATE_H
-
-// FIXME: Reduce the number of includes.
-
-#include "clang/Analysis/PathSensitive/RValues.h"
-#include "clang/Analysis/PathSensitive/GRCoreEngine.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/Analysis/Analyses/LiveVariables.h"
-
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/ADT/APSInt.h"
-#include "llvm/ADT/FoldingSet.h"
-#include "llvm/ADT/ImmutableMap.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/Streams.h"
-
-#include <functional>
-
-namespace clang {
-
-//===----------------------------------------------------------------------===//
-// ValueState - An ImmutableMap type Stmt*/Decl*/Symbols to RVals.
-//===----------------------------------------------------------------------===//
-
-namespace vstate {
- typedef llvm::ImmutableSet<llvm::APSInt*> IntSetTy;
-
- typedef llvm::ImmutableMap<Expr*,RVal> ExprBindingsTy;
- typedef llvm::ImmutableMap<VarDecl*,RVal> VarBindingsTy;
- typedef llvm::ImmutableMap<SymbolID,IntSetTy> ConstNotEqTy;
- typedef llvm::ImmutableMap<SymbolID,const llvm::APSInt*> ConstEqTy;
-}
-
-/// ValueStateImpl - This class encapsulates the actual data values for
-/// for a "state" in our symbolic value tracking. It is intended to be
-/// used as a functional object; that is once it is created and made
-/// "persistent" in a FoldingSet its values will never change.
-class ValueStateImpl : public llvm::FoldingSetNode {
-private:
- void operator=(const ValueStateImpl& R) const;
-
-public:
- vstate::ExprBindingsTy SubExprBindings;
- vstate::ExprBindingsTy BlockExprBindings;
- vstate::VarBindingsTy VarBindings;
- vstate::ConstNotEqTy ConstNotEq;
- vstate::ConstEqTy ConstEq;
-
- /// This ctor is used when creating the first ValueStateImpl object.
- ValueStateImpl(vstate::ExprBindingsTy EB, vstate::VarBindingsTy VB,
- vstate::ConstNotEqTy CNE, vstate::ConstEqTy CE)
- : SubExprBindings(EB),
- BlockExprBindings(EB),
- VarBindings(VB),
- ConstNotEq(CNE),
- ConstEq(CE) {}
-
- /// Copy ctor - We must explicitly define this or else the "Next" ptr
- /// in FoldingSetNode will also get copied.
- ValueStateImpl(const ValueStateImpl& RHS)
- : llvm::FoldingSetNode(),
- SubExprBindings(RHS.SubExprBindings),
- BlockExprBindings(RHS.BlockExprBindings),
- VarBindings(RHS.VarBindings),
- ConstNotEq(RHS.ConstNotEq),
- ConstEq(RHS.ConstEq) {}
-
- /// Profile - Profile the contents of a ValueStateImpl object for use
- /// in a FoldingSet.
- static void Profile(llvm::FoldingSetNodeID& ID, const ValueStateImpl& V) {
- V.SubExprBindings.Profile(ID);
- V.BlockExprBindings.Profile(ID);
- V.VarBindings.Profile(ID);
- V.ConstNotEq.Profile(ID);
- V.ConstEq.Profile(ID);
- }
-
- /// Profile - Used to profile the contents of this object for inclusion
- /// in a FoldingSet.
- void Profile(llvm::FoldingSetNodeID& ID) const {
- Profile(ID, *this);
- }
-
-};
-
-/// ValueState - This class represents a "state" in our symbolic value
-/// tracking. It is really just a "smart pointer", wrapping a pointer
-/// to ValueStateImpl object. Making this class a smart pointer means that its
-/// size is always the size of a pointer, which allows easy conversion to
-/// void* when being handled by GRCoreEngine. It also forces us to unique states;
-/// consequently, a ValueStateImpl* with a specific address will always refer
-/// to the unique state with those values.
-class ValueState {
- ValueStateImpl* Data;
-public:
- ValueState(ValueStateImpl* D) : Data(D) {}
- ValueState() : Data(0) {}
-
- // Accessors.
- ValueStateImpl* getImpl() const { return Data; }
- ValueStateImpl& operator*() { return *Data; }
- ValueStateImpl* operator->() { return Data; }
-
- // Typedefs.
- typedef vstate::IntSetTy IntSetTy;
- typedef vstate::ExprBindingsTy ExprBindingsTy;
- typedef vstate::VarBindingsTy VarBindingsTy;
- typedef vstate::ConstNotEqTy ConstNotEqTy;
- typedef vstate::ConstEqTy ConstEqTy;
-
- typedef llvm::SmallVector<ValueState,5> BufferTy;
-
- // Queries.
-
- bool isNotEqual(SymbolID sym, const llvm::APSInt& V) const;
- const llvm::APSInt* getSymVal(SymbolID sym) const;
-
- // Iterators.
-
- typedef VarBindingsTy::iterator vb_iterator;
- vb_iterator vb_begin() const { return Data->VarBindings.begin(); }
- vb_iterator vb_end() const { return Data->VarBindings.end(); }
-
- typedef ExprBindingsTy::iterator seb_iterator;
- seb_iterator seb_begin() const { return Data->SubExprBindings.begin(); }
- seb_iterator seb_end() const { return Data->SubExprBindings.end(); }
-
- typedef ExprBindingsTy::iterator beb_iterator;
- beb_iterator beb_begin() const { return Data->BlockExprBindings.begin(); }
- beb_iterator beb_end() const { return Data->BlockExprBindings.end(); }
-
- typedef ConstNotEqTy::iterator cne_iterator;
- cne_iterator cne_begin() const { return Data->ConstNotEq.begin(); }
- cne_iterator cne_end() const { return Data->ConstNotEq.end(); }
-
- typedef ConstEqTy::iterator ce_iterator;
- ce_iterator ce_begin() const { return Data->ConstEq.begin(); }
- ce_iterator ce_end() const { return Data->ConstEq.end(); }
-
- // Profiling and equality testing.
-
- bool operator==(const ValueState& RHS) const {
- return Data == RHS.Data;
- }
-
- static void Profile(llvm::FoldingSetNodeID& ID, const ValueState& V) {
- ID.AddPointer(V.getImpl());
- }
-
- void Profile(llvm::FoldingSetNodeID& ID) const {
- Profile(ID, *this);
- }
-
- void printDOT(std::ostream& Out) const;
- void print(std::ostream& Out) const;
- void printStdErr() const { print(*llvm::cerr); }
-
-};
-
-template<> struct GRTrait<ValueState> {
- static inline void* toPtr(ValueState St) {
- return reinterpret_cast<void*>(St.getImpl());
- }
- static inline ValueState toState(void* P) {
- return ValueState(static_cast<ValueStateImpl*>(P));
- }
-};
-
-class ValueStateManager {
-public:
- typedef ValueState StateTy;
-
-private:
- ValueState::IntSetTy::Factory ISetFactory;
- ValueState::ExprBindingsTy::Factory EXFactory;
- ValueState::VarBindingsTy::Factory VBFactory;
- ValueState::ConstNotEqTy::Factory CNEFactory;
- ValueState::ConstEqTy::Factory CEFactory;
-
- /// StateSet - FoldingSet containing all the states created for analyzing
- /// a particular function. This is used to unique states.
- llvm::FoldingSet<ValueStateImpl> StateSet;
-
- /// ValueMgr - Object that manages the data for all created RVals.
- ValueManager ValMgr;
-
- /// SymMgr - Object that manages the symbol information.
- SymbolManager SymMgr;
-
- /// Alloc - A BumpPtrAllocator to allocate states.
- llvm::BumpPtrAllocator& Alloc;
-
-private:
-
- ValueState::ExprBindingsTy Remove(ValueState::ExprBindingsTy B, Expr* E) {
- return EXFactory.Remove(B, E);
- }
-
- ValueState::VarBindingsTy Remove(ValueState::VarBindingsTy B, VarDecl* V) {
- return VBFactory.Remove(B, V);
- }
-
- inline ValueState::ExprBindingsTy Remove(const ValueStateImpl& V, Expr* E) {
- return Remove(V.BlockExprBindings, E);
- }
-
- inline ValueState::VarBindingsTy Remove(const ValueStateImpl& V, VarDecl* D) {
- return Remove(V.VarBindings, D);
- }
-
- ValueState BindVar(ValueState St, VarDecl* D, RVal V);
- ValueState UnbindVar(ValueState St, VarDecl* D);
-
-public:
- ValueStateManager(ASTContext& Ctx, llvm::BumpPtrAllocator& alloc)
- : ISetFactory(alloc),
- EXFactory(alloc),
- VBFactory(alloc),
- CNEFactory(alloc),
- CEFactory(alloc),
- ValMgr(Ctx, alloc),
- Alloc(alloc) {}
-
- ValueState getInitialState();
-
- ValueManager& getValueManager() { return ValMgr; }
- SymbolManager& getSymbolManager() { return SymMgr; }
-
- ValueState RemoveDeadBindings(ValueState St, Stmt* Loc,
- const LiveVariables& Liveness);
-
- ValueState RemoveSubExprBindings(ValueState St) {
- ValueStateImpl NewSt = *St;
- NewSt.SubExprBindings = EXFactory.GetEmptyMap();
- return getPersistentState(NewSt);
- }
-
- ValueState SetRVal(ValueState St, Expr* E, RVal V,
- bool isBlkExpr, bool Invalidate);
-
- ValueState SetRVal(ValueState St, LVal LV, RVal V);
-
- RVal GetRVal(ValueState St, Expr* E);
- RVal GetRVal(ValueState St, const LVal& LV, QualType T = QualType());
- RVal GetLVal(ValueState St, Expr* E);
-
- RVal GetBlkExprRVal(ValueState St, Expr* Ex);
-
- ValueState getPersistentState(const ValueStateImpl& Impl);
-
- ValueState AddEQ(ValueState St, SymbolID sym, const llvm::APSInt& V);
- ValueState AddNE(ValueState St, SymbolID sym, const llvm::APSInt& V);
-};
-
-} // end clang namespace
-
-#endif
Modified: cfe/trunk/include/clang/Analysis/PathSensitive/GRCoreEngine.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/PathSensitive/GRCoreEngine.h?rev=47661&r1=47660&r2=47661&view=diff
==============================================================================
--- cfe/trunk/include/clang/Analysis/PathSensitive/GRCoreEngine.h (original)
+++ cfe/trunk/include/clang/Analysis/PathSensitive/GRCoreEngine.h Wed Feb 27 00:07:00 2008
@@ -21,7 +21,6 @@
#include "clang/Analysis/PathSensitive/GRBlockCounter.h"
#include "llvm/ADT/OwningPtr.h"
-
namespace clang {
class GRStmtNodeBuilderImpl;
Modified: cfe/trunk/include/clang/Analysis/PathSensitive/GRExprEngine.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/PathSensitive/GRExprEngine.h?rev=47661&r1=47660&r2=47661&view=diff
==============================================================================
--- cfe/trunk/include/clang/Analysis/PathSensitive/GRExprEngine.h (original)
+++ cfe/trunk/include/clang/Analysis/PathSensitive/GRExprEngine.h Wed Feb 27 00:07:00 2008
@@ -18,28 +18,6 @@
#include "clang/Analysis/PathSensitive/GRCoreEngine.h"
#include "clang/Analysis/PathSensitive/GRTransferFuncs.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/Analysis/Analyses/LiveVariables.h"
-#include "clang/Basic/Diagnostic.h"
-
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/ADT/APSInt.h"
-#include "llvm/ADT/FoldingSet.h"
-#include "llvm/ADT/ImmutableMap.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/Compiler.h"
-
-#include <functional>
-
-#ifndef NDEBUG
-#include "llvm/Support/GraphWriter.h"
-#include <sstream>
-#endif
-
namespace clang {
class GRExprEngine {
Modified: cfe/trunk/include/clang/Analysis/PathSensitive/ValueManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/PathSensitive/ValueManager.h?rev=47661&r1=47660&r2=47661&view=diff
==============================================================================
--- cfe/trunk/include/clang/Analysis/PathSensitive/ValueManager.h (original)
+++ cfe/trunk/include/clang/Analysis/PathSensitive/ValueManager.h Wed Feb 27 00:07:00 2008
@@ -25,8 +25,6 @@
}
namespace clang {
- class ASTContext;
-
class ValueManager {
typedef llvm::FoldingSet<llvm::FoldingSetNodeWrapper<llvm::APSInt> >
@@ -55,15 +53,13 @@
SourceLocation Loc = SourceLocation());
inline const llvm::APSInt& getZeroWithPtrWidth() {
- return getValue( 0,
- Ctx.getTypeSize(Ctx.VoidPtrTy, SourceLocation()),
- true );
+ return getValue(0, Ctx.getTypeSize(Ctx.VoidPtrTy, SourceLocation()), true);
}
inline const llvm::APSInt& getTruthValue(bool b) {
- return getValue( b ? 1 : 0,
+ return getValue(b ? 1 : 0,
Ctx.getTypeSize(Ctx.IntTy, SourceLocation()),
- false );
+ false);
}
const SymIntConstraint& getConstraint(SymbolID sym, BinaryOperator::Opcode Op,
More information about the cfe-commits
mailing list