diff options
author | Chad Rosier <mcrosier@apple.com> | 2012-03-29 17:37:10 +0000 |
---|---|---|
committer | Chad Rosier <mcrosier@apple.com> | 2012-03-29 17:37:10 +0000 |
commit | 649b4a1a9b5e6f768ca0cb84bd97b00f51083e15 (patch) | |
tree | be93f7a52e5333506ec43793ef1efc220e652cb8 /lib/CodeGen/CGClass.cpp | |
parent | ecae5965cf0c95a357e47227eeb2ec391672840d (diff) |
Revert r153613 as it's causing large compile-time regressions on the nightly testers.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153660 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGClass.cpp')
-rw-r--r-- | lib/CodeGen/CGClass.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index 254ef8001d..b452c1b7ab 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -401,8 +401,7 @@ static void EmitBaseInitializer(CodeGenFunction &CGF, AggValueSlot::forAddr(V, Alignment, Qualifiers(), AggValueSlot::IsDestructed, AggValueSlot::DoesNotNeedGCBarriers, - AggValueSlot::IsNotAliased, - AggValueSlot::IsNotCompleteObject); + AggValueSlot::IsNotAliased); CGF.EmitAggExpr(BaseInit->getInit(), AggSlot); @@ -450,8 +449,7 @@ static void EmitAggMemberInitializer(CodeGenFunction &CGF, AggValueSlot::forLValue(LV, AggValueSlot::IsDestructed, AggValueSlot::DoesNotNeedGCBarriers, - AggValueSlot::IsNotAliased, - AggValueSlot::IsCompleteObject); + AggValueSlot::IsNotAliased); CGF.EmitAggExpr(Init, Slot); } @@ -591,8 +589,7 @@ static void EmitMemberInitializer(CodeGenFunction &CGF, // Copy the aggregate. CGF.EmitAggregateCopy(LHS.getAddress(), Src.getAddress(), FieldType, - LHS.isVolatileQualified(), - /*destIsCompleteObject*/ true); + LHS.isVolatileQualified()); return; } } @@ -1374,10 +1371,7 @@ CodeGenFunction::EmitDelegatingCXXConstructorCall(const CXXConstructorDecl *Ctor AggValueSlot::forAddr(ThisPtr, Alignment, Qualifiers(), AggValueSlot::IsDestructed, AggValueSlot::DoesNotNeedGCBarriers, - AggValueSlot::IsNotAliased, - CurGD.getCtorType() == Ctor_Complete - ? AggValueSlot::IsCompleteObject - : AggValueSlot::IsNotCompleteObject); + AggValueSlot::IsNotAliased); EmitAggExpr(Ctor->init_begin()[0]->getInit(), AggSlot); |