From 26f448079f2dc070da637e346a0635ad3127df7d Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Mon, 27 Jun 2011 22:54:29 +0000 Subject: [PATCH] =?utf8?q?Revert=20r133516=20"Remove=20some=20unnecessary?= =?utf8?q?=20uses=20of=20c=5Fstr()."=20This=20was=20causing=20compile-time?= =?utf8?q?=20failures=20for=20some=20of=20the=20Objc=20and=20Obj-C++=20ben?= =?utf8?q?chmarks.=20=20The=20specific=20errors=20were=20of=20the=20form:?= =?utf8?q?=20"ld:=20duplicate=20symbol=20=E2=80=A6"=20rdar://9660124?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133955 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/lto/LTOModule.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/lto/LTOModule.cpp b/tools/lto/LTOModule.cpp index c899555517f..8f2b1f48406 100644 --- a/tools/lto/LTOModule.cpp +++ b/tools/lto/LTOModule.cpp @@ -208,7 +208,7 @@ void LTOModule::addObjCClass(GlobalVariable *clgv) { if (objcClassNameFromExpression(c->getOperand(1), superclassName)) { NameAndAttributes info; StringMap::value_type &entry = - _undefines.GetOrCreateValue(superclassName); + _undefines.GetOrCreateValue(superclassName.c_str()); if (!entry.getValue().name) { const char *symbolName = entry.getKey().data(); info.name = symbolName; @@ -220,7 +220,7 @@ void LTOModule::addObjCClass(GlobalVariable *clgv) { std::string className; if (objcClassNameFromExpression(c->getOperand(2), className)) { StringSet::value_type &entry = - _defines.GetOrCreateValue(className); + _defines.GetOrCreateValue(className.c_str()); entry.setValue(1); NameAndAttributes info; info.name = entry.getKey().data(); @@ -243,7 +243,7 @@ void LTOModule::addObjCCategory(GlobalVariable *clgv) { NameAndAttributes info; StringMap::value_type &entry = - _undefines.GetOrCreateValue(targetclassName); + _undefines.GetOrCreateValue(targetclassName.c_str()); if (entry.getValue().name) return; @@ -264,7 +264,7 @@ void LTOModule::addObjCClassRef(GlobalVariable *clgv) { NameAndAttributes info; StringMap::value_type &entry = - _undefines.GetOrCreateValue(targetclassName); + _undefines.GetOrCreateValue(targetclassName.c_str()); if (entry.getValue().name) return; @@ -375,7 +375,7 @@ void LTOModule::addDefinedSymbol(GlobalValue *def, Mangler &mangler, // add to table of symbols NameAndAttributes info; - StringSet::value_type &entry = _defines.GetOrCreateValue(Buffer); + StringSet::value_type &entry = _defines.GetOrCreateValue(Buffer.c_str()); entry.setValue(1); StringRef Name = entry.getKey(); @@ -436,7 +436,7 @@ void LTOModule::addPotentialUndefinedSymbol(GlobalValue *decl, mangler.getNameWithPrefix(name, decl, false); StringMap::value_type &entry = - _undefines.GetOrCreateValue(name); + _undefines.GetOrCreateValue(name.c_str()); // we already have the symbol if (entry.getValue().name) -- 2.34.1