From b977b6a59b768dd0507abd3c152b562e24b79306 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 5 Feb 2008 06:37:34 +0000 Subject: Relax an assertion, fixing PR1968 llvm-svn: 46742 --- clang/CodeGen/CodeGenModule.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'clang/CodeGen/CodeGenModule.cpp') diff --git a/clang/CodeGen/CodeGenModule.cpp b/clang/CodeGen/CodeGenModule.cpp index 382f651272f..9de5d3426f0 100644 --- a/clang/CodeGen/CodeGenModule.cpp +++ b/clang/CodeGen/CodeGenModule.cpp @@ -123,6 +123,12 @@ llvm::Constant *CodeGenModule::GetAddrOfFunctionDecl(const FunctionDecl *D, return Entry = NewFn; } +static bool IsZeroElementArray(const llvm::Type *Ty) { + if (const llvm::ArrayType *ATy = dyn_cast(Ty)) + return ATy->getNumElements() == 0; + return false; +} + llvm::Constant *CodeGenModule::GetAddrOfGlobalVar(const VarDecl *D, bool isDefinition) { assert(D->hasGlobalStorage() && "Not a global variable"); @@ -178,8 +184,13 @@ llvm::Constant *CodeGenModule::GetAddrOfGlobalVar(const VarDecl *D, // is incredibly slow! ReplaceMapValuesWith(GV, NewPtrForOldDecl); + // Verify that GV was a declaration or something like x[] which turns into + // [0 x type]. + assert((GV->isDeclaration() || + IsZeroElementArray(GV->getType()->getElementType())) && + "Shouldn't replace non-declaration"); + // Ok, delete the old global now, which is dead. - assert(GV->isDeclaration() && "Shouldn't replace non-declaration"); GV->eraseFromParent(); // Return the new global which has the right type. -- cgit v1.2.3