commit a484fc73ec6331bcaad092270b4ab9c8d1df23c3
author Eli Friedman <eli.friedman@gmail.com> Wed Aug 29 21:21:11 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Wed Aug 29 21:21:11 2012 +0000
tree 5bed6a84c642d621bf974cc2e40c5445a89af631
parent 600a513a0ff19c7dbedc4292866caddeceb94f57

Make alignment computation for pointer values for builtins handle
non-pointer types with a pointer representation correctly. PR13660.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162862 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGBuiltin.cpp

diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index b551370..1c95b57 100644
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -1478,7 +1478,8 @@
   assert(Addr->getType()->isPointerType());
   Addr = Addr->IgnoreParens();
   if (const ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(Addr)) {
-    if (ICE->getCastKind() == CK_BitCast || ICE->getCastKind() == CK_NoOp) {
+    if ((ICE->getCastKind() == CK_BitCast || ICE->getCastKind() == CK_NoOp) &&
+        ICE->getSubExpr()->getType()->isPointerType()) {
       std::pair<llvm::Value*, unsigned> Ptr = 
           EmitPointerWithAlignment(ICE->getSubExpr());
       Ptr.first = Builder.CreateBitCast(Ptr.first,