From 58649dc6095d47bbd0d4c56d180d084c3966d30e Mon Sep 17 00:00:00 2001 From: John McCall Date: Thu, 16 Sep 2010 03:13:23 +0000 Subject: Initialize AggValueSlot's flags along all paths, plus minor beautification. Prospective fix for broken commit in r114045. llvm-svn: 114060 --- clang/lib/CodeGen/CGExprAgg.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'clang/lib/CodeGen/CGExprAgg.cpp') diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp index d280711..bd773f2 100644 --- a/clang/lib/CodeGen/CGExprAgg.cpp +++ b/clang/lib/CodeGen/CGExprAgg.cpp @@ -39,7 +39,7 @@ class AggExprEmitter : public StmtVisitor { // If the destination slot requires garbage collection, we can't // use the real return value slot, because we have to use the GC // API. - if (Dest.isRequiresGCollection()) return ReturnValueSlot(); + if (Dest.requiresGCollection()) return ReturnValueSlot(); return ReturnValueSlot(Dest.getAddr(), Dest.isVolatile()); } @@ -177,7 +177,7 @@ bool AggExprEmitter::TypeRequiresGCollection(QualType T) { /// directly into the return value slot. If GC does interfere, a final /// move will be performed. void AggExprEmitter::EmitGCMove(const Expr *E, RValue Src) { - if (Dest.isRequiresGCollection()) { + if (Dest.requiresGCollection()) { std::pair TypeInfo = CGF.getContext().getTypeInfo(E->getType()); unsigned long size = TypeInfo.first/8; @@ -210,7 +210,7 @@ void AggExprEmitter::EmitFinalDestCopy(const Expr *E, RValue Src, bool Ignore) { Dest = CGF.CreateAggTemp(E->getType(), "agg.tmp"); } - if (Dest.isRequiresGCollection()) { + if (Dest.requiresGCollection()) { std::pair TypeInfo = CGF.getContext().getTypeInfo(E->getType()); unsigned long size = TypeInfo.first/8; -- cgit v1.1