From: Mike Stump Date: Thu, 24 Dec 2009 01:10:27 +0000 (+0000) Subject: Fix recent regression caught by g++.old-deja/g++.mike/eh19.C. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8f76f557c4839c8e5f142ac4681ad010e07c855;p=clang Fix recent regression caught by g++.old-deja/g++.mike/eh19.C. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@92109 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp index 2274e6211d..e241089845 100644 --- a/lib/CodeGen/CGRTTI.cpp +++ b/lib/CodeGen/CGRTTI.cpp @@ -607,6 +607,26 @@ static llvm::GlobalVariable::LinkageTypes getTypeInfoLinkage(QualType Ty) { return llvm::GlobalValue::WeakODRLinkage; } + if (const FunctionType *FT = dyn_cast(Ty)) { + if (getTypeInfoLinkage(FT->getResultType()) + == llvm::GlobalValue::InternalLinkage) + return llvm::GlobalValue::InternalLinkage; + + if (const FunctionProtoType *FPT = dyn_cast(Ty)) { + for (unsigned i = 0; i < FPT->getNumArgs(); ++i) + if (getTypeInfoLinkage(FPT->getArgType(i)) + == llvm::GlobalValue::InternalLinkage) + return llvm::GlobalValue::InternalLinkage; + for (unsigned i = 0; i < FPT->getNumExceptions(); ++i) + if (getTypeInfoLinkage(FPT->getExceptionType(i)) + == llvm::GlobalValue::InternalLinkage) + return llvm::GlobalValue::InternalLinkage; + } + + return llvm::GlobalValue::WeakODRLinkage; + } + + // FIXME: We need to add code to handle all types. assert(false && "Unhandled type!"); return llvm::GlobalValue::WeakODRLinkage; }