MC/Assembler: Make the MCObjectWriter available through the lifetime of the

assembler.

llvm-svn: 122031

include/llvm/MC/MCAssembler.h

@@ -648,6 +648,8 @@ private:
 
   MCCodeEmitter &Emitter;
 
+  MCObjectWriter &Writer;
+
   raw_ostream &OS;
 
   iplist<MCSectionData> Sections;
@@ -770,8 +772,9 @@ public:
   // concrete and require clients to pass in a target like object. The other
   // option is to make this abstract, and have targets provide concrete
   // implementations as we do with AsmParser.
-  MCAssembler(MCContext &_Context, TargetAsmBackend &_Backend,
+  MCAssembler(MCContext &Context_, TargetAsmBackend &Backend_,
-              MCCodeEmitter &_Emitter, raw_ostream &OS);
+              MCCodeEmitter &Emitter_, MCObjectWriter &Writer_,
+              raw_ostream &OS);
   ~MCAssembler();
 
   MCContext &getContext() const { return Context; }
@@ -780,10 +783,12 @@ public:
 
   MCCodeEmitter &getEmitter() const { return Emitter; }
 
+  MCObjectWriter &getWriter() const { return Writer; }
+
   /// Finish - Do final processing and write the object to the output stream.
   /// \arg Writer is used for custom object writer (as the MCJIT does),
   /// if not specified it is automatically created from backend.
-  void Finish(MCObjectWriter *Writer = 0);
+  void Finish();
 
   // FIXME: This does not belong here.
   bool getSubsectionsViaSymbols() const {

lib/MC/MCAssembler.cpp

@@ -167,10 +167,11 @@ MCSymbolData::MCSymbolData(const MCSymbol &_Symbol, MCFragment *_Fragment,
 
 /* *** */
 
-MCAssembler::MCAssembler(MCContext &_Context, TargetAsmBackend &_Backend,
+MCAssembler::MCAssembler(MCContext &Context_, TargetAsmBackend &Backend_,
-                         MCCodeEmitter &_Emitter, raw_ostream &_OS)
+                         MCCodeEmitter &Emitter_, MCObjectWriter &Writer_,
-  : Context(_Context), Backend(_Backend), Emitter(_Emitter),
+                         raw_ostream &OS_)
-    OS(_OS), RelaxAll(false), SubsectionsViaSymbols(false)
+  : Context(Context_), Backend(Backend_), Emitter(Emitter_), Writer(Writer_),
+    OS(OS_), RelaxAll(false), SubsectionsViaSymbols(false)
 {
 }
 
@@ -495,7 +496,7 @@ uint64_t MCAssembler::HandleFixup(MCObjectWriter &Writer,
    return FixedValue;
  }
 
-void MCAssembler::Finish(MCObjectWriter *Writer) {
+void MCAssembler::Finish() {
   DEBUG_WITH_TYPE("mc-dump", {
       llvm::errs() << "assembler backend - pre-layout\n--\n";
       dump(); });
@@ -503,8 +504,6 @@ void MCAssembler::Finish(MCObjectWriter *Writer) {
   // Create the layout object.
   MCAsmLayout Layout(*this);
 
-
-
   // Create dummy fragments and assign section ordinals.
   unsigned SectionIndex = 0;
   for (MCAssembler::iterator it = begin(), ie = end(); it != ie; ++it) {
@@ -527,17 +526,8 @@ void MCAssembler::Finish(MCObjectWriter *Writer) {
       it2->setLayoutOrder(FragmentIndex++);
   }
 
-  llvm::OwningPtr<MCObjectWriter> OwnWriter(0);
-  if (Writer == 0) {
-    //no custom Writer_ : create the default one life-managed by OwningPtr
-    OwnWriter.reset(getBackend().createObjectWriter(OS));
-    Writer = OwnWriter.get();
-    if (!Writer)
-      report_fatal_error("unable to create object writer!");
-  }
-
   // Layout until everything fits.
-  while (LayoutOnce(*Writer, Layout))
+  while (LayoutOnce(Writer, Layout))
     continue;
 
   DEBUG_WITH_TYPE("mc-dump", {
@@ -555,7 +545,7 @@ void MCAssembler::Finish(MCObjectWriter *Writer) {
 
   // Allow the object writer a chance to perform post-layout binding (for
   // example, to set the index fields in the symbol data).
-  Writer->ExecutePostLayoutBinding(*this, Layout);
+  Writer.ExecutePostLayoutBinding(*this, Layout);
 
   // Evaluate and apply the fixups, generating relocation entries as necessary.
   for (MCAssembler::iterator it = begin(), ie = end(); it != ie; ++it) {
@@ -566,7 +556,7 @@ void MCAssembler::Finish(MCObjectWriter *Writer) {
         for (MCDataFragment::fixup_iterator it3 = DF->fixup_begin(),
                ie3 = DF->fixup_end(); it3 != ie3; ++it3) {
           MCFixup &Fixup = *it3;
-          uint64_t FixedValue = HandleFixup(*Writer, Layout, *DF, Fixup);
+          uint64_t FixedValue = HandleFixup(Writer, Layout, *DF, Fixup);
           getBackend().ApplyFixup(Fixup, DF->getContents().data(),
                                   DF->getContents().size(), FixedValue);
         }
@@ -576,7 +566,7 @@ void MCAssembler::Finish(MCObjectWriter *Writer) {
         for (MCInstFragment::fixup_iterator it3 = IF->fixup_begin(),
                ie3 = IF->fixup_end(); it3 != ie3; ++it3) {
           MCFixup &Fixup = *it3;
-          uint64_t FixedValue = HandleFixup(*Writer, Layout, *IF, Fixup);
+          uint64_t FixedValue = HandleFixup(Writer, Layout, *IF, Fixup);
           getBackend().ApplyFixup(Fixup, IF->getCode().data(),
                                   IF->getCode().size(), FixedValue);
         }
@@ -585,7 +575,7 @@ void MCAssembler::Finish(MCObjectWriter *Writer) {
   }
 
   // Write the object file.
-  Writer->WriteObject(*this, Layout);
+  Writer.WriteObject(*this, Layout);
 
   stats::ObjectBytes += OS.tell() - StartOffset;
 }

lib/MC/MCObjectStreamer.cpp

@@ -21,10 +21,11 @@
 using namespace llvm;
 
 MCObjectStreamer::MCObjectStreamer(MCContext &Context, TargetAsmBackend &TAB,
-                                   raw_ostream &_OS, MCCodeEmitter *_Emitter)
+                                   raw_ostream &OS, MCCodeEmitter *Emitter_)
-  : MCStreamer(Context), Assembler(new MCAssembler(Context, TAB,
+  : MCStreamer(Context),
-                                                   *_Emitter,
+    Assembler(new MCAssembler(Context, TAB,
-                                                   _OS)),
+                              *Emitter_, *TAB.createObjectWriter(OS),
+                              OS)),
     CurSectionData(0)
 {
 }
@@ -32,6 +33,7 @@ MCObjectStreamer::MCObjectStreamer(MCContext &Context, TargetAsmBackend &TAB,
 MCObjectStreamer::~MCObjectStreamer() {
   delete &Assembler->getBackend();
   delete &Assembler->getEmitter();
+  delete &Assembler->getWriter();
   delete Assembler;
 }