Skip to content

Commit f729c09

Browse files
committed
MC: Inline createMachObjectWriter into MCAsmBackend
We could do the same to COFF once WinCOFFObjectWriter is cleaned up (#100303).
1 parent 3902710 commit f729c09

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

llvm/include/llvm/MC/MCMachObjectWriter.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -353,18 +353,6 @@ class MachObjectWriter final : public MCObjectWriter {
353353

354354
uint64_t writeObject(MCAssembler &Asm) override;
355355
};
356-
357-
/// Construct a new Mach-O writer instance.
358-
///
359-
/// This routine takes ownership of the target writer subclass.
360-
///
361-
/// \param MOTW - The target specific Mach-O writer subclass.
362-
/// \param OS - The stream to write to.
363-
/// \returns The constructed object writer.
364-
std::unique_ptr<MCObjectWriter>
365-
createMachObjectWriter(std::unique_ptr<MCMachObjectTargetWriter> MOTW,
366-
raw_pwrite_stream &OS, bool IsLittleEndian);
367-
368356
} // end namespace llvm
369357

370358
#endif // LLVM_MC_MCMACHOBJECTWRITER_H

llvm/lib/MC/MCAsmBackend.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ MCAsmBackend::createObjectWriter(raw_pwrite_stream &OS) const {
3535
bool IsLE = Endian == llvm::endianness::little;
3636
switch (TW->getFormat()) {
3737
case Triple::MachO:
38-
return createMachObjectWriter(cast<MCMachObjectTargetWriter>(std::move(TW)),
39-
OS, IsLE);
38+
return std::make_unique<MachObjectWriter>(
39+
cast<MCMachObjectTargetWriter>(std::move(TW)), OS, IsLE);
4040
case Triple::COFF:
4141
return createWinCOFFObjectWriter(
4242
cast<MCWinCOFFObjectTargetWriter>(std::move(TW)), OS);

llvm/lib/MC/MachObjectWriter.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,10 +1108,3 @@ uint64_t MachObjectWriter::writeObject(MCAssembler &Asm) {
11081108

11091109
return NumBytesWritten();
11101110
}
1111-
1112-
std::unique_ptr<MCObjectWriter>
1113-
llvm::createMachObjectWriter(std::unique_ptr<MCMachObjectTargetWriter> MOTW,
1114-
raw_pwrite_stream &OS, bool IsLittleEndian) {
1115-
return std::make_unique<MachObjectWriter>(std::move(MOTW), OS,
1116-
IsLittleEndian);
1117-
}

0 commit comments

Comments
 (0)