diff options
author | Douglas Gregor <dgregor@apple.com> | 2010-02-06 05:15:45 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2010-02-06 05:15:45 +0000 |
commit | 61f6db54e152f1d42b37789bf74a9c13d2aa40a5 (patch) | |
tree | 95cfd629322c9f3e2723c9cc2bbb65df1fee8d06 /clang/lib/CodeGen/CodeGenModule.cpp | |
parent | 2c4de4c31eb1069d76314881d1fb79bdfe98c953 (diff) | |
download | bcm5719-llvm-61f6db54e152f1d42b37789bf74a9c13d2aa40a5.tar.gz bcm5719-llvm-61f6db54e152f1d42b37789bf74a9c13d2aa40a5.zip |
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
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
-rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index fc5989fa9a4..644c5d0bf8c 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -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; } |