From b3d5a323a5ca92ea73443499cee2f15db1ff0fb3 Mon Sep 17 00:00:00 2001 From: Roman Divacky Date: Wed, 18 Nov 2009 14:59:57 +0000 Subject: Update clang to r89205. --- lib/CodeGen/CGCXXClass.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/CodeGen/CGCXXClass.cpp') diff --git a/lib/CodeGen/CGCXXClass.cpp b/lib/CodeGen/CGCXXClass.cpp index 56a28fc9a007..533aabc8616e 100644 --- a/lib/CodeGen/CGCXXClass.cpp +++ b/lib/CodeGen/CGCXXClass.cpp @@ -31,6 +31,9 @@ ComputeNonVirtualBaseClassOffset(ASTContext &Context, CXXBasePaths &Paths, const ASTRecordLayout &Layout = Context.getASTRecordLayout(Element.Class); const CXXBaseSpecifier *BS = Element.Base; + // FIXME: enable test3 from virt.cc to not abort. + if (BS->isVirtual()) + return 0; assert(!BS->isVirtual() && "Should not see virtual bases here!"); const CXXRecordDecl *Base = -- cgit v1.3