Refactor a bit and remove some FIXME audit markers, now that the code

has been audited for correctness.

llvm-svn: 78846

1 files changed, 1 insertions, 3 deletions

diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index 2a7477c4493..91a66a3253f 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -27,8 +27,7 @@ ASTRecordLayoutBuilder::ASTRecordLayoutBuilder(ASTContext &Ctx)
 
 /// LayoutVtable - Lay out the vtable and set PrimaryBase.
 void ASTRecordLayoutBuilder::LayoutVtable(const CXXRecordDecl *RD) {
-  // FIXME: audit indirect virtual bases
-  if (!RD->isPolymorphic() && !RD->getNumVBases()) {
+  if (!RD->isDynamicClass()) {
     // There is no primary base in this case.
     setPrimaryBase(0, false);
     return;
@@ -141,7 +140,6 @@ void ASTRecordLayoutBuilder::SelectPrimaryBase(const CXXRecordDecl *RD) {
 
   // If we have no virtual bases at this point, bail out as the searching below
   // is expensive.
-  // FIXME: audit indirect virtual bases
   if (RD->getNumVBases() == 0) {
     return;
   }