From 5e1e1f95c98b1add70c238093bbd5dc8d4f9c4e9 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Thu, 19 Mar 2009 08:27:24 +0000 Subject: IRgen support for alias of global variable. - PR3818. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67297 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenModule.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'lib/CodeGen/CodeGenModule.cpp') diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index aed067617e..cc460c5959 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -369,7 +369,7 @@ void CodeGenModule::SetFunctionAttributes(const FunctionDecl *FD, void CodeGenModule::EmitAliases() { for (unsigned i = 0, e = Aliases.size(); i != e; ++i) { - const FunctionDecl *D = Aliases[i]; + const ValueDecl *D = Aliases[i]; const AliasAttr *AA = D->getAttr(); // This is something of a hack, if the FunctionDecl got overridden @@ -380,7 +380,7 @@ void CodeGenModule::EmitAliases() { continue; const std::string& aliaseeName = AA->getAliasee(); - llvm::Function *aliasee = getModule().getFunction(aliaseeName); + llvm::GlobalValue *aliasee = getModule().getNamedValue(aliaseeName); if (!aliasee) { // FIXME: This isn't unsupported, this is just an error, which // sema should catch, but... @@ -539,16 +539,14 @@ bool CodeGenModule::MayDeferGeneration(const ValueDecl *Global) { } void CodeGenModule::EmitGlobal(const ValueDecl *Global) { - if (const FunctionDecl *FD = dyn_cast(Global)) { - // Aliases are deferred until code for everything else has been - // emitted. - if (FD->getAttr()) { - assert(!FD->isThisDeclarationADefinition() && - "Function alias cannot have a definition!"); - Aliases.push_back(FD); - return; - } + // Aliases are deferred until code for everything else has been + // emitted. + if (Global->getAttr()) { + Aliases.push_back(Global); + return; + } + if (const FunctionDecl *FD = dyn_cast(Global)) { // Forward declarations are emitted lazily on first use. if (!FD->isThisDeclarationADefinition()) return; -- cgit v1.2.3-18-g5258