diff options
Diffstat (limited to 'lib/AST')
| -rw-r--r-- | lib/AST/DeclCXX.cpp | 4 | ||||
| -rw-r--r-- | lib/AST/RecordLayoutBuilder.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index 11c7e6dfc2..cc481be6ba 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -377,6 +377,8 @@ QualType CXXMethodDecl::getThisType(ASTContext &C) const { if (ClassTemplateDecl *TD = getParent()->getDescribedClassTemplate()) ClassTy = TD->getInjectedClassNameType(C); else + // FIXME: What is the design on getTagDeclType when it requires casting + // away const? mutable? ClassTy = C.getTagDeclType(const_cast<CXXRecordDecl*>(getParent())); ClassTy = ClassTy.getWithAdditionalQualifiers(getTypeQualifiers()); return C.getPointerType(ClassTy); @@ -652,7 +654,7 @@ CXXConstructorDecl::setBaseOrMemberInitializers( AllToInit.push_back(Member); } } - + NumInitializers = AllToInit.size(); if (NumInitializers > 0) { NumBaseOrMemberInitializers = NumInitializers; diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp index 41bd521331..901d5a5b26 100644 --- a/lib/AST/RecordLayoutBuilder.cpp +++ b/lib/AST/RecordLayoutBuilder.cpp @@ -27,7 +27,7 @@ ASTRecordLayoutBuilder::ASTRecordLayoutBuilder(ASTContext &Ctx) void ASTRecordLayoutBuilder::LayoutVtable(const CXXRecordDecl *RD) { if (RD->isPolymorphic() || RD->getNumVBases()) { - assert (RD->getNumBases() == 0 && "no polymorphic inheritance yet"); + // assert (RD->getNumBases() == 0 && "no polymorphic inheritance yet"); int AS = 0; UpdateAlignment(Ctx.Target.getPointerAlign(AS)); Size += Ctx.Target.getPointerWidth(AS); |