diff options
| author | Tim Northover <tnorthover@apple.com> | 2014-03-11 10:49:03 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2014-03-11 10:49:03 +0000 |
| commit | 0622b3a67af7545fa634c7fa98407f570a01d7b0 (patch) | |
| tree | 4b8fdab5e79b312e4c076b88f09ee748dd957198 /clang/lib/CodeGen/CGExprScalar.cpp | |
| parent | e94a518a22db4b21f4a4a9e34173a11e9dfc5fcc (diff) | |
| download | bcm5719-llvm-0622b3a67af7545fa634c7fa98407f570a01d7b0.tar.gz bcm5719-llvm-0622b3a67af7545fa634c7fa98407f570a01d7b0.zip | |
Update for IR: add a second AtomicOrdering to cmpxchg insts.
rdar://problem/15996804
llvm-svn: 203560
Diffstat (limited to 'clang/lib/CodeGen/CGExprScalar.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index 580cb15028c..5f932b08b55 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -1735,8 +1735,9 @@ ScalarExprEmitter::EmitScalarPrePostIncDec(const UnaryOperator *E, LValue LV, if (atomicPHI) { llvm::BasicBlock *opBB = Builder.GetInsertBlock(); llvm::BasicBlock *contBB = CGF.createBasicBlock("atomic_cont", CGF.CurFn); - llvm::Value *old = Builder.CreateAtomicCmpXchg(LV.getAddress(), atomicPHI, - CGF.EmitToMemory(value, type), llvm::SequentiallyConsistent); + llvm::Value *old = Builder.CreateAtomicCmpXchg( + LV.getAddress(), atomicPHI, CGF.EmitToMemory(value, type), + llvm::SequentiallyConsistent, llvm::SequentiallyConsistent); atomicPHI->addIncoming(old, opBB); llvm::Value *success = Builder.CreateICmpEQ(old, atomicPHI); Builder.CreateCondBr(success, contBB, opBB); @@ -2077,8 +2078,9 @@ LValue ScalarExprEmitter::EmitCompoundAssignLValue( if (atomicPHI) { llvm::BasicBlock *opBB = Builder.GetInsertBlock(); llvm::BasicBlock *contBB = CGF.createBasicBlock("atomic_cont", CGF.CurFn); - llvm::Value *old = Builder.CreateAtomicCmpXchg(LHSLV.getAddress(), atomicPHI, - CGF.EmitToMemory(Result, LHSTy), llvm::SequentiallyConsistent); + llvm::Value *old = Builder.CreateAtomicCmpXchg( + LHSLV.getAddress(), atomicPHI, CGF.EmitToMemory(Result, LHSTy), + llvm::SequentiallyConsistent, llvm::SequentiallyConsistent); atomicPHI->addIncoming(old, opBB); llvm::Value *success = Builder.CreateICmpEQ(old, atomicPHI); Builder.CreateCondBr(success, contBB, opBB); |
