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();
}
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;
// 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);
// 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);
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;
}
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) {}
/// 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);
}
// Typedefs.
typedef vstate::IntSetTy IntSetTy;
- typedef vstate::VariableBindingsTy VariableBindingsTy;
+ typedef vstate::VarBindingsTy VarBindingsTy;
typedef vstate::ConstantNotEqTy ConstantNotEqTy;
typedef vstate::ConstantEqTy ConstantEqTy;
// 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.
private:
ValueState::IntSetTy::Factory ISetFactory;
- ValueState::VariableBindingsTy::Factory VBFactory;
+ ValueState::VarBindingsTy::Factory VBFactory;
ValueState::ConstantNotEqTy::Factory CNEFactory;
ValueState::ConstantEqTy::Factory CEFactory;