[cfe-commits] r46875 - in /cfe/trunk/Analysis: GRConstants.cpp RValues.cpp ValueState.cpp ValueState.h
Ted Kremenek
kremenek at apple.com
Thu Feb 7 19:02:48 PST 2008
Author: kremenek
Date: Thu Feb 7 21:02:48 2008
New Revision: 46875
URL: http://llvm.org/viewvc/llvm-project?rev=46875&view=rev
Log:
More variable renamings.
Modified:
cfe/trunk/Analysis/GRConstants.cpp
cfe/trunk/Analysis/RValues.cpp
cfe/trunk/Analysis/ValueState.cpp
cfe/trunk/Analysis/ValueState.h
Modified: cfe/trunk/Analysis/GRConstants.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/GRConstants.cpp?rev=46875&r1=46874&r2=46875&view=diff
==============================================================================
--- cfe/trunk/Analysis/GRConstants.cpp (original)
+++ cfe/trunk/Analysis/GRConstants.cpp Thu Feb 7 21:02:48 2008
@@ -332,7 +332,7 @@
GRConstants::StateTy
GRConstants::SetValue(StateTy St, const LValue& LV, const RValue& V) {
- if (!LV.isValid())
+ if (LV.isUnknown())
return St;
if (!StateCleaned) {
@@ -390,7 +390,7 @@
default:
break;
- case RValue::InvalidKind:
+ case RValue::UnknownKind:
builder.generateNode(PrevState, true);
builder.generateNode(PrevState, false);
return;
Modified: cfe/trunk/Analysis/RValues.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/RValues.cpp?rev=46875&r1=46874&r2=46875&view=diff
==============================================================================
--- cfe/trunk/Analysis/RValues.cpp (original)
+++ cfe/trunk/Analysis/RValues.cpp Thu Feb 7 21:02:48 2008
@@ -132,7 +132,7 @@
default: assert(false && "Invalid RValue."); break;
case LValueKind: return cast<LValue>(this)->EvalCast(ValMgr, CastExpr);
case NonLValueKind: return cast<NonLValue>(this)->EvalCast(ValMgr, CastExpr);
- case UninitializedKind: case InvalidKind: break;
+ case UninitializedKind: case UnknownKind: break;
}
return *this;
@@ -503,7 +503,7 @@
void RValue::print(std::ostream& Out) const {
switch (getBaseKind()) {
- case InvalidKind:
+ case UnknownKind:
Out << "Invalid";
break;
Modified: cfe/trunk/Analysis/ValueState.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/ValueState.cpp?rev=46875&r1=46874&r2=46875&view=diff
==============================================================================
--- cfe/trunk/Analysis/ValueState.cpp (original)
+++ cfe/trunk/Analysis/ValueState.cpp Thu Feb 7 21:02:48 2008
@@ -40,8 +40,8 @@
switch (LV.getSubKind()) {
case lval::DeclValKind: {
- StateTy::VariableBindingsTy::TreeTy* T =
- St.getImpl()->VariableBindings.SlimFind(cast<lval::DeclVal>(LV).getDecl());
+ StateTy::VarBindingsTy::TreeTy* T =
+ St.getImpl()->VarBindings.SlimFind(cast<lval::DeclVal>(LV).getDecl());
return T ? T->getValue().second : UnknownVal();
}
@@ -151,8 +151,8 @@
break;
}
- StateTy::VariableBindingsTy::TreeTy* T =
- St.getImpl()->VariableBindings.SlimFind(S);
+ StateTy::VarBindingsTy::TreeTy* T =
+ St.getImpl()->VarBindings.SlimFind(S);
if (T) {
if (hasVal) *hasVal = true;
@@ -207,8 +207,8 @@
// Create a new state with the old binding removed.
ValueStateImpl NewStateImpl = *St.getImpl();
- NewStateImpl.VariableBindings =
- VBFactory.Remove(NewStateImpl.VariableBindings, K);
+ NewStateImpl.VarBindings =
+ VBFactory.Remove(NewStateImpl.VarBindings, K);
// Get the persistent copy.
return getPersistentState(NewStateImpl);
@@ -219,8 +219,8 @@
// Create a new state with the old binding removed.
ValueStateImpl NewStateImpl = *St.getImpl();
- NewStateImpl.VariableBindings =
- VBFactory.Add(NewStateImpl.VariableBindings, K, V);
+ NewStateImpl.VarBindings =
+ VBFactory.Add(NewStateImpl.VarBindings, K, V);
// Get the persistent copy.
return getPersistentState(NewStateImpl);
Modified: cfe/trunk/Analysis/ValueState.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/ValueState.h?rev=46875&r1=46874&r2=46875&view=diff
==============================================================================
--- cfe/trunk/Analysis/ValueState.h (original)
+++ cfe/trunk/Analysis/ValueState.h Thu Feb 7 21:02:48 2008
@@ -116,7 +116,7 @@
namespace vstate {
typedef llvm::ImmutableSet<llvm::APSInt*> IntSetTy;
- typedef llvm::ImmutableMap<VarBindKey,RValue> VariableBindingsTy;
+ typedef llvm::ImmutableMap<VarBindKey,RValue> VarBindingsTy;
typedef llvm::ImmutableMap<SymbolID,IntSetTy> ConstantNotEqTy;
typedef llvm::ImmutableMap<SymbolID,const llvm::APSInt*> ConstantEqTy;
}
@@ -130,21 +130,21 @@
void operator=(const ValueStateImpl& R) const;
public:
- vstate::VariableBindingsTy VariableBindings;
+ vstate::VarBindingsTy VarBindings;
vstate::ConstantNotEqTy ConstantNotEq;
vstate::ConstantEqTy ConstantEq;
/// This ctor is used when creating the first ValueStateImpl object.
- ValueStateImpl(vstate::VariableBindingsTy VB,
+ ValueStateImpl(vstate::VarBindingsTy VB,
vstate::ConstantNotEqTy CNE,
vstate::ConstantEqTy CE)
- : VariableBindings(VB), ConstantNotEq(CNE), ConstantEq(CE) {}
+ : VarBindings(VB), ConstantNotEq(CNE), ConstantEq(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(),
- VariableBindings(RHS.VariableBindings),
+ VarBindings(RHS.VarBindings),
ConstantNotEq(RHS.ConstantNotEq),
ConstantEq(RHS.ConstantEq) {}
@@ -153,7 +153,7 @@
/// Profile - Profile the contents of a ValueStateImpl object for use
/// in a FoldingSet.
static void Profile(llvm::FoldingSetNodeID& ID, const ValueStateImpl& V) {
- V.VariableBindings.Profile(ID);
+ V.VarBindings.Profile(ID);
V.ConstantNotEq.Profile(ID);
V.ConstantEq.Profile(ID);
}
@@ -184,7 +184,7 @@
// Typedefs.
typedef vstate::IntSetTy IntSetTy;
- typedef vstate::VariableBindingsTy VariableBindingsTy;
+ typedef vstate::VarBindingsTy VarBindingsTy;
typedef vstate::ConstantNotEqTy ConstantNotEqTy;
typedef vstate::ConstantEqTy ConstantEqTy;
@@ -197,9 +197,9 @@
// Iterators.
- typedef VariableBindingsTy::iterator vb_iterator;
- vb_iterator begin() { return Data->VariableBindings.begin(); }
- vb_iterator end() { return Data->VariableBindings.end(); }
+ typedef VarBindingsTy::iterator vb_iterator;
+ vb_iterator begin() { return Data->VarBindings.begin(); }
+ vb_iterator end() { return Data->VarBindings.end(); }
// Profiling and equality testing.
@@ -232,7 +232,7 @@
private:
ValueState::IntSetTy::Factory ISetFactory;
- ValueState::VariableBindingsTy::Factory VBFactory;
+ ValueState::VarBindingsTy::Factory VBFactory;
ValueState::ConstantNotEqTy::Factory CNEFactory;
ValueState::ConstantEqTy::Factory CEFactory;
More information about the cfe-commits
mailing list