diff options
| -rw-r--r-- | lib/CodeGen/CGRTTI.cpp | 8 | ||||
| -rw-r--r-- | test/CodeGenCXX/rtti-linkage.cpp | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp index b00b9155e8..db6c5075ed 100644 --- a/lib/CodeGen/CGRTTI.cpp +++ b/lib/CodeGen/CGRTTI.cpp @@ -372,6 +372,14 @@ static llvm::GlobalVariable::LinkageTypes getTypeInfoLinkage(QualType Ty) { return llvm::GlobalValue::WeakODRLinkage; } + // If the key function is defined, but inlined, then the RTTI descriptor is + // emitted with weak_odr linkage. + const FunctionDecl* KeyFunctionDefinition; + KeyFunction->getBody(KeyFunctionDefinition); + + if (KeyFunctionDefinition->isInlined()) + return llvm::GlobalValue::WeakODRLinkage; + // Otherwise, the RTTI descriptor is emitted with external linkage. return llvm::GlobalValue::ExternalLinkage; } diff --git a/test/CodeGenCXX/rtti-linkage.cpp b/test/CodeGenCXX/rtti-linkage.cpp index 63c19aa250..799c1d41c7 100644 --- a/test/CodeGenCXX/rtti-linkage.cpp +++ b/test/CodeGenCXX/rtti-linkage.cpp @@ -24,6 +24,8 @@ // CHECK: _ZTSM1AP1C = internal constant // CHECK: _ZTIM1AP1C = internal constant +// CHECK: _ZTS1F = weak_odr constant + // CHECK: _ZTSN12_GLOBAL__N_11DE = internal constant // CHECK: _ZTIN12_GLOBAL__N_11DE = internal constant // CHECK: _ZTSPN12_GLOBAL__N_11DE = internal constant @@ -76,6 +78,13 @@ namespace { }; +// F has a key function defined in the translation unit, but it is inline so the RTTI +// data should be emitted with weak_odr linkage. +struct F { + virtual void f(); +}; + +inline void F::f() { } const D getD(); const std::type_info &t2() { |