[NFC][ELF] Remove redundant and unused file argument from deleteFallThruJmpInsn (#180540)

jrtc27 · web-flow · commit 20d3aa944fb5 · 2026-02-09T18:57:42.000Z
This was added in 9431787 ("LLD Support for Basic Block Sections") and was only ever used for getRelocTargetVA. It was always redundant even back then, as it was always the same as is.file, and so passing it separately made it confusing and less obvious which file it was referring to, but 2b5cb1b ("[ELF] getRelocTargetVA: pass Ctx and Relocation. NFC") removed that one use so it is now completely unused. Remove it, and if anyone ever finds a need for it, they can just use is.file like should have been done in the first place.
diff --git a/lld/ELF/Arch/X86_64.cpp b/lld/ELF/Arch/X86_64.cpp
@@ -47,7 +47,7 @@ class X86_64 : public TargetInfo {
   void relocateAlloc(InputSection &sec, uint8_t *buf) const override;
   bool adjustPrologueForCrossSplitStack(uint8_t *loc, uint8_t *end,
                                         uint8_t stOther) const override;
-  bool deleteFallThruJmpInsn(InputSection &is, InputFile *file,
+  bool deleteFallThruJmpInsn(InputSection &is,
                              InputSection *nextIS) const override;
   bool relaxOnce(int pass) const override;
   void applyBranchToBranchOpt() const override;
@@ -184,8 +184,8 @@ static bool isRelocationForJmpInsn(Relocation &R) {
 // next section.
 // TODO: Delete this once psABI reserves a new relocation type for fall thru
 // jumps.
-static bool isFallThruRelocation(InputSection &is, InputFile *file,
-                                 InputSection *nextIS, Relocation &r) {
+static bool isFallThruRelocation(InputSection &is, InputSection *nextIS,
+                                 Relocation &r) {
   if (!isRelocationForJmpInsn(r))
     return false;
 
@@ -246,7 +246,7 @@ static JmpInsnOpcode invertJmpOpcode(const JmpInsnOpcode opcode) {
 //   10: je bar  #jne flipped to je and the jmp is deleted.
 // aa.BB.foo:
 //   ...
-bool X86_64::deleteFallThruJmpInsn(InputSection &is, InputFile *file,
+bool X86_64::deleteFallThruJmpInsn(InputSection &is,
                                    InputSection *nextIS) const {
   const unsigned sizeOfDirectJmpInsn = 5;
 
@@ -270,7 +270,7 @@ bool X86_64::deleteFallThruJmpInsn(InputSection &is, InputFile *file,
   if (*(secContents + r.offset - 1) != 0xe9)
     return false;
 
-  if (isFallThruRelocation(is, file, nextIS, r)) {
+  if (isFallThruRelocation(is, nextIS, r)) {
     // This is a fall thru and can be deleted.
     r.expr = R_NONE;
     r.offset = 0;
@@ -297,7 +297,7 @@ bool X86_64::deleteFallThruJmpInsn(InputSection &is, InputFile *file,
   if (jmpOpcodeB == J_UNKNOWN)
     return false;
 
-  if (!isFallThruRelocation(is, file, nextIS, rB))
+  if (!isFallThruRelocation(is, nextIS, rB))
     return false;
 
   // jmpCC jumps to the fall thru block, the branch can be flipped and the
diff --git a/lld/ELF/Target.h b/lld/ELF/Target.h
@@ -124,7 +124,7 @@ class TargetInfo {
   // jump consecutively, it tries to flip the conditional jump to convert the
   // direct jump into a fall thru and delete it.  Returns true if a jump
   // instruction can be deleted.
-  virtual bool deleteFallThruJmpInsn(InputSection &is, InputFile *file,
+  virtual bool deleteFallThruJmpInsn(InputSection &is,
                                      InputSection *nextIS) const {
     return false;
   }
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
@@ -1742,7 +1742,7 @@ template <class ELFT> void Writer<ELFT>::optimizeBasicBlockJumps() {
     for (size_t i = 0, e = sections.size(); i != e; ++i) {
       InputSection *next = i + 1 < sections.size() ? sections[i + 1] : nullptr;
       InputSection &sec = *sections[i];
-      numDeleted += ctx.target->deleteFallThruJmpInsn(sec, sec.file, next);
+      numDeleted += ctx.target->deleteFallThruJmpInsn(sec, next);
     }
     if (numDeleted > 0) {
       ctx.script->assignAddresses();

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ class TargetInfo {`
`124`	`124`	`// jump consecutively, it tries to flip the conditional jump to convert the`
`125`	`125`	`// direct jump into a fall thru and delete it. Returns true if a jump`
`126`	`126`	`// instruction can be deleted.`
`127`		`- virtual bool deleteFallThruJmpInsn(InputSection &is, InputFile *file,`
	`127`	`+ virtual bool deleteFallThruJmpInsn(InputSection &is,`
`128`	`128`	`InputSection *nextIS) const {`
`129`	`129`	`return false;`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1742,7 +1742,7 @@ template <class ELFT> void Writer<ELFT>::optimizeBasicBlockJumps() {`
`1742`	`1742`	`for (size_t i = 0, e = sections.size(); i != e; ++i) {`
`1743`	`1743`	`InputSection *next = i + 1 < sections.size() ? sections[i + 1] : nullptr;`
`1744`	`1744`	`InputSection &sec = *sections[i];`
`1745`		`- numDeleted += ctx.target->deleteFallThruJmpInsn(sec, sec.file, next);`
	`1745`	`+ numDeleted += ctx.target->deleteFallThruJmpInsn(sec, next);`
`1746`	`1746`	`}`
`1747`	`1747`	`if (numDeleted > 0) {`
`1748`	`1748`	`ctx.script->assignAddresses();`