intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-31 16:29:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix delegating constructors stylistic issues.

Browse Source 
Material bugfixes to come this afternoon.

llvm-svn: 130782
This commit is contained in:
Alexis Hunt
2011-05-03 20:19:28 +00:00
parent a74926b518
commit 271c36811d
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/CodeGen/CGClass.cpp
View File

@@ -726,12 +726,13 @@ void CodeGenFunction::EmitCtorPrologue(const CXXConstructorDecl *CD,
B != E; ++B) {
CXXCtorInitializer *Member = (*B);
if (Member->isBaseInitializer())
if (Member->isBaseInitializer()) {
EmitBaseInitializer(*this, ClassDecl, Member, CtorType);
else if (Member->isAnyMemberInitializer())
} else {
assert(Member->isAnyMemberInitializer() &&
"Delegating initializer on non-delegating constructor");
MemberInitializers.push_back(Member);
else
llvm_unreachable("Delegating initializer on non-delegating constructor");
}
}
InitializeVTablePointers(ClassDecl);

24
clang/lib/CodeGen/CGExprCXX.cpp
View File

@@ -404,17 +404,25 @@ CodeGenFunction::EmitCXXConstructExpr(const CXXConstructExpr *E,
}
else {
CXXCtorType Type;
CXXConstructExpr::ConstructionKind K = E->getConstructionKind();
if (K == CXXConstructExpr::CK_Delegating) {
bool ForVirtualBase = false;
switch (E->getConstructionKind()) {
case CXXConstructExpr::CK_Delegating:
// We should be emitting a constructor; GlobalDecl will assert this
Type = CurGD.getCtorType();
} else {
Type = (E->getConstructionKind() == CXXConstructExpr::CK_Complete)
? Ctor_Complete : Ctor_Base;
}
break;
bool ForVirtualBase =
E->getConstructionKind() == CXXConstructExpr::CK_VirtualBase;
case CXXConstructExpr::CK_Complete:
Type = Ctor_Complete;
break;
case CXXConstructExpr::CK_VirtualBase:
ForVirtualBase = true;
// fall-through
case CXXConstructExpr::CK_NonVirtualBase:
Type = Ctor_Base;
}
// Call the constructor.
EmitCXXConstructorCall(CD, Type, ForVirtualBase, Dest.getAddr(),

3
clang/lib/Sema/SemaInit.cpp
View File

@@ -4060,8 +4060,7 @@ InitializationSequence::Perform(Sema &S,
ConstructKind = Entity.getBaseSpecifier()->isVirtual() ?
CXXConstructExpr::CK_VirtualBase :
CXXConstructExpr::CK_NonVirtualBase;
}
if (Entity.getKind() == InitializedEntity::EK_Delegating) {
} else if (Entity.getKind() == InitializedEntity::EK_Delegating) {
ConstructKind = CXXConstructExpr::CK_Delegating;
}