Switch CodeGen's "is this variable declaration a definition?" logic

over to VarDecl::isThisDeclarationADefinition(), which handles
variables declared with linkage specifications better (among other
things). CMake 2.9 (from CVS) now builds with clang++ and is somewhat
functional.

llvm-svn: 95486
This commit is contained in:
Douglas Gregor
2010-02-06 05:15:45 +00:00
parent 2c4de4c31e
commit 61f6db54e1
2 changed files with 31 additions and 14 deletions

View File

@@ -627,20 +627,7 @@ void CodeGenModule::EmitGlobal(GlobalDecl GD) {
const VarDecl *VD = cast<VarDecl>(Global);
assert(VD->isFileVarDecl() && "Cannot emit local var decl as global.");
if (getLangOptions().CPlusPlus && !VD->getInit()) {
// In C++, if this is marked "extern", defer code generation.
if (VD->getStorageClass() == VarDecl::Extern || VD->isExternC())
return;
// If this is a declaration of an explicit specialization of a static
// data member in a class template, don't emit it.
if (VD->isStaticDataMember() &&
VD->getTemplateSpecializationKind() == TSK_ExplicitSpecialization)
return;
}
// In C, if this isn't a definition, defer code generation.
if (!getLangOptions().CPlusPlus && !VD->getInit())
if (VD->isThisDeclarationADefinition() != VarDecl::Definition)
return;
}