Revert "MCAssembler::layout: remove the unused MCAsmLayout parameter"

This reverts commit 63ec52f.

Author: dcci

bolt/lib/Core/BinaryContext.cpp

@@ -20,6 +20,7 @@
 #include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"
 #include "llvm/DebugInfo/DWARF/DWARFFormValue.h"
 #include "llvm/DebugInfo/DWARF/DWARFUnit.h"
+#include "llvm/MC/MCAsmLayout.h"
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCDisassembler/MCDisassembler.h"
@@ -2415,7 +2416,8 @@ BinaryContext::calculateEmittedSize(BinaryFunction &BF, bool FixBranches) {
 
   MCAssembler &Assembler =
       static_cast<MCObjectStreamer *>(Streamer.get())->getAssembler();
-  Assembler.layout();
+  MCAsmLayout Layout(Assembler);
+  Assembler.layout(Layout);
 
   // Obtain fragment sizes.
   std::vector<uint64_t> FragmentSizes;

llvm/include/llvm/MC/MCAssembler.h

@@ -46,6 +46,7 @@ class MCRelaxableFragment;
 class MCSymbolRefExpr;
 class raw_ostream;
 class MCAsmBackend;
+class MCAsmLayout;
 class MCContext;
 class MCCodeEmitter;
 class MCFragment;
@@ -340,7 +341,7 @@ class MCAssembler {
   void Finish();
 
   // Layout all section and prepare them for emission.
-  void layout();
+  void layout(MCAsmLayout &Layout);
 
   // FIXME: This does not belong here.
   bool getSubsectionsViaSymbols() const { return SubsectionsViaSymbols; }

llvm/lib/MC/MCAssembler.cpp

@@ -15,6 +15,7 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/MC/MCAsmBackend.h"
 #include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/MCAsmLayout.h"
 #include "llvm/MC/MCCodeEmitter.h"
 #include "llvm/MC/MCCodeView.h"
 #include "llvm/MC/MCContext.h"
@@ -936,7 +937,7 @@ MCAssembler::handleFixup(MCFragment &F, const MCFixup &Fixup,
   return std::make_tuple(Target, FixedValue, IsResolved);
 }
 
-void MCAssembler::layout() {
+void MCAssembler::layout(MCAsmLayout &Layout) {
   assert(getBackendPtr() && "Expected assembler backend");
   DEBUG_WITH_TYPE("mc-dump", {
       errs() << "assembler backend - pre-layout\n--\n";
@@ -1073,7 +1074,9 @@ void MCAssembler::layout() {
 }
 
 void MCAssembler::Finish() {
-  layout();
+  // Create the layout object.
+  MCAsmLayout Layout(*this);
+  layout(Layout);
 
   // Write the object file.
   stats::ObjectBytes += getWriter().writeObject(*this);

llvm/lib/MC/MCExpr.cpp

@@ -12,6 +12,7 @@
 #include "llvm/Config/llvm-config.h"
 #include "llvm/MC/MCAsmBackend.h"
 #include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/MCAsmLayout.h"
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCObjectWriter.h"

llvm/tools/dsymutil/MachOUtils.cpp

@@ -12,6 +12,7 @@
 #include "LinkUtils.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/CodeGen/NonRelocatableStringpool.h"
+#include "llvm/MC/MCAsmLayout.h"
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCMachObjectWriter.h"
 #include "llvm/MC/MCObjectStreamer.h"
@@ -380,7 +381,8 @@ bool generateDsymCompanion(
   auto &Writer = static_cast<MachObjectWriter &>(MCAsm.getWriter());
 
   // Layout but don't emit.
-  MCAsm.layout();
+  MCAsmLayout Layout(MCAsm);
+  MCAsm.layout(Layout);
 
   BinaryHolder InputBinaryHolder(VFS, false);