}
llvm::GlobalVariable *
-CGVtableInfo::GenerateVtable(const CXXRecordDecl *LayoutClass,
+CGVtableInfo::GenerateVtable(llvm::GlobalVariable::LinkageTypes Linkage,
+ const CXXRecordDecl *LayoutClass,
const CXXRecordDecl *RD, uint64_t Offset) {
llvm::SmallString<256> OutName;
if (LayoutClass != RD)
if (AddressPoint == 0)
AddressPoint = 1;
} else {
- bool CreateDefinition = true;
- if (LayoutClass != RD)
- CreateDefinition = true;
- else {
- const ASTRecordLayout &Layout =
- CGM.getContext().getASTRecordLayout(LayoutClass);
-
- if (const CXXMethodDecl *KeyFunction = Layout.getKeyFunction()) {
- if (!KeyFunction->getBody()) {
- // If there is a KeyFunction, and it isn't defined, just build a
- // reference to the vtable.
- CreateDefinition = false;
- }
- }
- }
+ bool CreateDefinition = Linkage != llvm::GlobalVariable::ExternalLinkage;
VtableBuilder b(RD, LayoutClass, Offset, CGM, CreateDefinition);
}
void CGVtableInfo::GenerateClassData(const CXXRecordDecl *RD) {
- Vtables[RD] = GenerateVtable(RD, RD, 0);
+ Vtables[RD] = GenerateVtable(llvm::GlobalValue::WeakODRLinkage, RD, RD, 0);
CGM.GenerateRTTI(RD);
CGM.GenerateVTT(RD);
}
llvm::GlobalVariable *Vtable = Vtables[RD];
if (!Vtable)
- Vtable = GenerateVtable(RD, RD, 0);
+ Vtable = GenerateVtable(llvm::GlobalValue::ExternalLinkage, RD, RD, 0);
return Vtable;
}
llvm::GlobalVariable *
CGVtableInfo::getCtorVtable(const CXXRecordDecl *LayoutClass,
const CXXRecordDecl *RD, uint64_t Offset) {
- return GenerateVtable(LayoutClass, RD, Offset);
+ return GenerateVtable(llvm::GlobalValue::InternalLinkage,
+ LayoutClass, RD, Offset);
}
void CGVtableInfo::MaybeEmitVtable(GlobalDecl GD) {
#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;
/// 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)
if (Method->isVirtual() && !Method->isPure())
MarkDeclarationReferenced(Method->getLocation(), Method);
- MaybeMarkVirtualImplicitMembersReferenced(Method->getLocation(), Method);
+ if (!Method->isInlined())
+ MaybeMarkVirtualImplicitMembersReferenced(Method->getLocation(),
+ Method);
}
assert(FD == getCurFunctionDecl() && "Function parsing confused");
} else if (ObjCMethodDecl *MD = dyn_cast_or_null<ObjCMethodDecl>(dcl)) {