Change the implementation of symbol_iterator to not use a union and rely on any details of SymbolRef's implementation.

llvm-svn: 60579

2 files changed, 14 insertions, 11 deletions

diff --git a/clang/include/clang/Analysis/PathSensitive/SVals.h b/clang/include/clang/Analysis/PathSensitive/SVals.h
index 45435b0dae9..70824eb561d 100644
--- a/clang/include/clang/Analysis/PathSensitive/SVals.h
+++ b/clang/include/clang/Analysis/PathSensitive/SVals.h
@@ -101,37 +101,37 @@ public:
   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/clang/include/clang/Analysis/PathSensitive/SymbolManager.h b/clang/include/clang/Analysis/PathSensitive/SymbolManager.h
index 887e3d9f9cd..1adc7c6eafc 100644
--- a/clang/include/clang/Analysis/PathSensitive/SymbolManager.h
+++ b/clang/include/clang/Analysis/PathSensitive/SymbolManager.h
@@ -40,6 +40,9 @@ public:
   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;