diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-04-27 17:23:37 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-04-27 17:23:37 +0000 |
commit | aa0242723e139f8c9eebbe5e9ceba7c473903926 (patch) | |
tree | 380da752ffccf006441113b76200d8777251b766 | |
parent | 4c6f61302e7e412cd5090704d9cbb42f572ee69e (diff) | |
download | bcm5719-llvm-aa0242723e139f8c9eebbe5e9ceba7c473903926.tar.gz bcm5719-llvm-aa0242723e139f8c9eebbe5e9ceba7c473903926.zip |
Make getOrCreateSymbolData non virtual.
llvm-svn: 207367
-rw-r--r-- | llvm/include/llvm/MC/MCELFStreamer.h | 2 | ||||
-rw-r--r-- | llvm/include/llvm/MC/MCObjectStreamer.h | 4 | ||||
-rw-r--r-- | llvm/include/llvm/MC/MCStreamer.h | 3 | ||||
-rw-r--r-- | llvm/include/llvm/MC/MCWinCOFFStreamer.h | 2 | ||||
-rw-r--r-- | llvm/lib/MC/MCELFStreamer.cpp | 4 | ||||
-rw-r--r-- | llvm/lib/MC/MCStreamer.cpp | 5 | ||||
-rw-r--r-- | llvm/lib/MC/WinCOFFStreamer.cpp | 4 |
7 files changed, 4 insertions, 20 deletions
diff --git a/llvm/include/llvm/MC/MCELFStreamer.h b/llvm/include/llvm/MC/MCELFStreamer.h index da37d0d0128..be39128dbda 100644 --- a/llvm/include/llvm/MC/MCELFStreamer.h +++ b/llvm/include/llvm/MC/MCELFStreamer.h @@ -61,8 +61,6 @@ public: void EmitCOFFSymbolType(int Type) override; void EndCOFFSymbolDef() override; - MCSymbolData &getOrCreateSymbolData(const MCSymbol *Symbol) override; - void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) override; void EmitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size, diff --git a/llvm/include/llvm/MC/MCObjectStreamer.h b/llvm/include/llvm/MC/MCObjectStreamer.h index e57dc364bd0..711c59ff79c 100644 --- a/llvm/include/llvm/MC/MCObjectStreamer.h +++ b/llvm/include/llvm/MC/MCObjectStreamer.h @@ -54,6 +54,10 @@ public: /// Object streamers require the integrated assembler. bool isIntegratedAssemblerRequired() const override { return true; } + MCSymbolData &getOrCreateSymbolData(const MCSymbol *Symbol) { + return getAssembler().getOrCreateSymbolData(*Symbol); + } + protected: MCSectionData *getCurrentSectionData() const { return CurSectionData; diff --git a/llvm/include/llvm/MC/MCStreamer.h b/llvm/include/llvm/MC/MCStreamer.h index 06ad1465385..6fa61ebf82a 100644 --- a/llvm/include/llvm/MC/MCStreamer.h +++ b/llvm/include/llvm/MC/MCStreamer.h @@ -398,9 +398,6 @@ public: /// a Thumb mode function (ARM target only). virtual void EmitThumbFunc(MCSymbol *Func) = 0; - /// getOrCreateSymbolData - Get symbol data for given symbol. - virtual MCSymbolData &getOrCreateSymbolData(const MCSymbol *Symbol); - /// EmitAssignment - Emit an assignment of @p Value to @p Symbol. /// /// This corresponds to an assembler statement such as: diff --git a/llvm/include/llvm/MC/MCWinCOFFStreamer.h b/llvm/include/llvm/MC/MCWinCOFFStreamer.h index c2880dce388..b0a27cdbd75 100644 --- a/llvm/include/llvm/MC/MCWinCOFFStreamer.h +++ b/llvm/include/llvm/MC/MCWinCOFFStreamer.h @@ -62,8 +62,6 @@ public: /// \} - MCSymbolData &getOrCreateSymbolData(const MCSymbol *Symbol); - protected: const MCSymbol *CurSymbol; void EmitInstToData(const MCInst &Inst, const MCSubtargetInfo &STI) override; diff --git a/llvm/lib/MC/MCELFStreamer.cpp b/llvm/lib/MC/MCELFStreamer.cpp index d42636e1803..c1c57c044c3 100644 --- a/llvm/lib/MC/MCELFStreamer.cpp +++ b/llvm/lib/MC/MCELFStreamer.cpp @@ -560,10 +560,6 @@ void MCELFStreamer::EmitThumbFunc(MCSymbol *Func) { llvm_unreachable("Generic ELF doesn't support this directive"); } -MCSymbolData &MCELFStreamer::getOrCreateSymbolData(const MCSymbol *Symbol) { - return getAssembler().getOrCreateSymbolData(*Symbol); -} - void MCELFStreamer::EmitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) { llvm_unreachable("ELF doesn't support this directive"); } diff --git a/llvm/lib/MC/MCStreamer.cpp b/llvm/lib/MC/MCStreamer.cpp index 50b6576766c..4c99c0add72 100644 --- a/llvm/lib/MC/MCStreamer.cpp +++ b/llvm/lib/MC/MCStreamer.cpp @@ -644,11 +644,6 @@ void MCStreamer::Finish() { FinishImpl(); } -MCSymbolData &MCStreamer::getOrCreateSymbolData(const MCSymbol *Symbol) { - report_fatal_error("Not supported!"); - return *(static_cast<MCSymbolData*>(nullptr)); -} - void MCStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) { Symbol->setVariableValue(Value); diff --git a/llvm/lib/MC/WinCOFFStreamer.cpp b/llvm/lib/MC/WinCOFFStreamer.cpp index ec81dff0c34..40b8dd944bd 100644 --- a/llvm/lib/MC/WinCOFFStreamer.cpp +++ b/llvm/lib/MC/WinCOFFStreamer.cpp @@ -239,9 +239,5 @@ void MCWinCOFFStreamer::EmitWin64EHHandlerData() { void MCWinCOFFStreamer::FinishImpl() { MCObjectStreamer::FinishImpl(); } - -MCSymbolData &MCWinCOFFStreamer::getOrCreateSymbolData(const MCSymbol *Symbol) { - return getAssembler().getOrCreateSymbolData(*Symbol); -} } |