diff options
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 12 | ||||
| -rw-r--r-- | clang/test/CodeGen/sanitize-atomic-int-overflow.c | 33 |
2 files changed, 39 insertions, 6 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index bdc07f17769..e831c823da7 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -2555,14 +2555,14 @@ ScalarExprEmitter::EmitScalarPrePostIncDec(const UnaryOperator *E, LValue LV, } if (atomicPHI) { - llvm::BasicBlock *opBB = Builder.GetInsertBlock(); + llvm::BasicBlock *curBlock = Builder.GetInsertBlock(); llvm::BasicBlock *contBB = CGF.createBasicBlock("atomic_cont", CGF.CurFn); auto Pair = CGF.EmitAtomicCompareExchange( LV, RValue::get(atomicPHI), RValue::get(value), E->getExprLoc()); llvm::Value *old = CGF.EmitToMemory(Pair.first.getScalarVal(), type); llvm::Value *success = Pair.second; - atomicPHI->addIncoming(old, opBB); - Builder.CreateCondBr(success, contBB, opBB); + atomicPHI->addIncoming(old, curBlock); + Builder.CreateCondBr(success, contBB, atomicPHI->getParent()); Builder.SetInsertPoint(contBB); return isPre ? value : input; } @@ -2909,14 +2909,14 @@ LValue ScalarExprEmitter::EmitCompoundAssignLValue( Loc, ScalarConversionOpts(CGF.SanOpts)); if (atomicPHI) { - llvm::BasicBlock *opBB = Builder.GetInsertBlock(); + llvm::BasicBlock *curBlock = Builder.GetInsertBlock(); llvm::BasicBlock *contBB = CGF.createBasicBlock("atomic_cont", CGF.CurFn); auto Pair = CGF.EmitAtomicCompareExchange( LHSLV, RValue::get(atomicPHI), RValue::get(Result), E->getExprLoc()); llvm::Value *old = CGF.EmitToMemory(Pair.first.getScalarVal(), LHSTy); llvm::Value *success = Pair.second; - atomicPHI->addIncoming(old, opBB); - Builder.CreateCondBr(success, contBB, opBB); + atomicPHI->addIncoming(old, curBlock); + Builder.CreateCondBr(success, contBB, atomicPHI->getParent()); Builder.SetInsertPoint(contBB); return LHSLV; } diff --git a/clang/test/CodeGen/sanitize-atomic-int-overflow.c b/clang/test/CodeGen/sanitize-atomic-int-overflow.c new file mode 100644 index 00000000000..a1064f47c34 --- /dev/null +++ b/clang/test/CodeGen/sanitize-atomic-int-overflow.c @@ -0,0 +1,33 @@ +// RUN: %clang_cc1 -triple x86_64-apple-macosx10.14.0 -fsanitize=unsigned-integer-overflow %s -emit-llvm -o - | FileCheck %s + +_Atomic(unsigned) atomic; + +// CHECK-LABEL: define void @cmpd_assign +void cmpd_assign() { + // CHECK: br label %[[LOOP_START:.*]] + + // CHECK: [[LOOP_START]]: + // CHECK-NEXT: phi i32 {{.*}}, [ {{.*}}, %[[INCOMING_BLOCK:.*]] ] + + // CHECK: [[INCOMING_BLOCK]]: + // CHECK-NEXT: cmpxchg + // CHECK-NEXT: extractvalue + // CHECK-NEXT: extractvalue + // CHECK-NEXT: br i1 %8, label %{{.*}}, label %[[LOOP_START]] + atomic += 1; +} + +// CHECK-LABEL: define void @inc +void inc() { + // CHECK: br label %[[LOOP_START:.*]] + + // CHECK: [[LOOP_START]]: + // CHECK-NEXT: phi i32 {{.*}}, [ {{.*}}, %[[INCOMING_BLOCK:.*]] ] + + // CHECK: [[INCOMING_BLOCK]]: + // CHECK-NEXT: cmpxchg + // CHECK-NEXT: extractvalue + // CHECK-NEXT: extractvalue + // CHECK-NEXT: br i1 %8, label %{{.*}}, label %[[LOOP_START]] + atomic++; +} |
