From 5d70cfddc8a8a450d1425e190f10512a51352e5d Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Wed, 11 Apr 2012 17:24:05 +0000 Subject: Make __atomic_init() (soon to be __c11_atomic_init()) work with non-scalar types. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154507 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGExpr.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'lib/CodeGen/CGExpr.cpp') diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index dbf41f38b8..260fa5b529 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -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); } -- cgit v1.2.3-70-g09d2