Skip to content

Commit 0013394

Browse files
committed
Fix broken merge
Essentially applies part of the following commit: commit f1f06f3 Author: Fangrui Song <[email protected]> Date: Mon Mar 25 16:02:34 2024 -0700 [ELF] Move parse files from Driver.cpp to InputFiles.cpp. NFC This brings the declarations/definitions of doParseFile in lld/ELF/InputFiles.{h,cpp} into line with upstream and fixes the compilation error that was introduced in merge bed2789. Change-Id: I0416f06711817fbbbd119797569a1ee04226095e
1 parent 644abbc commit 0013394

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

lld/ELF/InputFiles.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ static bool isCompatible(InputFile *file) {
296296
return false;
297297
}
298298

299-
template <class ELFT> void elf::doParseFile(Ctx &ctx, InputFile *file) {
299+
template <class ELFT> static void doParseFile(Ctx &ctx, InputFile *file) {
300300
if (!isCompatible(file))
301301
return;
302302

lld/ELF/InputFiles.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ class Symbol;
4343
std::optional<MemoryBufferRef> readFile(StringRef path);
4444

4545
// Add symbols in File to the symbol table.
46-
template <class ELFT> void doParseFile(InputFile *file);
4746
void parseFile(Ctx &, InputFile *file);
4847
void parseFiles(Ctx &, const std::vector<InputFile *> &files);
4948

0 commit comments

Comments
 (0)