[llvm] 64390b9 - MC: Remove MCAssembler argument from addFileName

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2025-05-25T12:52:35-07:00
New Revision: 64390b9181c3dd886d59a27d2de1452ec854b4f7

URL: https://github.com/llvm/llvm-project/commit/64390b9181c3dd886d59a27d2de1452ec854b4f7
DIFF: https://github.com/llvm/llvm-project/commit/64390b9181c3dd886d59a27d2de1452ec854b4f7.diff

LOG: MC: Remove MCAssembler argument from addFileName

Added: 
    

Modified: 
    llvm/include/llvm/MC/MCObjectWriter.h
    llvm/lib/MC/MCObjectStreamer.cpp
    llvm/lib/MC/MCObjectWriter.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/MC/MCObjectWriter.h b/llvm/include/llvm/MC/MCObjectWriter.h
index 0d5630749e042..19530d2f651a6 100644
--- a/llvm/include/llvm/MC/MCObjectWriter.h
+++ b/llvm/include/llvm/MC/MCObjectWriter.h
@@ -97,7 +97,7 @@ class MCObjectWriter {
   MutableArrayRef<std::pair<std::string, size_t>> getFileNames() {
     return FileNames;
   }
-  void addFileName(MCAssembler &Asm, StringRef FileName);
+  void addFileName(StringRef FileName);
   void setCompilerVersion(StringRef CompilerVers) {
     CompilerVersion = CompilerVers;
   }

diff  --git a/llvm/lib/MC/MCObjectStreamer.cpp b/llvm/lib/MC/MCObjectStreamer.cpp
index 816c60bfdc5db..20938c0268fec 100644
--- a/llvm/lib/MC/MCObjectStreamer.cpp
+++ b/llvm/lib/MC/MCObjectStreamer.cpp
@@ -753,7 +753,7 @@ void MCObjectStreamer::emitNops(int64_t NumBytes, int64_t ControlledNopLength,
 
 void MCObjectStreamer::emitFileDirective(StringRef Filename) {
   MCAssembler &Asm = getAssembler();
-  Asm.getWriter().addFileName(Asm, Filename);
+  Asm.getWriter().addFileName(Filename);
 }
 
 void MCObjectStreamer::emitFileDirective(StringRef Filename,
@@ -761,7 +761,7 @@ void MCObjectStreamer::emitFileDirective(StringRef Filename,
                                          StringRef TimeStamp,
                                          StringRef Description) {
   MCObjectWriter &W = getAssembler().getWriter();
-  W.addFileName(getAssembler(), Filename);
+  W.addFileName(Filename);
   if (CompilerVersion.size())
     W.setCompilerVersion(CompilerVersion);
   // TODO: add TimeStamp and Description to .file symbol table entry

diff  --git a/llvm/lib/MC/MCObjectWriter.cpp b/llvm/lib/MC/MCObjectWriter.cpp
index 3e1f0026ea3ec..86be52d57ef7a 100644
--- a/llvm/lib/MC/MCObjectWriter.cpp
+++ b/llvm/lib/MC/MCObjectWriter.cpp
@@ -51,8 +51,8 @@ bool MCObjectWriter::isSymbolRefDifferenceFullyResolvedImpl(
   return &SecA == &SecB;
 }
 
-void MCObjectWriter::addFileName(MCAssembler &Asm, StringRef FileName) {
-  FileNames.emplace_back(std::string(FileName), Asm.Symbols.size());
+void MCObjectWriter::addFileName(StringRef FileName) {
+  FileNames.emplace_back(std::string(FileName), Asm->Symbols.size());
 }
 
 MCContext &MCObjectTargetWriter::getContext() const {