[llvm-commits] [llvm] r75638 - in /llvm/trunk: lib/CodeGen/AsmPrinter/AsmPrinter.cpp lib/CodeGen/ELFWriter.cpp lib/CodeGen/MachOCodeEmitter.cpp lib/CodeGen/MachOWriter.cpp lib/Target/CBackend/CBackend.cpp lib/Target/DarwinTargetAsmInfo.cpp tools/bugpoint/Miscompilation.cpp tools/lto/LTOCodeGenerator.cpp tools/lto/LTOModule.cpp
Daniel Dunbar
daniel at zuster.org
Tue Jul 14 09:25:12 PDT 2009
Author: ddunbar
Date: Tue Jul 14 11:25:11 2009
New Revision: 75638
URL: http://llvm.org/viewvc/llvm-project?rev=75638&view=rev
Log:
Revert r7561{9,8,7,6}, which depend on r75610.
--- Reverse-merging r75619 into '.':
U lib/Target/DarwinTargetAsmInfo.cpp
U lib/CodeGen/AsmPrinter/AsmPrinter.cpp
--- Reverse-merging r75618 into '.':
U lib/CodeGen/ELFWriter.cpp
U lib/CodeGen/MachOCodeEmitter.cpp
U lib/CodeGen/MachOWriter.cpp
--- Reverse-merging r75617 into '.':
U lib/Target/CBackend/CBackend.cpp
--- Reverse-merging r75616 into '.':
U tools/bugpoint/Miscompilation.cpp
U tools/lto/LTOCodeGenerator.cpp
U tools/lto/LTOModule.cpp
Modified:
llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
llvm/trunk/lib/CodeGen/ELFWriter.cpp
llvm/trunk/lib/CodeGen/MachOCodeEmitter.cpp
llvm/trunk/lib/CodeGen/MachOWriter.cpp
llvm/trunk/lib/Target/CBackend/CBackend.cpp
llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
llvm/trunk/tools/bugpoint/Miscompilation.cpp
llvm/trunk/tools/lto/LTOCodeGenerator.cpp
llvm/trunk/tools/lto/LTOModule.cpp
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=75638&r1=75637&r2=75638&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Tue Jul 14 11:25:11 2009
@@ -210,13 +210,13 @@
for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
I != E; ++I) {
if (I->hasExternalWeakLinkage())
- O << TAI->getWeakRefDirective() << Mang->getMangledName(I) << '\n';
+ O << TAI->getWeakRefDirective() << Mang->getValueName(I) << '\n';
}
for (Module::const_iterator I = M.begin(), E = M.end();
I != E; ++I) {
if (I->hasExternalWeakLinkage())
- O << TAI->getWeakRefDirective() << Mang->getMangledName(I) << '\n';
+ O << TAI->getWeakRefDirective() << Mang->getValueName(I) << '\n';
}
}
@@ -227,10 +227,11 @@
O << '\n';
for (Module::const_alias_iterator I = M.alias_begin(), E = M.alias_end();
I != E; ++I) {
- std::string Name = Mang->getMangledName(I);
+ std::string Name = Mang->getValueName(I);
+ std::string Target;
const GlobalValue *GV = cast<GlobalValue>(I->getAliasedGlobal());
- std::string Target = Mang->getMangledName(GV);
+ Target = Mang->getValueName(GV);
if (I->hasExternalLinkage() || !TAI->getWeakRefDirective())
O << "\t.globl\t" << Name << '\n';
@@ -269,16 +270,15 @@
assert(MF && "No machine function?");
Name = MF->getFunction()->getName();
if (Name.empty())
- Name = Mang->getMangledName(MF->getFunction());
+ Name = Mang->getValueName(MF->getFunction());
- // FIXME: THIS SEEMS REALLY WRONG, it will get two prefixes.
Name = Mang->makeNameProper(TAI->getEHGlobalPrefix() + Name + ".eh");
return Name;
}
void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
// What's my mangled name?
- CurrentFnName = Mang->getMangledName(MF.getFunction());
+ CurrentFnName = Mang->getValueName(MF.getFunction());
IncrementFunctionNumber();
}
@@ -576,11 +576,11 @@
std::string &LinkName) const {
if (isa<Function>(GV)) {
LinkName += TAI->getFunctionAddrPrefix();
- LinkName += Mang->getMangledName(GV);
+ LinkName += Mang->getValueName(GV);
LinkName += TAI->getFunctionAddrSuffix();
} else {
LinkName += TAI->getGlobalVarAddrPrefix();
- LinkName += Mang->getMangledName(GV);
+ LinkName += Mang->getValueName(GV);
LinkName += TAI->getGlobalVarAddrSuffix();
}
@@ -858,11 +858,11 @@
// FunctionAddrPrefix/Suffix (these all default to "" )
if (isa<Function>(GV)) {
O << TAI->getFunctionAddrPrefix()
- << Mang->getMangledName(GV)
+ << Mang->getValueName(GV)
<< TAI->getFunctionAddrSuffix();
} else {
O << TAI->getGlobalVarAddrPrefix()
- << Mang->getMangledName(GV)
+ << Mang->getValueName(GV)
<< TAI->getGlobalVarAddrSuffix();
}
} else if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CV)) {
Modified: llvm/trunk/lib/CodeGen/ELFWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ELFWriter.cpp?rev=75638&r1=75637&r2=75638&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/ELFWriter.cpp (original)
+++ llvm/trunk/lib/CodeGen/ELFWriter.cpp Tue Jul 14 11:25:11 2009
@@ -601,7 +601,7 @@
// Use the name mangler to uniquify the LLVM symbol.
std::string Name;
- if (I->GV) Name.append(Mang->getMangledName(I->GV));
+ if (I->GV) Name.append(Mang->getValueName(I->GV));
if (Name.empty()) {
I->NameIdx = 0;
Modified: llvm/trunk/lib/CodeGen/MachOCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachOCodeEmitter.cpp?rev=75638&r1=75637&r2=75638&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachOCodeEmitter.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachOCodeEmitter.cpp Tue Jul 14 11:25:11 2009
@@ -60,7 +60,7 @@
// Create symbol for function entry
const GlobalValue *FuncV = MF.getFunction();
- MachOSym FnSym(FuncV, MOW.Mang->getMangledName(FuncV), MOS->Index, TAI);
+ MachOSym FnSym(FuncV, MOW.Mang->getValueName(FuncV), MOS->Index, TAI);
FnSym.n_value = getCurrentPCOffset();
// add it to the symtab.
Modified: llvm/trunk/lib/CodeGen/MachOWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachOWriter.cpp?rev=75638&r1=75637&r2=75638&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachOWriter.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachOWriter.cpp Tue Jul 14 11:25:11 2009
@@ -221,7 +221,7 @@
}
// Globals without external linkage apparently do not go in the symbol table.
if (!GV->hasLocalLinkage()) {
- MachOSym Sym(GV, Mang->getMangledName(GV), Sec->Index, TAI);
+ MachOSym Sym(GV, Mang->getValueName(GV), Sec->Index, TAI);
Sym.n_value = Sec->size();
SymbolTable.push_back(Sym);
}
@@ -255,7 +255,7 @@
// merged with other symbols.
if (NoInit || GV->hasLinkOnceLinkage() || GV->hasWeakLinkage() ||
GV->hasCommonLinkage()) {
- MachOSym ExtOrCommonSym(GV, Mang->getMangledName(GV),
+ MachOSym ExtOrCommonSym(GV, Mang->getValueName(GV),
MachOSym::NO_SECT, TAI);
// For undefined (N_UNDF) external (N_EXT) types, n_value is the size in
// bytes of the symbol.
@@ -454,7 +454,7 @@
for (std::vector<GlobalValue*>::iterator I = PendingGlobals.begin(),
E = PendingGlobals.end(); I != E; ++I) {
if (GVOffset[*I] == 0 && GVSection[*I] == 0) {
- MachOSym UndfSym(*I, Mang->getMangledName(*I), MachOSym::NO_SECT, TAI);
+ MachOSym UndfSym(*I, Mang->getValueName(*I), MachOSym::NO_SECT, TAI);
SymbolTable.push_back(UndfSym);
GVOffset[*I] = -1;
}
Modified: llvm/trunk/lib/Target/CBackend/CBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CBackend/CBackend.cpp?rev=75638&r1=75637&r2=75638&view=diff
==============================================================================
--- llvm/trunk/lib/Target/CBackend/CBackend.cpp (original)
+++ llvm/trunk/lib/Target/CBackend/CBackend.cpp Tue Jul 14 11:25:11 2009
@@ -1432,7 +1432,7 @@
std::string CWriter::GetValueName(const Value *Operand) {
// Mangle globals with the standard mangler interface for LLC compatibility.
if (const GlobalValue *GV = dyn_cast<GlobalValue>(Operand))
- return Mang->getMangledName(GV);
+ return Mang->getValueName(GV);
std::string Name = Operand->getName();
Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=75638&r1=75637&r2=75638&view=diff
==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Tue Jul 14 11:25:11 2009
@@ -103,21 +103,18 @@
/// emitUsedDirectiveFor - On Darwin, internally linked data beginning with
/// the PrivateGlobalPrefix or the LessPrivateGlobalPrefix does not have the
/// directive emitted (this occurs in ObjC metadata).
+
bool
DarwinTargetAsmInfo::emitUsedDirectiveFor(const GlobalValue* GV,
Mangler *Mang) const {
if (GV==0)
return false;
-
- /// FIXME: WHAT IS THIS?
-
if (GV->hasLocalLinkage() && !isa<Function>(GV) &&
((strlen(getPrivateGlobalPrefix()) != 0 &&
- Mang->getMangledName(GV).substr(0,strlen(getPrivateGlobalPrefix())) ==
+ Mang->getValueName(GV).substr(0,strlen(getPrivateGlobalPrefix())) ==
getPrivateGlobalPrefix()) ||
(strlen(getLessPrivateGlobalPrefix()) != 0 &&
- Mang->getMangledName(GV).substr(0,
- strlen(getLessPrivateGlobalPrefix())) ==
+ Mang->getValueName(GV).substr(0,strlen(getLessPrivateGlobalPrefix())) ==
getLessPrivateGlobalPrefix())))
return false;
return true;
Modified: llvm/trunk/tools/bugpoint/Miscompilation.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/Miscompilation.cpp?rev=75638&r1=75637&r2=75638&view=diff
==============================================================================
--- llvm/trunk/tools/bugpoint/Miscompilation.cpp (original)
+++ llvm/trunk/tools/bugpoint/Miscompilation.cpp Tue Jul 14 11:25:11 2009
@@ -244,9 +244,9 @@
Mang.setPreserveAsmNames(true);
for (Module::global_iterator I = M->global_begin(), E = M->global_end();
I != E; ++I)
- I->setName(Mang.getMangledName(I));
+ I->setName(Mang.getValueName(I));
for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
- I->setName(Mang.getMangledName(I));
+ I->setName(Mang.getValueName(I));
}
/// ExtractLoops - Given a reduced list of functions that still exposed the bug,
Modified: llvm/trunk/tools/lto/LTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOCodeGenerator.cpp?rev=75638&r1=75637&r2=75638&view=diff
==============================================================================
--- llvm/trunk/tools/lto/LTOCodeGenerator.cpp (original)
+++ llvm/trunk/tools/lto/LTOCodeGenerator.cpp Tue Jul 14 11:25:11 2009
@@ -371,13 +371,13 @@
for (Module::iterator f = mergedModule->begin(),
e = mergedModule->end(); f != e; ++f) {
if ( !f->isDeclaration()
- && _mustPreserveSymbols.count(mangler.getMangledName(f)) )
+ && _mustPreserveSymbols.count(mangler.getValueName(f)) )
mustPreserveList.push_back(::strdup(f->getName().c_str()));
}
for (Module::global_iterator v = mergedModule->global_begin(),
e = mergedModule->global_end(); v != e; ++v) {
if ( !v->isDeclaration()
- && _mustPreserveSymbols.count(mangler.getMangledName(v)) )
+ && _mustPreserveSymbols.count(mangler.getValueName(v)) )
mustPreserveList.push_back(::strdup(v->getName().c_str()));
}
passes.add(createInternalizePass(mustPreserveList));
Modified: llvm/trunk/tools/lto/LTOModule.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOModule.cpp?rev=75638&r1=75637&r2=75638&view=diff
==============================================================================
--- llvm/trunk/tools/lto/LTOModule.cpp (original)
+++ llvm/trunk/tools/lto/LTOModule.cpp Tue Jul 14 11:25:11 2009
@@ -332,7 +332,7 @@
return;
// string is owned by _defines
- const char* symbolName = ::strdup(mangler.getMangledName(def).c_str());
+ const char* symbolName = ::strdup(mangler.getValueName(def).c_str());
// set alignment part log2() can have rounding errors
uint32_t align = def->getAlignment();
@@ -405,7 +405,7 @@
if (isa<GlobalAlias>(decl))
return;
- const char* name = mangler.getMangledName(decl).c_str();
+ const char* name = mangler.getValueName(decl).c_str();
// we already have the symbol
if (_undefines.find(name) != _undefines.end())
More information about the llvm-commits
mailing list