From 08899ff85dde961d36bf0c94d07ee3418905d536 Mon Sep 17 00:00:00 2001 From: Steve Naroff Date: Tue, 15 Apr 2008 22:42:06 +0000 Subject: Remove FileVarDecl and BlockVarDecl. They are replaced by VarDecl::isBlockVarDecl() and VarDecl::isFileVarDecl(). This is a fairly mechanical/large change. As a result, I avoided making any changes/simplifications that weren't directly related. I did break two Analysis tests. I also have a couple FIXME's in UninitializedValues.cpp. Ted, can you take a look? If the bug isn't obvious, I am happy to dig in and fix it (since I broke it). llvm-svn: 49748 --- clang/lib/CodeGen/CodeGenModule.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenModule.cpp') diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 83f661f012aa..cb34fb5a7310 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -288,7 +288,7 @@ llvm::Constant *CodeGenModule::EmitGlobalInit(const Expr *Expr) { return EmitConstantExpr(Expr); } -void CodeGenModule::EmitGlobalVar(const FileVarDecl *D) { +void CodeGenModule::EmitGlobalVar(const VarDecl *D) { // If this is just a forward declaration of the variable, don't emit it now, // allow it to be emitted lazily on its first use. if (D->getStorageClass() == VarDecl::Extern && D->getInit() == 0) @@ -352,9 +352,10 @@ void CodeGenModule::EmitGlobalVar(const FileVarDecl *D) { /// EmitGlobalVarDeclarator - Emit all the global vars attached to the specified /// declarator chain. -void CodeGenModule::EmitGlobalVarDeclarator(const FileVarDecl *D) { - for (; D; D = cast_or_null(D->getNextDeclarator())) - EmitGlobalVar(D); +void CodeGenModule::EmitGlobalVarDeclarator(const VarDecl *D) { + for (; D; D = cast_or_null(D->getNextDeclarator())) + if (D->isFileVarDecl()) + EmitGlobalVar(D); } void CodeGenModule::UpdateCompletedType(const TagDecl *TD) { -- cgit v1.2.3