diff options
| author | Fangrui Song <i@maskray.me> | 2024-07-02 16:56:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-02 16:56:35 -0700 |
| commit | 35668e2c9cb1a09fac1773dfc62fcd892b358294 (patch) | |
| tree | 3be828272f9a6a6b2d4cc887da663a0b25cb2d65 /llvm/lib | |
| parent | a1c4926dd0ffbc3be8b27b159d8b1978b2ee9411 (diff) | |
| download | llvm-35668e2c9cb1a09fac1773dfc62fcd892b358294.zip llvm-35668e2c9cb1a09fac1773dfc62fcd892b358294.tar.gz llvm-35668e2c9cb1a09fac1773dfc62fcd892b358294.tar.bz2 | |
Remove llvm/MC/MCAsmLayout.h and the unused parameter in MCAssembler::layout
This restores 63ec52f867ada8d841dd872acf3d0cb62e2a99e8 and
46f7929879a59ec72dc75679b4201e2d314efba9, NFC changes that were
unnecessarily reverted.
This completes the work that merges MCAsmLayout into MCAssembler.
Pull Request: https://github.com/llvm/llvm-project/pull/97449
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/MC/MCAssembler.cpp | 7 | ||||
| -rw-r--r-- | llvm/lib/MC/MCExpr.cpp | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp index 2fe4a3c..14790f5 100644 --- a/llvm/lib/MC/MCAssembler.cpp +++ b/llvm/lib/MC/MCAssembler.cpp @@ -15,7 +15,6 @@ #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 +935,7 @@ MCAssembler::handleFixup(MCFragment &F, const MCFixup &Fixup, return std::make_tuple(Target, FixedValue, IsResolved); } -void MCAssembler::layout(MCAsmLayout &Layout) { +void MCAssembler::layout() { assert(getBackendPtr() && "Expected assembler backend"); DEBUG_WITH_TYPE("mc-dump", { errs() << "assembler backend - pre-layout\n--\n"; @@ -1073,9 +1072,7 @@ void MCAssembler::layout(MCAsmLayout &Layout) { } void MCAssembler::Finish() { - // Create the layout object. - MCAsmLayout Layout(*this); - layout(Layout); + layout(); // Write the object file. stats::ObjectBytes += getWriter().writeObject(*this); diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp index 0a175ade..b42a668 100644 --- a/llvm/lib/MC/MCExpr.cpp +++ b/llvm/lib/MC/MCExpr.cpp @@ -12,7 +12,6 @@ #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" |