X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FADT%2FPointerUnion.h;h=1b36aeea793478708ae7b64fd4a52686146bbd1a;hb=670031666cf4dea0d122a0df2ec1d18822c225e4;hp=da67c8e8c27b8aab06592cb40f22fef07931347c;hpb=e8bc475668ddd2f31f44dd00b042d15b255e1b9e;p=oota-llvm.git

diff --git a/include/llvm/ADT/PointerUnion.h b/include/llvm/ADT/PointerUnion.h
index da67c8e8c27..1b36aeea793 100644
--- a/include/llvm/ADT/PointerUnion.h
+++ b/include/llvm/ADT/PointerUnion.h
@@ -54,7 +54,7 @@ namespace llvm {
   ///    printf("%d %d", P.is<int*>(), P.is<float*>());  // prints "1 0"
   ///    X = P.get<int*>();     // ok.
   ///    Y = P.get<float*>();   // runtime assertion failure.
-  ///    Z = P.get<double*>();  // does not compile.
+  ///    Z = P.get<double*>();  // runtime assertion failure (regardless of tag)
   ///    P = (float*)0;
   ///    Y = P.get<float*>();   // ok.
   ///    X = P.get<int*>();     // runtime assertion failure.
@@ -69,11 +69,13 @@ namespace llvm {
     PointerUnion() {}
     
     PointerUnion(PT1 V) {
-      Val.setPointer(PointerLikeTypeTraits<PT1>::getAsVoidPointer(V));
+      Val.setPointer(
+         const_cast<void *>(PointerLikeTypeTraits<PT1>::getAsVoidPointer(V)));
       Val.setInt(0);
     }
     PointerUnion(PT2 V) {
-      Val.setPointer(PointerLikeTypeTraits<PT2>::getAsVoidPointer(V));
+      Val.setPointer(
+         const_cast<void *>(PointerLikeTypeTraits<PT2>::getAsVoidPointer(V)));
       Val.setInt(1);
     }
     
@@ -87,7 +89,7 @@ namespace llvm {
     int is() const {
       int TyNo = ::llvm::getPointerUnionTypeNum<PT1, PT2>((T*)0);
       assert(TyNo != -1 && "Type query could never succeed on PointerUnion!");
-      return Val.getInt() == TyNo;
+      return static_cast<int>(Val.getInt()) == TyNo;
     }
     
     /// get<T>() - Return the value of the specified pointer type. If the
@@ -109,12 +111,14 @@ namespace llvm {
     /// Assignment operators - Allow assigning into this union from either
     /// pointer type, setting the discriminator to remember what it came from.
     const PointerUnion &operator=(const PT1 &RHS) {
-      Val.setPointer(PointerLikeTypeTraits<PT1>::getAsVoidPointer(RHS));
+      Val.setPointer(
+         const_cast<void *>(PointerLikeTypeTraits<PT1>::getAsVoidPointer(RHS)));
       Val.setInt(0);
       return *this;
     }
     const PointerUnion &operator=(const PT2 &RHS) {
-      Val.setPointer(PointerLikeTypeTraits<PT2>::getAsVoidPointer(RHS));
+      Val.setPointer(
+        const_cast<void *>(PointerLikeTypeTraits<PT2>::getAsVoidPointer(RHS)));
       Val.setInt(1);
       return *this;
     }
@@ -182,10 +186,8 @@ namespace llvm {
     int is() const {
       // Is it PT1/PT2?
       if (::llvm::getPointerUnionTypeNum<PT1, PT2>((T*)0) != -1)
-        return Val.get<InnerUnion>().is<T>();
-      // Must be PT3 or statically invalid.
-      assert(Val.is<T>());
-      return true;
+        return Val.is<InnerUnion>() && Val.get<InnerUnion>().is<T>();
+      return Val.is<T>();
     }
     
     /// get<T>() - Return the value of the specified pointer type. If the
@@ -193,9 +195,11 @@ namespace llvm {
     template<typename T>
     T get() const {
       assert(is<T>() && "Invalid accessor called");
-      if (Val.is<T>())
-        return Val.get<T>();
-      return Val.get<InnerUnion>().get<T>();
+      // Is it PT1/PT2?
+      if (::llvm::getPointerUnionTypeNum<PT1, PT2>((T*)0) != -1)
+        return Val.get<InnerUnion>().get<T>();
+      
+      return Val.get<T>();
     }
     
     /// dyn_cast<T>() - If the current value is of the specified pointer type,