Appease GCC. I'm surprised Clang accepted this.

llvm-svn: 127672
This commit is contained in:
Ted Kremenek 2011-03-15 05:30:12 +00:00
parent 7c607e66f4
commit e3ae0a4c47
1 changed files with 6 additions and 10 deletions

View File

@ -116,10 +116,6 @@ public:
unsigned x = (vv.vec[idx << 1] ? 1 : 0) | (vv.vec[(idx << 1) | 1] ? 2 :0); unsigned x = (vv.vec[idx << 1] ? 1 : 0) | (vv.vec[(idx << 1) | 1] ? 2 :0);
return (Value) x; return (Value) x;
} }
bool operator==(Value v) {
return v = operator Value();
}
}; };
reference operator[](unsigned idx) { return reference(*this, idx); } reference operator[](unsigned idx) { return reference(*this, idx); }
@ -132,7 +128,7 @@ class CFGBlockValues {
const CFG &cfg; const CFG &cfg;
BVPair *vals; BVPair *vals;
ValueVector scratch; ValueVector scratch;
DeclToIndex DeclToIndex; DeclToIndex declToIndex;
ValueVector &lazyCreate(ValueVector *&bv); ValueVector &lazyCreate(ValueVector *&bv);
public: public:
@ -150,7 +146,7 @@ public:
bool updateValueVectors(const CFGBlock *block, const BVPair &newVals); bool updateValueVectors(const CFGBlock *block, const BVPair &newVals);
bool hasNoDeclarations() const { bool hasNoDeclarations() const {
return DeclToIndex.size() == 0; return declToIndex.size() == 0;
} }
void resetScratch(); void resetScratch();
@ -180,13 +176,13 @@ CFGBlockValues::~CFGBlockValues() {
} }
void CFGBlockValues::computeSetOfDeclarations(const DeclContext &dc) { void CFGBlockValues::computeSetOfDeclarations(const DeclContext &dc) {
DeclToIndex.computeMap(dc); declToIndex.computeMap(dc);
scratch.resize(DeclToIndex.size()); scratch.resize(declToIndex.size());
} }
ValueVector &CFGBlockValues::lazyCreate(ValueVector *&bv) { ValueVector &CFGBlockValues::lazyCreate(ValueVector *&bv) {
if (!bv) if (!bv)
bv = new ValueVector(DeclToIndex.size()); bv = new ValueVector(declToIndex.size());
return *bv; return *bv;
} }
@ -286,7 +282,7 @@ void CFGBlockValues::resetScratch() {
} }
ValueVector::reference CFGBlockValues::operator[](const VarDecl *vd) { ValueVector::reference CFGBlockValues::operator[](const VarDecl *vd) {
const llvm::Optional<unsigned> &idx = DeclToIndex.getValueIndex(vd); const llvm::Optional<unsigned> &idx = declToIndex.getValueIndex(vd);
assert(idx.hasValue()); assert(idx.hasValue());
return scratch[idx.getValue()]; return scratch[idx.getValue()];
} }