From 1d9804d03cf4644988696f74ab675e33ebc3dcef Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Sun, 16 Jun 2013 00:17:46 +0200 Subject: [PATCH] Use '__ModuleInfoZ' for ModuleInfos, like DMD does. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way, we stay at least compatible w.r.t. demanglers, pragma(mangle, …) tricks. Fixes DMD testcase 'mangle'. --- gen/module.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gen/module.cpp b/gen/module.cpp index f8151904..2b4de34f 100644 --- a/gen/module.cpp +++ b/gen/module.cpp @@ -327,7 +327,7 @@ llvm::GlobalVariable* Module::moduleInfoSymbol() // create name std::string MIname("_D"); MIname.append(mangle()); - MIname.append("8__ModuleZ"); + MIname.append("12__ModuleInfoZ"); if (gIR->dmodule != this) { LLType* moduleinfoTy = DtoType(moduleinfo->type); @@ -388,7 +388,7 @@ void Module::genmoduleinfo() // declare the imported module info std::string m_name("_D"); m_name.append(m->mangle()); - m_name.append("8__ModuleZ"); + m_name.append("12__ModuleInfoZ"); llvm::GlobalVariable* m_gvar = gIR->module->getGlobalVariable(m_name); if (!m_gvar) m_gvar = new llvm::GlobalVariable(*gIR->module, moduleinfoTy, false, llvm::GlobalValue::ExternalLinkage, NULL, m_name); importInits.push_back(m_gvar);