diff options
| -rw-r--r-- | include/llvm/MC/MCAssembler.h | 11 | ||||
| -rw-r--r-- | include/llvm/Support/CommandLine.h | 6 | ||||
| -rw-r--r-- | lib/MC/MCAssembler.cpp | 8 |
3 files changed, 10 insertions, 15 deletions
diff --git a/include/llvm/MC/MCAssembler.h b/include/llvm/MC/MCAssembler.h index 2df94e7..915645f 100644 --- a/include/llvm/MC/MCAssembler.h +++ b/include/llvm/MC/MCAssembler.h @@ -64,7 +64,7 @@ public: FT_Target }; -protected: +private: FragmentType Kind; /// Parent - The data for the section this fragment is in. @@ -461,7 +461,7 @@ public: typedef FragmentListType::const_reverse_iterator const_reverse_iterator; typedef FragmentListType::reverse_iterator reverse_iterator; -protected: +private: FragmentListType Fragments; const MCSection *Section; @@ -489,7 +489,6 @@ public: // Only for use as sentinel. MCSectionData(); MCSectionData(const MCSection &Section, MCAssembler *A = 0); - virtual ~MCSectionData() {} const MCSection &getSection() const { return *Section; } @@ -688,7 +687,7 @@ private: MCCodeEmitter &Emitter; - MCObjectWriter *m_pWriter; + MCObjectWriter *Writer; raw_ostream &OS; @@ -816,9 +815,9 @@ public: MCCodeEmitter &getEmitter() const { return Emitter; } - MCObjectWriter &getWriter() const { return *m_pWriter; } + MCObjectWriter &getWriter() const { return *Writer; } - void setWriter(MCObjectWriter &pObjectWriter); + void setWriter(MCObjectWriter &ObjectWriter); /// Finish - Do final processing and write the object to the output stream. /// \arg Writer is used for custom object writer (as the MCJIT does), diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h index 04ed592..c212d2d 100644 --- a/include/llvm/Support/CommandLine.h +++ b/include/llvm/Support/CommandLine.h @@ -337,11 +337,7 @@ struct OptionValueBase : public GenericOptionValue { bool hasValue() const { return false; } - const DataType &getValue() const { - assert(false && "no default value"); - DataType *p = 0; - return *p; - } + const DataType &getValue() const { llvm_unreachable("no default value"); } // Some options may take their value from a different data type. template<class DT> diff --git a/lib/MC/MCAssembler.cpp b/lib/MC/MCAssembler.cpp index b62e8f5..5ffb6f2 100644 --- a/lib/MC/MCAssembler.cpp +++ b/lib/MC/MCAssembler.cpp @@ -198,7 +198,7 @@ MCSymbolData::MCSymbolData(const MCSymbol &_Symbol, MCFragment *_Fragment, MCAssembler::MCAssembler(MCContext &Context_, MCAsmBackend &Backend_, MCCodeEmitter &Emitter_, MCObjectWriter &Writer_, raw_ostream &OS_) - : Context(Context_), Backend(Backend_), Emitter(Emitter_), m_pWriter(&Writer_), + : Context(Context_), Backend(Backend_), Emitter(Emitter_), Writer(&Writer_), OS(OS_), RelaxAll(false), NoExecStack(false), SubsectionsViaSymbols(false) { } @@ -206,9 +206,9 @@ MCAssembler::MCAssembler(MCContext &Context_, MCAsmBackend &Backend_, MCAssembler::~MCAssembler() { } -void MCAssembler::setWriter(MCObjectWriter &pObjectWriter) { - delete m_pWriter; - m_pWriter = &pObjectWriter; +void MCAssembler::setWriter(MCObjectWriter &ObjectWriter) { + delete Writer; + Writer = &ObjectWriter; } bool MCAssembler::isSymbolLinkerVisible(const MCSymbol &Symbol) const { |