diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-09-21 23:24:52 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-09-21 23:24:52 +0000 |
| commit | f2b95277be59f7d2a82cef8ea9f4cf6a36074593 (patch) | |
| tree | 51ebd2eacdb5af17c240e7c4c56f6752e0d84f42 | |
| parent | c7f78c74e155ece8af24cbe8b949daa9d0ba1828 (diff) | |
fix __sync_bool_compare_and_swap to work with address-space qualified types.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@114498 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGBuiltin.cpp | 11 | ||||
| -rw-r--r-- | test/CodeGen/atomic.c | 11 |
2 files changed, 17 insertions, 5 deletions
diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index 56078a0231..e9755f9b0c 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -812,17 +812,18 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, case Builtin::BI__sync_bool_compare_and_swap_4: case Builtin::BI__sync_bool_compare_and_swap_8: case Builtin::BI__sync_bool_compare_and_swap_16: { + llvm::Value *DestPtr = CGF.EmitScalarExpr(E->getArg(0)); + unsigned AddrSpace = + cast<llvm::PointerType>(DestPtr->getType())->getAddressSpace();; const llvm::Type *ValueType = - llvm::IntegerType::get( - CGF.getLLVMContext(), + llvm::IntegerType::get(CGF.getLLVMContext(), CGF.getContext().getTypeSize(E->getArg(1)->getType())); - const llvm::Type *PtrType = ValueType->getPointerTo(); + const llvm::Type *PtrType = ValueType->getPointerTo(AddrSpace); const llvm::Type *IntrinsicTypes[2] = { ValueType, PtrType }; Value *AtomF = CGM.getIntrinsic(Intrinsic::atomic_cmp_swap, IntrinsicTypes, 2); - Value *Args[3] = { Builder.CreateBitCast(CGF.EmitScalarExpr(E->getArg(0)), - PtrType), + Value *Args[3] = { Builder.CreateBitCast(DestPtr, PtrType), EmitCastToInt(CGF, ValueType, CGF.EmitScalarExpr(E->getArg(1))), EmitCastToInt(CGF, ValueType, diff --git a/test/CodeGen/atomic.c b/test/CodeGen/atomic.c index 88a96568a4..f194ec6afb 100644 --- a/test/CodeGen/atomic.c +++ b/test/CodeGen/atomic.c @@ -122,8 +122,19 @@ int atomic(void) { return old; } +// CHECK: @release_return void release_return(int *lock) { // Ensure this is actually returning void all the way through. return __sync_lock_release(lock); // CHECK: volatile store i32 0, i32* } + + +// CHECK: @addrspace +void addrspace(int __attribute__((address_space(256))) * P) { + __sync_bool_compare_and_swap(P, 0, 1); + // CHECK: call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 true) + // CHECK: call i32 @llvm.atomic.cmp.swap.i32.p256i32(i32 addrspace(256)* %tmp, i32 0, i32 1) + // CHECK: call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 true) +} + |