Also generate the rtti field for virtual bases for vtables.  Turn on
rtti so we can properly test it.  Refactor code a little.  Still a
work in progress.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@78343 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index 1f0fad6..fe52e99 100644
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -360,7 +360,10 @@
 
   llvm::Constant *GenerateRtti(const CXXRecordDecl *RD);
   void GenerateVtableForBase(const CXXRecordDecl *RD,
-                             std::vector<llvm::Constant *> &methods);
+                             const CXXRecordDecl *Class,
+                             llvm::Constant *rtti,
+                             std::vector<llvm::Constant *> &methods,
+                             bool isPrimary = false);
   llvm::Value *GenerateVtable(const CXXRecordDecl *RD);
 
   void EmitCtorPrologue(const CXXConstructorDecl *CD);