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

diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index b55137094e7db7a79a1c7a94b1dcb9a3a715eb29..1c95b57a7adba06e07034088927e9f2e537d3765 100644 (file)
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -1478,7 +1478,8 @@ CodeGenFunction::EmitPointerWithAlignment(const Expr *Addr) {
   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,

diff --git a/test/CodeGenObjC/builtin-memfns.m b/test/CodeGenObjC/builtin-memfns.m
new file mode 100644 (file)
index 0000000..b5c87d9
--- /dev/null
+++ b/test/CodeGenObjC/builtin-memfns.m
@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.8.0 -emit-llvm < %s| FileCheck %s
+
+void *memcpy(void *restrict s1, const void *restrict s2, unsigned long n);
+
+// PR13660
+void test1(int *a, id b) {
+       // CHECK: @test1
+       // CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* {{.*}}, i8* {{.*}}, i64 8, i32 1, i1 false)
+       memcpy(a, b, 8);
+}