Skip to content

Commit 8a310f4

Browse files
rnkrnk
committed
Remove namespace lld { namespace coff { from COFF LLD cpp files
Instead, use `using namespace lld(::coff)`, and fully qualify the names of free functions where they are defined in cpp files. This effectively reverts d79c3be to follow the new style guide added in 236fcbc. Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D74882
1 parent 5517d3b commit 8a310f4

File tree

7 files changed

+36
-60
lines changed

7 files changed

+36
-60
lines changed

‎lld/COFF/DebugTypes.cpp‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020

2121
using namespace llvm;
2222
using namespace llvm::codeview;
23-
24-
namespace lld {
25-
namespace coff {
23+
using namespace lld;
24+
using namespace lld::coff;
2625

2726
namespace {
2827
// The TypeServerSource class represents a PDB type server, a file referenced by
@@ -94,25 +93,27 @@ class UsePrecompSource : public TpiSource {
9493

9594
TpiSource::TpiSource(TpiKind k, const ObjFile *f) : kind(k), file(f) {}
9695

97-
TpiSource *makeTpiSource(const ObjFile *f) {
96+
TpiSource *lld::coff::makeTpiSource(const ObjFile *f) {
9897
return make<TpiSource>(TpiSource::Regular, f);
9998
}
10099

101-
TpiSource *makeUseTypeServerSource(const ObjFile *f,
100+
TpiSource *lld::coff::makeUseTypeServerSource(const ObjFile *f,
102101
const TypeServer2Record *ts) {
103102
TypeServerSource::enqueue(f, *ts);
104103
return make<UseTypeServerSource>(f, ts);
105104
}
106105

107-
TpiSource *makePrecompSource(const ObjFile *f) {
106+
TpiSource *lld::coff::makePrecompSource(const ObjFile *f) {
108107
return make<PrecompSource>(f);
109108
}
110109

111-
TpiSource *makeUsePrecompSource(const ObjFile *f,
110+
TpiSource *lld::coff::makeUsePrecompSource(const ObjFile *f,
112111
const PrecompRecord *precomp) {
113112
return make<UsePrecompSource>(f, precomp);
114113
}
115114

115+
namespace lld {
116+
namespace coff {
116117
template <>
117118
const PrecompRecord &retrieveDependencyInfo(const TpiSource *source) {
118119
assert(source->kind == TpiSource::UsingPCH);
@@ -124,6 +125,8 @@ const TypeServer2Record &retrieveDependencyInfo(const TpiSource *source) {
124125
assert(source->kind == TpiSource::UsingPDB);
125126
return ((const UseTypeServerSource *)source)->typeServerDependency;
126127
}
128+
} // namespace coff
129+
} // namespace lld
127130

128131
std::map<std::string, std::pair<std::string, TypeServerSource *>>
129132
TypeServerSource::instances;
@@ -204,7 +207,8 @@ TypeServerSource::findFromFile(const ObjFile *dependentFile) {
204207

205208
// FIXME: Temporary interface until PDBLinker::maybeMergeTypeServerPDB() is
206209
// moved here.
207-
Expected<llvm::pdb::NativeSession *> findTypeServerSource(const ObjFile *f) {
210+
Expected<llvm::pdb::NativeSession *>
211+
lld::coff::findTypeServerSource(const ObjFile *f) {
208212
Expected<TypeServerSource *> ts = TypeServerSource::findFromFile(f);
209213
if (!ts)
210214
return ts.takeError();
@@ -232,7 +236,7 @@ void TypeServerSource::enqueue(const ObjFile *dependentFile,
232236
// will be merged in. NOTE - a PDB load failure is not a link error: some
233237
// debug info will simply be missing from the final PDB - that is the default
234238
// accepted behavior.
235-
void loadTypeServerSource(llvm::MemoryBufferRef m) {
239+
void lld::coff::loadTypeServerSource(llvm::MemoryBufferRef m) {
236240
std::string path = normalizePdbPath(m.getBufferIdentifier());
237241

238242
Expected<TypeServerSource *> ts = TypeServerSource::getInstance(m);
@@ -259,6 +263,3 @@ Expected<TypeServerSource *> TypeServerSource::getInstance(MemoryBufferRef m) {
259263
return info.takeError();
260264
return make<TypeServerSource>(m, session.release());
261265
}
262-
263-
} // namespace coff
264-
} // namespace lld

‎lld/COFF/InputFiles.cpp‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ using namespace llvm::COFF;
4444
using namespace llvm::codeview;
4545
using namespace llvm::object;
4646
using namespace llvm::support::endian;
47+
using namespace lld;
48+
using namespace lld::coff;
4749

4850
using llvm::Triple;
4951
using llvm::support::ulittle32_t;
5052

51-
namespace lld {
52-
5353
// Returns the last element of a path, which is supposed to be a filename.
5454
static StringRef getBasename(StringRef path) {
5555
return sys::path::filename(path, sys::path::Style::windows);
5656
}
5757

5858
// Returns a string in the format of "foo.obj" or "foo.obj(bar.lib)".
59-
std::string toString(const coff::InputFile *file) {
59+
std::string lld::toString(const coff::InputFile *file) {
6060
if (!file)
6161
return "<internal>";
6262
if (file->parentName.empty() || file->kind() == coff::InputFile::ImportKind)
@@ -67,8 +67,6 @@ std::string toString(const coff::InputFile *file) {
6767
.str();
6868
}
6969

70-
namespace coff {
71-
7270
std::vector<ObjFile *> ObjFile::instances;
7371
std::vector<ImportFile *> ImportFile::instances;
7472
std::vector<BitcodeFile *> BitcodeFile::instances;
@@ -121,7 +119,7 @@ void ArchiveFile::addMember(const Archive::Symbol &sym) {
121119
driver->enqueueArchiveMember(c, sym, getName());
122120
}
123121

124-
std::vector<MemoryBufferRef> getArchiveMembers(Archive *file) {
122+
std::vector<MemoryBufferRef> lld::coff::getArchiveMembers(Archive *file) {
125123
std::vector<MemoryBufferRef> v;
126124
Error err = Error::success();
127125
for (const Archive::Child &c : file->children(err)) {
@@ -967,14 +965,11 @@ MachineTypes BitcodeFile::getMachineType() {
967965
}
968966
}
969967

970-
std::string replaceThinLTOSuffix(StringRef path) {
968+
std::string lld::coff::replaceThinLTOSuffix(StringRef path) {
971969
StringRef suffix = config->thinLTOObjectSuffixReplace.first;
972970
StringRef repl = config->thinLTOObjectSuffixReplace.second;
973971

974972
if (path.consume_back(suffix))
975973
return (path + repl).str();
976974
return std::string(path);
977975
}
978-
979-
} // namespace coff
980-
} // namespace lld

‎lld/COFF/LTO.cpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838

3939
using namespace llvm;
4040
using namespace llvm::object;
41-
42-
namespace lld {
43-
namespace coff {
41+
using namespace lld;
42+
using namespace lld::coff;
4443

4544
// Creates an empty file to and returns a raw_fd_ostream to write to it.
4645
static std::unique_ptr<raw_fd_ostream> openFile(StringRef file) {
@@ -207,6 +206,3 @@ std::vector<StringRef> BitcodeCompiler::compile() {
207206

208207
return ret;
209208
}
210-
211-
} // namespace coff
212-
} // namespace lld

‎lld/COFF/MapFile.cpp‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828

2929
using namespace llvm;
3030
using namespace llvm::object;
31-
32-
namespace lld {
33-
namespace coff {
31+
using namespace lld;
32+
using namespace lld::coff;
3433

3534
using SymbolMapTy =
3635
DenseMap<const SectionChunk *, SmallVector<DefinedRegular *, 4>>;
@@ -87,7 +86,7 @@ getSymbolStrings(ArrayRef<DefinedRegular *> syms) {
8786
return ret;
8887
}
8988

90-
void writeMapFile(ArrayRef<OutputSection *> outputSections) {
89+
void lld::coff::writeMapFile(ArrayRef<OutputSection *> outputSections) {
9190
if (config->mapFile.empty())
9291
return;
9392

@@ -122,6 +121,3 @@ void writeMapFile(ArrayRef<OutputSection *> outputSections) {
122121
}
123122
}
124123
}
125-
126-
} // namespace coff
127-
} // namespace lld

‎lld/COFF/MinGW.cpp‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515

1616
using namespace llvm;
1717
using namespace llvm::COFF;
18-
19-
namespace lld {
20-
namespace coff {
18+
using namespace lld;
19+
using namespace lld::coff;
2120

2221
AutoExporter::AutoExporter() {
2322
excludeLibs = {
@@ -147,7 +146,7 @@ bool AutoExporter::shouldExport(Defined *sym) const {
147146
return !excludeObjects.count(fileName);
148147
}
149148

150-
void writeDefFile(StringRef name) {
149+
void lld::coff::writeDefFile(StringRef name) {
151150
std::error_code ec;
152151
raw_fd_ostream os(name, ec, sys::fs::OF_None);
153152
if (ec)
@@ -165,6 +164,3 @@ void writeDefFile(StringRef name) {
165164
os << "\n";
166165
}
167166
}
168-
169-
} // namespace coff
170-
} // namespace lld

‎lld/COFF/PDB.cpp‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@
6363

6464
using namespace llvm;
6565
using namespace llvm::codeview;
66+
using namespace lld;
67+
using namespace lld::coff;
6668

6769
using llvm::object::coff_section;
6870

69-
namespace lld {
70-
namespace coff {
71-
7271
static ExitOnError exitOnErr;
7372

7473
static Timer totalPdbLinkTimer("PDB Emission (Cumulative)", Timer::root());
@@ -1679,10 +1678,10 @@ void PDBLinker::addImportFilesToPDB(ArrayRef<OutputSection *> outputSections) {
16791678
}
16801679

16811680
// Creates a PDB file.
1682-
void createPDB(SymbolTable *symtab,
1683-
ArrayRef<OutputSection *> outputSections,
1684-
ArrayRef<uint8_t> sectionTable,
1685-
llvm::codeview::DebugInfo *buildId) {
1681+
void lld::coff::createPDB(SymbolTable *symtab,
1682+
ArrayRef<OutputSection *> outputSections,
1683+
ArrayRef<uint8_t> sectionTable,
1684+
llvm::codeview::DebugInfo *buildId) {
16861685
ScopedTimer t1(totalPdbLinkTimer);
16871686
PDBLinker pdb(symtab);
16881687

@@ -1880,7 +1879,7 @@ static bool findLineTable(const SectionChunk *c, uint32_t addr,
18801879
// offset into the given chunk and return them, or None if a line table was
18811880
// not found.
18821881
Optional<std::pair<StringRef, uint32_t>>
1883-
getFileLineCodeView(const SectionChunk *c, uint32_t addr) {
1882+
lld::coff::getFileLineCodeView(const SectionChunk *c, uint32_t addr) {
18841883
ExitOnError exitOnErr;
18851884

18861885
DebugStringTableSubsectionRef cVStrTab;
@@ -1914,6 +1913,3 @@ getFileLineCodeView(const SectionChunk *c, uint32_t addr) {
19141913
StringRef filename = exitOnErr(getFileName(cVStrTab, checksums, *nameIndex));
19151914
return std::make_pair(filename, *lineNumber);
19161915
}
1917-
1918-
} // namespace coff
1919-
} // namespace lld

‎lld/COFF/Writer.cpp‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ using namespace llvm::COFF;
4141
using namespace llvm::object;
4242
using namespace llvm::support;
4343
using namespace llvm::support::endian;
44-
45-
namespace lld {
46-
namespace coff {
44+
using namespace lld;
45+
using namespace lld::coff;
4746

4847
/* To re-generate DOSProgram:
4948
$ cat > /tmp/DOSProgram.asm
@@ -290,7 +289,7 @@ class Writer {
290289
static Timer codeLayoutTimer("Code Layout", Timer::root());
291290
static Timer diskCommitTimer("Commit Output File", Timer::root());
292291

293-
void writeResult() { Writer().run(); }
292+
void lld::coff::writeResult() { Writer().run(); }
294293

295294
void OutputSection::addChunk(Chunk *c) {
296295
chunks.push_back(c);
@@ -1950,6 +1949,3 @@ PartialSection *Writer::findPartialSection(StringRef name, uint32_t outChars) {
19501949
return it->second;
19511950
return nullptr;
19521951
}
1953-
1954-
} // namespace coff
1955-
} // namespace lld

0 commit comments

Comments
 (0)