From 9a925861144fba3497f4b6142cdaa70807e3f1e3 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 19 Feb 2014 12:26:01 +0000 Subject: Revert r201622 and r201608. This causes the LLVMgold plugin to segfault. More information on the replies to r201608. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201669 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/LTO/LTOCodeGenerator.cpp | 2 +- lib/LTO/LTOModule.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/LTO') diff --git a/lib/LTO/LTOCodeGenerator.cpp b/lib/LTO/LTOCodeGenerator.cpp index 01c8d405b4..073947055a 100644 --- a/lib/LTO/LTOCodeGenerator.cpp +++ b/lib/LTO/LTOCodeGenerator.cpp @@ -336,7 +336,7 @@ applyRestriction(GlobalValue &GV, SmallPtrSet &AsmUsed, Mangler &Mangler) { SmallString<64> Buffer; - TargetMach->getTargetLowering()->getNameWithPrefix(Buffer, &GV, Mangler); + Mangler.getNameWithPrefix(Buffer, &GV); if (GV.isDeclaration()) return; diff --git a/lib/LTO/LTOModule.cpp b/lib/LTO/LTOModule.cpp index a70c6e2c0a..909b92e888 100644 --- a/lib/LTO/LTOModule.cpp +++ b/lib/LTO/LTOModule.cpp @@ -381,7 +381,7 @@ void LTOModule::addDefinedSymbol(const GlobalValue *def, bool isFunction) { // string is owned by _defines SmallString<64> Buffer; - _target->getTargetLowering()->getNameWithPrefix(Buffer, def, _mangler); + _mangler.getNameWithPrefix(Buffer, def); // set alignment part log2() can have rounding errors uint32_t align = def->getAlignment(); @@ -517,7 +517,7 @@ LTOModule::addPotentialUndefinedSymbol(const GlobalValue *decl, bool isFunc) { return; SmallString<64> name; - _target->getTargetLowering()->getNameWithPrefix(name, decl, _mangler); + _mangler.getNameWithPrefix(name, decl); StringMap::value_type &entry = _undefines.GetOrCreateValue(name); -- cgit v1.2.3