Revert "llvm: Fix aliasing violations"linaro_android_4.0.3

This reverts commit 7627984d2049335136ff425ccb95281d1e102c40.

1 files changed, 2 insertions, 7 deletions

diff --git a/lib/Support/FoldingSet.cpp b/lib/Support/FoldingSet.cpp
index 776ce1baf03d..17b827132f57 100644
--- a/lib/Support/FoldingSet.cpp
+++ b/lib/Support/FoldingSet.cpp
@@ -64,13 +64,8 @@ void FoldingSetNodeID::AddPointer(const void *Ptr) {
   // depend on the host.  It doesn't matter however, because hashing on
   // pointer values in inherently unstable.  Nothing  should depend on the 
   // ordering of nodes in the folding set.
-  union {
-    const void **p;
-    unsigned *u;
-  };
-  p=&Ptr;
-  Bits.append(u,
-              u+1);
+  Bits.append(reinterpret_cast<unsigned *>(&Ptr),
+              reinterpret_cast<unsigned *>(&Ptr+1));
 }
 void FoldingSetNodeID::AddInteger(signed I) {
   Bits.push_back(I);