summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGExprCXX.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2011-06-16 04:16:24 +0000
committerJohn McCall <rjmccall@apple.com>2011-06-16 04:16:24 +0000
commit1553b190672de2c270acd981ce760539ae172bd5 (patch)
treed296495fd37dd8c9b3db61f668bf81467e3cddff /clang/lib/CodeGen/CGExprCXX.cpp
parent30f3210242c3291a4bc00ff22b46f58721e25923 (diff)
downloadbcm5719-llvm-1553b190672de2c270acd981ce760539ae172bd5.tar.gz
bcm5719-llvm-1553b190672de2c270acd981ce760539ae172bd5.zip
Restore correct use of GC barriers.
llvm-svn: 133144
Diffstat (limited to 'clang/lib/CodeGen/CGExprCXX.cpp')
-rw-r--r--clang/lib/CodeGen/CGExprCXX.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGExprCXX.cpp b/clang/lib/CodeGen/CGExprCXX.cpp
index 434ca1b69fb..2e68f8f9606 100644
--- a/clang/lib/CodeGen/CGExprCXX.cpp
+++ b/clang/lib/CodeGen/CGExprCXX.cpp
@@ -707,9 +707,9 @@ static void StoreAnyExprIntoOneUnit(CodeGenFunction &CGF, const CXXNewExpr *E,
unsigned Alignment =
CGF.getContext().getTypeAlignInChars(AllocType).getQuantity();
- if (!CGF.hasAggregateLLVMType(AllocType))
- CGF.EmitScalarInit(Init, 0, NewPtr, false, AllocType.isVolatileQualified(),
- Alignment, AllocType);
+ if (!CGF.hasAggregateLLVMType(AllocType))
+ CGF.EmitScalarInit(Init, 0, CGF.MakeAddrLValue(NewPtr, AllocType, Alignment),
+ false);
else if (AllocType->isAnyComplexType())
CGF.EmitComplexExprIntoAddr(Init, NewPtr,
AllocType.isVolatileQualified());
OpenPOWER on IntegriCloud