From: Eli Friedman <eli.friedman@gmail.com>
Date: Sat, 28 Nov 2009 03:35:45 +0000 (+0000)
Subject: Tests now pass with the assertion.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa3e82ba04d175c89d622440def682f651542061;p=clang

Tests now pass with the assertion.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90026 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp
index 0ee1469e09..b3c2b986d1 100644
--- a/lib/CodeGen/CGClass.cpp
+++ b/lib/CodeGen/CGClass.cpp
@@ -31,9 +31,6 @@ 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 =