diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2012-08-29 21:21:11 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2012-08-29 21:21:11 +0000 |
| commit | a484fc73ec6331bcaad092270b4ab9c8d1df23c3 (patch) | |
| tree | 5bed6a84c642d621bf974cc2e40c5445a89af631 | |
| parent | 600a513a0ff19c7dbedc4292866caddeceb94f57 (diff) | |
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
| -rw-r--r-- | lib/CodeGen/CGBuiltin.cpp | 3 | ||||
| -rw-r--r-- | test/CodeGenObjC/builtin-memfns.m | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index b55137094e..1c95b57a7a 100644 --- 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 index 0000000000..b5c87d92dc --- /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); +} |