From 3a89110b6ef56a576c75d72eb89896e14e06dc84 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 23 Jan 2014 23:14:14 +0000 Subject: [PATCH] InitToTextSection is redundant with InitSections. Remove it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199955 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCELFStreamer.h | 1 - include/llvm/MC/MCStreamer.h | 3 --- lib/LTO/LTOModule.cpp | 1 - lib/MC/MCAsmStreamer.cpp | 4 ---- lib/MC/MCELFStreamer.cpp | 4 ---- lib/MC/MCMachOStreamer.cpp | 5 ----- lib/MC/MCNullStreamer.cpp | 3 --- lib/MC/MCParser/AsmParser.cpp | 2 +- lib/MC/MCPureStreamer.cpp | 5 ----- lib/MC/WinCOFFStreamer.cpp | 5 ----- lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 2 +- 11 files changed, 2 insertions(+), 33 deletions(-) diff --git a/include/llvm/MC/MCELFStreamer.h b/include/llvm/MC/MCELFStreamer.h index 72b7075c6fc..c9ec720b9be 100644 --- a/include/llvm/MC/MCELFStreamer.h +++ b/include/llvm/MC/MCELFStreamer.h @@ -46,7 +46,6 @@ public: /// @{ virtual void InitSections(); - virtual void InitToTextSection(); virtual void ChangeSection(const MCSection *Section, const MCExpr *Subsection); virtual void EmitLabel(MCSymbol *Symbol); diff --git a/include/llvm/MC/MCStreamer.h b/include/llvm/MC/MCStreamer.h index 62e5d6bcd04..870cc874b08 100644 --- a/include/llvm/MC/MCStreamer.h +++ b/include/llvm/MC/MCStreamer.h @@ -344,9 +344,6 @@ public: /// InitSections - Create the default sections and set the initial one. virtual void InitSections() = 0; - /// InitToTextSection - Create a text section and switch the streamer to it. - virtual void InitToTextSection() = 0; - /// AssignSection - Sets the symbol's section. /// /// Each emitted symbol will be tracked in the ordering table, diff --git a/lib/LTO/LTOModule.cpp b/lib/LTO/LTOModule.cpp index b648982af1d..4fa21ae8185 100644 --- a/lib/LTO/LTOModule.cpp +++ b/lib/LTO/LTOModule.cpp @@ -686,7 +686,6 @@ public: // Noop calls. virtual void ChangeSection(const MCSection *Section, const MCExpr *Subsection) {} - virtual void InitToTextSection() {} virtual void InitSections() {} virtual void EmitAssemblerFlag(MCAssemblerFlag Flag) {} virtual void EmitThumbFunc(MCSymbol *Func) {} diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp index 64bcb83b225..1a82fdebd0b 100644 --- a/lib/MC/MCAsmStreamer.cpp +++ b/lib/MC/MCAsmStreamer.cpp @@ -129,10 +129,6 @@ public: const MCExpr *Subsection); virtual void InitSections() { - InitToTextSection(); - } - - virtual void InitToTextSection() { SwitchSection(getContext().getObjectFileInfo()->getTextSection()); } diff --git a/lib/MC/MCELFStreamer.cpp b/lib/MC/MCELFStreamer.cpp index 5fbbdd4b3e9..47ac181346d 100644 --- a/lib/MC/MCELFStreamer.cpp +++ b/lib/MC/MCELFStreamer.cpp @@ -53,10 +53,6 @@ inline void MCELFStreamer::SetSectionBss() { MCELFStreamer::~MCELFStreamer() { } -void MCELFStreamer::InitToTextSection() { - SetSectionText(); -} - void MCELFStreamer::InitSections() { // This emulates the same behavior of GNU as. This makes it easier // to compare the output as the major sections are in the same order. diff --git a/lib/MC/MCMachOStreamer.cpp b/lib/MC/MCMachOStreamer.cpp index 6fe46637667..1386b1ae4b2 100644 --- a/lib/MC/MCMachOStreamer.cpp +++ b/lib/MC/MCMachOStreamer.cpp @@ -44,7 +44,6 @@ public: /// @{ virtual void InitSections(); - virtual void InitToTextSection(); virtual void EmitLabel(MCSymbol *Symbol); virtual void EmitDebugLabel(MCSymbol *Symbol); virtual void EmitEHSymAttributes(const MCSymbol *Symbol, @@ -96,10 +95,6 @@ public: } // end anonymous namespace. void MCMachOStreamer::InitSections() { - InitToTextSection(); -} - -void MCMachOStreamer::InitToTextSection() { SwitchSection(getContext().getObjectFileInfo()->getTextSection()); } diff --git a/lib/MC/MCNullStreamer.cpp b/lib/MC/MCNullStreamer.cpp index 9b9c4aa2a0c..9d98f987d69 100644 --- a/lib/MC/MCNullStreamer.cpp +++ b/lib/MC/MCNullStreamer.cpp @@ -24,9 +24,6 @@ namespace { /// @name MCStreamer Interface /// @{ - virtual void InitToTextSection() { - } - virtual void InitSections() { } diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index a2acd8391b3..035ecaacc8c 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -698,7 +698,7 @@ bool AsmParser::Run(bool NoInitialTextSection, bool NoFinalize) { void AsmParser::checkForValidSection() { if (!ParsingInlineAsm && !getStreamer().getCurrentSection().first) { TokError("expected section directive before assembly directive"); - Out.InitToTextSection(); + Out.InitSections(); } } diff --git a/lib/MC/MCPureStreamer.cpp b/lib/MC/MCPureStreamer.cpp index f7bf002fbc6..8bb7a7bd40e 100644 --- a/lib/MC/MCPureStreamer.cpp +++ b/lib/MC/MCPureStreamer.cpp @@ -35,7 +35,6 @@ public: /// @{ virtual void InitSections(); - virtual void InitToTextSection(); virtual void EmitLabel(MCSymbol *Symbol); virtual void EmitDebugLabel(MCSymbol *Symbol); virtual void EmitZerofill(const MCSection *Section, MCSymbol *Symbol = 0, @@ -106,10 +105,6 @@ public: } // end anonymous namespace. void MCPureStreamer::InitSections() { - InitToTextSection(); -} - -void MCPureStreamer::InitToTextSection() { SwitchSection(getContext().getObjectFileInfo()->getTextSection()); } diff --git a/lib/MC/WinCOFFStreamer.cpp b/lib/MC/WinCOFFStreamer.cpp index b7d55741456..2e090a045e9 100644 --- a/lib/MC/WinCOFFStreamer.cpp +++ b/lib/MC/WinCOFFStreamer.cpp @@ -51,7 +51,6 @@ public: // MCStreamer interface virtual void InitSections(); - virtual void InitToTextSection(); virtual void EmitLabel(MCSymbol *Symbol); virtual void EmitDebugLabel(MCSymbol *Symbol); virtual void EmitAssemblerFlag(MCAssemblerFlag Flag); @@ -151,10 +150,6 @@ void WinCOFFStreamer::AddCommonSymbol(MCSymbol *Symbol, uint64_t Size, // MCStreamer interface -void WinCOFFStreamer::InitToTextSection() { - SetSectionText(); -} - void WinCOFFStreamer::InitSections() { SetSectionText(); SetSectionData(); diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index 216f4aa2d64..06f2b4ef2ef 100644 --- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -8851,7 +8851,7 @@ bool ARMAsmParser::parseDirectiveEven(SMLoc L) { } if (!Section) { - getStreamer().InitToTextSection(); + getStreamer().InitSections(); Section = getStreamer().getCurrentSection().first; }