From 0c8e80607bc3296a4775f05c02f0d11df8e5cb04 Mon Sep 17 00:00:00 2001 From: Anton Korobeynikov Date: Wed, 24 Sep 2008 22:13:07 +0000 Subject: [PATCH] Drop obsolete hook and change all usage to new interface git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56572 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/AsmPrinter.h | 6 ------ lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 7 +------ lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp | 9 --------- lib/Target/Alpha/AlphaAsmPrinter.cpp | 2 +- lib/Target/CellSPU/SPUAsmPrinter.cpp | 18 +----------------- lib/Target/IA64/IA64AsmPrinter.cpp | 10 +--------- lib/Target/Mips/MipsAsmPrinter.cpp | 6 ------ .../PowerPC/AsmPrinter/PPCAsmPrinter.cpp | 18 ++---------------- lib/Target/Sparc/SparcAsmPrinter.cpp | 8 +------- lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp | 5 ----- lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h | 4 ---- .../X86/AsmPrinter/X86IntelAsmPrinter.cpp | 8 +------- lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h | 4 ---- 13 files changed, 8 insertions(+), 97 deletions(-) diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h index 45ea5d89774..931e31a63c6 100644 --- a/include/llvm/CodeGen/AsmPrinter.h +++ b/include/llvm/CodeGen/AsmPrinter.h @@ -184,12 +184,6 @@ namespace llvm { unsigned AsmVariant, const char *ExtraCode); - /// getSectionForFunction - Return the section that we should emit the - /// specified function body into. This defaults to 'TextSection'. This - /// should most likely be overridden by the target to put linkonce/weak - /// functions into special sections. - virtual std::string getSectionForFunction(const Function &F) const; - /// SetupMachineFunction - This should be called when a new MachineFunction /// is being processed from runOnMachineFunction. void SetupMachineFunction(MachineFunction &MF); diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 6e9d935e0c0..93ebf218188 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -47,11 +47,6 @@ AsmPrinter::~AsmPrinter() { E = GCMetadataPrinters.end(); I != E; ++I) delete I->second; } - -std::string AsmPrinter::getSectionForFunction(const Function &F) const { - return TAI->getTextSection(); -} - /// SwitchToTextSection - Switch to the specified text section of the executable /// if we are not already in it! @@ -331,7 +326,7 @@ void AsmPrinter::EmitJumpTableInfo(MachineJumpTableInfo *MJTI, // function body itself, otherwise the label differences won't make sense. // We should also do if the section name is NULL or function is declared in // discardable section. - SwitchToTextSection(getSectionForFunction(*F).c_str(), F); + SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F); } else { SwitchToDataSection(JumpTableDataSection); } diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp index c2e24172849..4db430f9e22 100644 --- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp @@ -130,10 +130,6 @@ namespace { bool doInitialization(Module &M); bool doFinalization(Module &M); - /// getSectionForFunction - Return the section that we should emit the - /// specified function body into. - virtual std::string getSectionForFunction(const Function &F) const; - /// EmitMachineConstantPoolValue - Print a machine constantpool value to /// the .s file. virtual void EmitMachineConstantPoolValue(MachineConstantPoolValue *MCPV) { @@ -179,11 +175,6 @@ namespace { #include "ARMGenAsmWriter.inc" -// Substitute old hook with new one temporary -std::string ARMAsmPrinter::getSectionForFunction(const Function &F) const { - return TAI->SectionForGlobal(&F); -} - /// runOnMachineFunction - This uses the printInstruction() /// method to print assembly for each instruction. /// diff --git a/lib/Target/Alpha/AlphaAsmPrinter.cpp b/lib/Target/Alpha/AlphaAsmPrinter.cpp index d92317e9204..b1265afe1ab 100644 --- a/lib/Target/Alpha/AlphaAsmPrinter.cpp +++ b/lib/Target/Alpha/AlphaAsmPrinter.cpp @@ -149,7 +149,7 @@ bool AlphaAsmPrinter::runOnMachineFunction(MachineFunction &MF) { // Print out labels for the function. const Function *F = MF.getFunction(); - SwitchToTextSection(getSectionForFunction(*F).c_str(), F); + SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F); EmitAlignment(4, F); switch (F->getLinkage()) { diff --git a/lib/Target/CellSPU/SPUAsmPrinter.cpp b/lib/Target/CellSPU/SPUAsmPrinter.cpp index 2cfec795d42..ef33968c28f 100644 --- a/lib/Target/CellSPU/SPUAsmPrinter.cpp +++ b/lib/Target/CellSPU/SPUAsmPrinter.cpp @@ -297,9 +297,6 @@ namespace { SPUAsmPrinter::getAnalysisUsage(AU); } - /// getSectionForFunction - Return the section that we should emit the - /// specified function body into. - virtual std::string getSectionForFunction(const Function &F) const; }; } // end of anonymous namespace @@ -406,19 +403,6 @@ void SPUAsmPrinter::printMachineInstruction(const MachineInstr *MI) { printInstruction(MI); } - - -std::string LinuxAsmPrinter::getSectionForFunction(const Function &F) const { - switch (F.getLinkage()) { - default: assert(0 && "Unknown linkage type!"); - case Function::ExternalLinkage: - case Function::InternalLinkage: return TAI->getTextSection(); - case Function::WeakLinkage: - case Function::LinkOnceLinkage: - return ""; // Print nothing for the time being... - } -} - /// runOnMachineFunction - This uses the printMachineInstruction() /// method to print assembly for each instruction. /// @@ -434,7 +418,7 @@ LinuxAsmPrinter::runOnMachineFunction(MachineFunction &MF) // Print out labels for the function. const Function *F = MF.getFunction(); - SwitchToTextSection(getSectionForFunction(*F).c_str(), F); + SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F); EmitAlignment(3, F); switch (F->getLinkage()) { diff --git a/lib/Target/IA64/IA64AsmPrinter.cpp b/lib/Target/IA64/IA64AsmPrinter.cpp index 957deba4523..ff33125913c 100644 --- a/lib/Target/IA64/IA64AsmPrinter.cpp +++ b/lib/Target/IA64/IA64AsmPrinter.cpp @@ -106,8 +106,6 @@ namespace { printOp(MI->getOperand(OpNo), true); // this is a br.call instruction } - std::string getSectionForFunction(const Function &F) const; - void printMachineInstruction(const MachineInstr *MI); void printOp(const MachineOperand &MO, bool isBRCALLinsn= false); void printModuleLevelGV(const GlobalVariable* GVar); @@ -121,12 +119,6 @@ namespace { // Include the auto-generated portion of the assembly writer. #include "IA64GenAsmWriter.inc" - -// Substitute old hook with new one temporary -std::string IA64AsmPrinter::getSectionForFunction(const Function &F) const { - return TAI->SectionForGlobal(&F); -} - /// runOnMachineFunction - This uses the printMachineInstruction() /// method to print assembly for each instruction. /// @@ -138,7 +130,7 @@ bool IA64AsmPrinter::runOnMachineFunction(MachineFunction &MF) { EmitConstantPool(MF.getConstantPool()); const Function *F = MF.getFunction(); - SwitchToTextSection(getSectionForFunction(*F).c_str(), F); + SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F); // Print out labels for the function. EmitAlignment(5); diff --git a/lib/Target/Mips/MipsAsmPrinter.cpp b/lib/Target/Mips/MipsAsmPrinter.cpp index 02455cf26d9..fbe3faa3393 100644 --- a/lib/Target/Mips/MipsAsmPrinter.cpp +++ b/lib/Target/Mips/MipsAsmPrinter.cpp @@ -59,7 +59,6 @@ namespace { return "Mips Assembly Printer"; } - virtual std::string getSectionForFunction(const Function &F) const; bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo, unsigned AsmVariant, const char *ExtraCode); void printOperand(const MachineInstr *MI, int opNum); @@ -219,11 +218,6 @@ emitCurrentABIString(void) return NULL; } -// Substitute old hook with new one temporary -std::string MipsAsmPrinter::getSectionForFunction(const Function &F) const { - return TAI->SectionForGlobal(&F); -} - /// Emit the directives used by GAS on the start of functions void MipsAsmPrinter:: emitFunctionStart(MachineFunction &MF) diff --git a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp index 8ea182537d2..a8127f6f63c 100644 --- a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp +++ b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp @@ -315,9 +315,6 @@ namespace { PPCAsmPrinter::getAnalysisUsage(AU); } - /// getSectionForFunction - Return the section that we should emit the - /// specified function body into. - virtual std::string getSectionForFunction(const Function &F) const; void printModuleLevelGV(const GlobalVariable* GVar); }; @@ -347,9 +344,6 @@ namespace { PPCAsmPrinter::getAnalysisUsage(AU); } - /// getSectionForFunction - Return the section that we should emit the - /// specified function body into. - virtual std::string getSectionForFunction(const Function &F) const; void printModuleLevelGV(const GlobalVariable* GVar); }; } // end of anonymous namespace @@ -577,7 +571,7 @@ bool PPCLinuxAsmPrinter::runOnMachineFunction(MachineFunction &MF) { // Print out labels for the function. const Function *F = MF.getFunction(); - SwitchToTextSection(getSectionForFunction(*F).c_str(), F); + SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F); switch (F->getLinkage()) { default: assert(0 && "Unknown linkage type!"); @@ -753,14 +747,6 @@ bool PPCLinuxAsmPrinter::doFinalization(Module &M) { return AsmPrinter::doFinalization(M); } -std::string PPCLinuxAsmPrinter::getSectionForFunction(const Function &F) const { - return TAI->SectionForGlobal(&F); -} - -std::string PPCDarwinAsmPrinter::getSectionForFunction(const Function &F) const { - return TAI->SectionForGlobal(&F); -} - /// runOnMachineFunction - This uses the printMachineInstruction() /// method to print assembly for each instruction. /// @@ -773,7 +759,7 @@ bool PPCDarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) { // Print out labels for the function. const Function *F = MF.getFunction(); - SwitchToTextSection(getSectionForFunction(*F).c_str(), F); + SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F); switch (F->getLinkage()) { default: assert(0 && "Unknown linkage type!"); diff --git a/lib/Target/Sparc/SparcAsmPrinter.cpp b/lib/Target/Sparc/SparcAsmPrinter.cpp index 8fa54883e37..bb4d6aeea7b 100644 --- a/lib/Target/Sparc/SparcAsmPrinter.cpp +++ b/lib/Target/Sparc/SparcAsmPrinter.cpp @@ -63,7 +63,6 @@ namespace { bool printInstruction(const MachineInstr *MI); // autogenerated. bool runOnMachineFunction(MachineFunction &F); - std::string getSectionForFunction(const Function &F) const; bool doInitialization(Module &M); bool doFinalization(Module &M); }; @@ -81,11 +80,6 @@ FunctionPass *llvm::createSparcCodePrinterPass(raw_ostream &o, return new SparcAsmPrinter(o, tm, tm.getTargetAsmInfo()); } -// Substitute old hook with new one temporary -std::string SparcAsmPrinter::getSectionForFunction(const Function &F) const { - return TAI->SectionForGlobal(&F); -} - /// runOnMachineFunction - This uses the printInstruction() /// method to print assembly for each instruction. /// @@ -105,7 +99,7 @@ bool SparcAsmPrinter::runOnMachineFunction(MachineFunction &MF) { // Print out the label for the function. const Function *F = MF.getFunction(); - SwitchToTextSection(getSectionForFunction(*F).c_str(), F); + SwitchToTextSection(TAI->SectionForGlobal(F).c_str(), F); EmitAlignment(4, F); O << "\t.globl\t" << CurrentFnName << '\n'; diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp index cada75027d0..61c8f12eec3 100644 --- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp @@ -146,11 +146,6 @@ void X86ATTAsmPrinter::decorateName(std::string &Name, } } -// Substitute old hook with new one temporary -std::string X86ATTAsmPrinter::getSectionForFunction(const Function &F) const { - return TAI->SectionForGlobal(&F); -} - void X86ATTAsmPrinter::emitFunctionHeader(const MachineFunction &MF) { const Function *F = MF.getFunction(); std::string SectionName = TAI->SectionForGlobal(F); diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h index 87845fbb0a9..312c11d570c 100644 --- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h +++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h @@ -124,10 +124,6 @@ struct VISIBILITY_HIDDEN X86ATTAsmPrinter : public AsmPrinter { bool runOnMachineFunction(MachineFunction &F); - /// getSectionForFunction - Return the section that we should emit the - /// specified function body into. - virtual std::string getSectionForFunction(const Function &F) const; - void emitFunctionHeader(const MachineFunction &MF); // Necessary for Darwin to print out the apprioriate types of linker stubs diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp index 3c4612b1e2d..ec0bfeb7d63 100644 --- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp @@ -117,12 +117,6 @@ void X86IntelAsmPrinter::decorateName(std::string &Name, } } - -std::string X86IntelAsmPrinter::getSectionForFunction(const Function &F) const { - // Intel asm always emits functions to _text. - return "_text"; -} - /// runOnMachineFunction - This uses the printMachineInstruction() /// method to print assembly for each instruction. /// @@ -144,7 +138,7 @@ bool X86IntelAsmPrinter::runOnMachineFunction(MachineFunction &MF) { decorateName(CurrentFnName, F); - SwitchToTextSection(getSectionForFunction(*F).c_str(), F); + SwitchToTextSection("_text", F); unsigned FnAlign = OptimizeForSize ? 1 : 4; if (!F->isDeclaration() && F->hasNote(FnAttr::OptimizeForSize)) diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h index 3cb17faca22..ff3161779fa 100644 --- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h +++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h @@ -131,10 +131,6 @@ struct VISIBILITY_HIDDEN X86IntelAsmPrinter : public AsmPrinter { void decorateName(std::string& Name, const GlobalValue* GV); - /// getSectionForFunction - Return the section that we should emit the - /// specified function body into. - virtual std::string getSectionForFunction(const Function &F) const; - virtual void EmitString(const ConstantArray *CVA) const; // Necessary for dllexport support -- 2.34.1