maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make __atomic_init() (soon to be __c11_atomic_init()) work with non-scalar types. 

llvm-svn: 154507
This commit is contained in:
David Chisnall 2012-04-11 17:24:05 +00:00
parent 885294808a
commit eb9496efc7
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clang/lib/CodeGen/CGExpr.cpp
View File

@ -2786,10 +2786,21 @@ RValue CodeGenFunction::EmitAtomicExpr(AtomicExpr *E, llvm::Value *Dest) {
if (E->getOp() == AtomicExpr::Init) {
assert(!Dest && "Init does not return a value");
Val1 = EmitScalarExpr(E->getVal1());
llvm::StoreInst *Store = Builder.CreateStore(Val1, Ptr);
Store->setAlignment(Size);
Store->setVolatile(E->isVolatile());
if (!hasAggregateLLVMType(E->getVal1()->getType())) {
llvm::StoreInst *Store =
Builder.CreateStore(EmitScalarExpr(E->getVal1()), Ptr);
Store->setAlignment(Size);
Store->setVolatile(E->isVolatile());
} else if (E->getType()->isAnyComplexType()) {
EmitComplexExprIntoAddr(E->getVal1(), Ptr, E->isVolatile());
} else {
AggValueSlot Slot = AggValueSlot::forAddr(Ptr, alignChars,
AtomicTy.getQualifiers(),
AggValueSlot::IsNotDestructed,
AggValueSlot::DoesNotNeedGCBarriers,
AggValueSlot::IsNotAliased);
EmitAggExpr(E->getVal1(), Slot);
}
return RValue::get(0);
}

13
clang/test/CodeGenCXX/atomicinit.cpp
View File

@ -10,3 +10,16 @@ void A::v(int j) { i = j; }
// Initialising atomic values should not be atomic
// CHECK-NOT: store atomic
A::A(int j) : i(j) {}
struct B {
int i;
B(int x) : i(x) {}
};
_Atomic(B) b;
// CHECK: define void @_Z11atomic_initR1Ai
void atomic_init(A& a, int i) {
// CHECK-NOT: atomic
__atomic_init(&b, B(i));
}