diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-09-21 23:35:30 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-09-21 23:35:30 +0000 |
| commit | 780a2eb227c3f395a390a143f61bba1724913817 (patch) | |
| tree | dd209cc24d7708c73eff378219b57d9c7c5445bc /lib/CodeGen/CGBuiltin.cpp | |
| parent | f2b95277be59f7d2a82cef8ea9f4cf6a36074593 (diff) | |
same bug as before, this time with __sync_val_compare_and_swap.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@114502 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGBuiltin.cpp')
| -rw-r--r-- | lib/CodeGen/CGBuiltin.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index e9755f9b0c..d00f1c1d79 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -35,7 +35,7 @@ static void EmitMemoryBarrier(CodeGenFunction &CGF, Value *C[5] = { LoadLoad ? True : False, LoadStore ? True : False, StoreLoad ? True : False, - StoreStore ? True : False, + StoreStore ? True : False, Device ? True : False }; CGF.Builder.CreateCall(CGF.CGM.getIntrinsic(Intrinsic::memory_barrier), C, C + 5); @@ -788,16 +788,18 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, case Builtin::BI__sync_val_compare_and_swap_4: case Builtin::BI__sync_val_compare_and_swap_8: case Builtin::BI__sync_val_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(), CGF.getContext().getTypeSize(E->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, |