Pass the desired vtable linkage to GenerateVtable directly. Only call MaybeMarkVirtualImplicitMembersReferenced for non-inline functions.

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

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/CodeGen/CGVtable.h b/lib/CodeGen/CGVtable.h
index bfffb673ae..37fa1230f6 100644
--- a/lib/CodeGen/CGVtable.h
+++ b/lib/CodeGen/CGVtable.h
@@ -15,12 +15,9 @@
 #define CLANG_CODEGEN_CGVTABLE_H
 
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/GlobalVariable.h"
 #include "GlobalDecl.h"
 
-namespace llvm {
-  class GlobalVariable;
-}
-
 namespace clang {
   class CXXRecordDecl;
 
@@ -97,9 +94,11 @@ class CGVtableInfo {
   /// rtti data structure and the VTT.
   void GenerateClassData(const CXXRecordDecl *RD);
  
-  llvm::GlobalVariable *GenerateVtable(const CXXRecordDecl *LayoutClass,
-                                       const CXXRecordDecl *RD,
-                                       uint64_t Offset);
+  llvm::GlobalVariable *
+
+  GenerateVtable(llvm::GlobalVariable::LinkageTypes Linkage,
+                 const CXXRecordDecl *LayoutClass, const CXXRecordDecl *RD,
+                 uint64_t Offset);
     
 public:
   CGVtableInfo(CodeGenModule &CGM)