Change the implementation of symbol_iterator to not use a union and rely on any details of SymbolRef's implementation.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60579 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Analysis/PathSensitive/SVals.h b/include/clang/Analysis/PathSensitive/SVals.h
index 45435b0..70824eb 100644
--- a/include/clang/Analysis/PathSensitive/SVals.h
+++ b/include/clang/Analysis/PathSensitive/SVals.h
@@ -101,37 +101,37 @@
void printStdErr() const;
class symbol_iterator {
- const enum { One, Many } HowMany;
- union { uintptr_t sym; const SymbolRef* sptr; };
+ SymbolRef SingleRef;
+ const SymbolRef* sptr;
public:
bool operator==(const symbol_iterator& X) {
- return X.sym == sym;
+ return SingleRef == X.SingleRef && sptr == X.sptr;
}
bool operator!=(const symbol_iterator& X) {
- return X.sym != sym;
+ return SingleRef != X.SingleRef || sptr != X.sptr;
}
symbol_iterator& operator++() {
- if (HowMany == Many)
+ if (sptr)
++sptr;
else
- sym = ~0x0;
+ SingleRef = SymbolRef();
return *this;
}
SymbolRef operator*() const {
- if (HowMany)
+ if (sptr)
return *sptr;
- return SymbolRef(sym);
+ return SingleRef;
}
- symbol_iterator(SymbolRef x) : HowMany(One), sym(x.getNumber()) {}
- symbol_iterator() : HowMany(One), sym(~0x0) {}
- symbol_iterator(const SymbolRef* x) : HowMany(Many), sptr(x) {}
+ symbol_iterator(SymbolRef x) : SingleRef(x), sptr(0) {}
+ symbol_iterator() : sptr(0) {}
+ symbol_iterator(const SymbolRef* x) : sptr(x) {}
};
symbol_iterator symbol_begin() const;
diff --git a/include/clang/Analysis/PathSensitive/SymbolManager.h b/include/clang/Analysis/PathSensitive/SymbolManager.h
index 887e3d9..1adc7c6 100644
--- a/include/clang/Analysis/PathSensitive/SymbolManager.h
+++ b/include/clang/Analysis/PathSensitive/SymbolManager.h
@@ -40,6 +40,9 @@
bool isInitialized() const { return Data != (unsigned) (~0U - 2); }
operator unsigned() const { return getNumber(); }
unsigned getNumber() const { assert (isInitialized()); return Data; }
+
+ bool operator==(const SymbolRef& X) const { return Data == X.Data; }
+ bool operator!=(const SymbolRef& X) const { return Data != X.Data; }
void print(llvm::raw_ostream& os) const;