6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-15 23:31:37 +00:00
Code Issues Projects Releases Wiki Activity

Revert r133516 "Remove some unnecessary uses of c_str()."

Browse Source 
This was causing compile-time failures for some of the Objc and Obj-C++
benchmarks.  The specific errors were of the form: "ld: duplicate symbol …"
rdar://9660124

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133955 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chad Rosier 2011-06-27 22:54:29 +00:00
parent 016c5829a5
commit 26f448079f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/lto/LTOModule.cpp
View File

@ -208,7 +208,7 @@ void LTOModule::addObjCClass(GlobalVariable *clgv) {
if (objcClassNameFromExpression(c->getOperand(1), superclassName)) { if (objcClassNameFromExpression(c->getOperand(1), superclassName)) {
NameAndAttributes info; NameAndAttributes info;
StringMap<NameAndAttributes>::value_type &entry = StringMap<NameAndAttributes>::value_type &entry =
_undefines.GetOrCreateValue(superclassName); _undefines.GetOrCreateValue(superclassName.c_str());
if (!entry.getValue().name) { if (!entry.getValue().name) {
const char *symbolName = entry.getKey().data(); const char *symbolName = entry.getKey().data();
info.name = symbolName; info.name = symbolName;
@ -220,7 +220,7 @@ void LTOModule::addObjCClass(GlobalVariable *clgv) {
std::string className; std::string className;
if (objcClassNameFromExpression(c->getOperand(2), className)) { if (objcClassNameFromExpression(c->getOperand(2), className)) {
StringSet::value_type &entry = StringSet::value_type &entry =
_defines.GetOrCreateValue(className); _defines.GetOrCreateValue(className.c_str());
entry.setValue(1); entry.setValue(1);
NameAndAttributes info; NameAndAttributes info;
info.name = entry.getKey().data(); info.name = entry.getKey().data();
@ -243,7 +243,7 @@ void LTOModule::addObjCCategory(GlobalVariable *clgv) {
NameAndAttributes info; NameAndAttributes info;
StringMap<NameAndAttributes>::value_type &entry = StringMap<NameAndAttributes>::value_type &entry =
_undefines.GetOrCreateValue(targetclassName); _undefines.GetOrCreateValue(targetclassName.c_str());
if (entry.getValue().name) if (entry.getValue().name)
return; return;
@ -264,7 +264,7 @@ void LTOModule::addObjCClassRef(GlobalVariable *clgv) {
NameAndAttributes info; NameAndAttributes info;
StringMap<NameAndAttributes>::value_type &entry = StringMap<NameAndAttributes>::value_type &entry =
_undefines.GetOrCreateValue(targetclassName); _undefines.GetOrCreateValue(targetclassName.c_str());
if (entry.getValue().name) if (entry.getValue().name)
return; return;
@ -375,7 +375,7 @@ void LTOModule::addDefinedSymbol(GlobalValue *def, Mangler &mangler,
// add to table of symbols // add to table of symbols
NameAndAttributes info; NameAndAttributes info;
StringSet::value_type &entry = _defines.GetOrCreateValue(Buffer); StringSet::value_type &entry = _defines.GetOrCreateValue(Buffer.c_str());
entry.setValue(1); entry.setValue(1);
StringRef Name = entry.getKey(); StringRef Name = entry.getKey();
@ -436,7 +436,7 @@ void LTOModule::addPotentialUndefinedSymbol(GlobalValue *decl,
mangler.getNameWithPrefix(name, decl, false); mangler.getNameWithPrefix(name, decl, false);
StringMap<NameAndAttributes>::value_type &entry = StringMap<NameAndAttributes>::value_type &entry =
_undefines.GetOrCreateValue(name); _undefines.GetOrCreateValue(name.c_str());
// we already have the symbol // we already have the symbol
if (entry.getValue().name) if (entry.getValue().name)