From: Ted Kremenek Date: Fri, 8 Feb 2008 03:02:48 +0000 (+0000) Subject: More variable renamings. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53c641a735da0c3fe077aab63a6fef16c8798937;p=clang More variable renamings. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@46875 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/Analysis/GRConstants.cpp b/Analysis/GRConstants.cpp index 7e23098955..8bf7a2ff3d 100644 --- a/Analysis/GRConstants.cpp +++ b/Analysis/GRConstants.cpp @@ -332,7 +332,7 @@ GRConstants::SetValue(StateTy St, Stmt* S, const RValue::BufferTy& RB, 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 @@ void GRConstants::ProcessBranch(Expr* Condition, Stmt* Term, default: break; - case RValue::InvalidKind: + case RValue::UnknownKind: builder.generateNode(PrevState, true); builder.generateNode(PrevState, false); return; diff --git a/Analysis/RValues.cpp b/Analysis/RValues.cpp index 9813dcb57d..2b5ed1d16f 100644 --- a/Analysis/RValues.cpp +++ b/Analysis/RValues.cpp @@ -132,7 +132,7 @@ RValue RValue::EvalCast(ValueManager& ValMgr, Expr* CastExpr) const { default: assert(false && "Invalid RValue."); break; case LValueKind: return cast(this)->EvalCast(ValMgr, CastExpr); case NonLValueKind: return cast(this)->EvalCast(ValMgr, CastExpr); - case UninitializedKind: case InvalidKind: break; + case UninitializedKind: case UnknownKind: break; } return *this; @@ -503,7 +503,7 @@ void RValue::print() const { void RValue::print(std::ostream& Out) const { switch (getBaseKind()) { - case InvalidKind: + case UnknownKind: Out << "Invalid"; break; diff --git a/Analysis/ValueState.cpp b/Analysis/ValueState.cpp index d278619ab5..d191623dd8 100644 --- a/Analysis/ValueState.cpp +++ b/Analysis/ValueState.cpp @@ -40,8 +40,8 @@ RValue ValueStateManager::GetValue(const StateTy& St, const LValue& LV, switch (LV.getSubKind()) { case lval::DeclValKind: { - StateTy::VariableBindingsTy::TreeTy* T = - St.getImpl()->VariableBindings.SlimFind(cast(LV).getDecl()); + StateTy::VarBindingsTy::TreeTy* T = + St.getImpl()->VarBindings.SlimFind(cast(LV).getDecl()); return T ? T->getValue().second : UnknownVal(); } @@ -151,8 +151,8 @@ RValue ValueStateManager::GetValue(const StateTy& St, Stmt* S, bool* hasVal) { 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 @@ ValueStateManager::Remove(StateTy St, VarBindKey K) { // 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 @@ ValueStateManager::Add(StateTy St, VarBindKey K, const RValue& V) { // 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); diff --git a/Analysis/ValueState.h b/Analysis/ValueState.h index 4f7d13850f..388231090e 100644 --- a/Analysis/ValueState.h +++ b/Analysis/ValueState.h @@ -116,7 +116,7 @@ public: namespace vstate { typedef llvm::ImmutableSet IntSetTy; - typedef llvm::ImmutableMap VariableBindingsTy; + typedef llvm::ImmutableMap VarBindingsTy; typedef llvm::ImmutableMap ConstantNotEqTy; typedef llvm::ImmutableMap ConstantEqTy; } @@ -130,21 +130,21 @@ private: 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 @@ public: /// 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 @@ public: // 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 @@ public: // 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 @@ public: private: ValueState::IntSetTy::Factory ISetFactory; - ValueState::VariableBindingsTy::Factory VBFactory; + ValueState::VarBindingsTy::Factory VBFactory; ValueState::ConstantNotEqTy::Factory CNEFactory; ValueState::ConstantEqTy::Factory CEFactory;