diff options
| -rw-r--r-- | lib/CodeGen/CGBuiltin.cpp | 9 | ||||
| -rw-r--r-- | test/CodeGen/atomic.c | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index 2a3aa1f2a5..eb849f6e99 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -942,12 +942,13 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, case Builtin::BI__sync_lock_release_8: case Builtin::BI__sync_lock_release_16: { Value *Ptr = EmitScalarExpr(E->getArg(0)); - llvm::Type *ElLLVMTy = - cast<llvm::PointerType>(Ptr->getType())->getElementType(); - llvm::StoreInst *Store = - Builder.CreateStore(llvm::Constant::getNullValue(ElLLVMTy), Ptr); QualType ElTy = E->getArg(0)->getType()->getPointeeType(); CharUnits StoreSize = getContext().getTypeSizeInChars(ElTy); + llvm::Type *ITy = llvm::IntegerType::get(getLLVMContext(), + StoreSize.getQuantity() * 8); + Ptr = Builder.CreateBitCast(Ptr, ITy->getPointerTo()); + llvm::StoreInst *Store = + Builder.CreateStore(llvm::Constant::getNullValue(ITy), Ptr); Store->setAlignment(StoreSize.getQuantity()); Store->setAtomic(llvm::Release); return RValue::get(0); diff --git a/test/CodeGen/atomic.c b/test/CodeGen/atomic.c index c8f4fd09bb..ac3848f02f 100644 --- a/test/CodeGen/atomic.c +++ b/test/CodeGen/atomic.c @@ -8,6 +8,7 @@ int atomic(void) { _Bool valb = 0; unsigned int uval = 1; int cmp = 0; + int* ptrval; old = __sync_fetch_and_add(&val, 1); // CHECK: atomicrmw add i32* %val, i32 1 seq_cst @@ -75,8 +76,11 @@ int atomic(void) { // CHECK: cmpxchg i32* null, i32 0, i32 0 seq_cst __sync_lock_release(&val); - // CHECK: store atomic {{.*}} release, align 4 - + // CHECK: store atomic i32 0, {{.*}} release, align 4 + + __sync_lock_release(&ptrval); + // CHECK: store atomic i32 0, {{.*}} release, align 4 + __sync_synchronize (); // CHECK: fence seq_cst |