Skip to content

Commit ca3488c

Browse files
committed
cleanup
Revert "add logs for tracing" Revert "application test"
1 parent 54a7109 commit ca3488c

File tree

6 files changed

+2
-391
lines changed

6 files changed

+2
-391
lines changed

lld/COFF/Chunks.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -566,11 +566,6 @@ void SectionChunk::getBaserels(std::vector<Baserel> *res) {
566566
Symbol *target = file->getSymbol(rel.SymbolTableIndex);
567567
if (!isa_and_nonnull<Defined>(target) || isa<DefinedAbsolute>(target))
568568
continue;
569-
if (target && target->getName().size() > 2)
570-
Log(file->symtab.ctx)
571-
<< "base reloc for " << target->getName() << ": " << target->kind()
572-
<< ',' << !!target->isUsedInRegularObj << " (in " << file->getName()
573-
<< ")";
574569
res->emplace_back(rva + rel.VirtualAddress, ty);
575570
}
576571

lld/COFF/MinGW.cpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,6 @@ void lld::coff::addWrappedSymbols(SymbolTable &symtab,
226226
Symbol *sym = symtab.findUnderscore(name);
227227
if (!sym)
228228
continue;
229-
Log(symtab.ctx) << "adding wrapped symbol entry for: " << name << ": "
230-
<< sym->kind() << ',' << !!sym->isUsedInRegularObj;
231229

232230
Symbol *real =
233231
symtab.addUndefined(mangle("__real_" + name, symtab.machine));
@@ -238,12 +236,10 @@ void lld::coff::addWrappedSymbols(SymbolTable &symtab,
238236
if (auto *usym = dyn_cast<Undefined>(sym)) {
239237
if (auto *ureal = dyn_cast<Undefined>(real);
240238
ureal && ureal->weakAlias && !usym->weakAlias) {
241-
Log(symtab.ctx) << "inheriting weak alias to: " << usym->getName();
242239
usym->weakAlias = ureal->weakAlias;
243240
}
244241
if (auto *uwrap = dyn_cast<Undefined>(wrap);
245242
uwrap && usym->weakAlias && !uwrap->weakAlias) {
246-
Log(symtab.ctx) << "inheriting weak alias to: " << uwrap->getName();
247243
uwrap->weakAlias = usym->weakAlias;
248244
}
249245
}
@@ -278,8 +274,6 @@ void lld::coff::wrapSymbols(SymbolTable &symtab) {
278274
map[w.sym] = w.wrap;
279275
map[w.real] = w.sym;
280276
if (Defined *d = dyn_cast<Defined>(w.wrap)) {
281-
Log(symtab.ctx) << "checking for importing with unwrapping: "
282-
<< d->getName();
283277
Symbol *imp = symtab.find(("__imp_" + w.sym->getName()).str());
284278
// Create a new defined local import for the wrap symbol. If
285279
// no imp prefixed symbol existed, there's no need for it.
@@ -288,12 +282,8 @@ void lld::coff::wrapSymbols(SymbolTable &symtab) {
288282
if (imp) {
289283
if (Symbol *wrapimp =
290284
symtab.find(("__imp_" + w.wrap->getName()).str())) {
291-
Log(symtab.ctx) << "using unwrapped imported symbol: "
292-
<< imp->getName();
293285
map[imp] = wrapimp;
294286
} else {
295-
Log(symtab.ctx) << "create local unwrapped imported symbol: "
296-
<< imp->getName();
297287
DefinedLocalImport *localwrapimp = make<DefinedLocalImport>(
298288
symtab.ctx, saver().save("__imp_" + w.wrap->getName()), d);
299289
symtab.localImportChunks.push_back(localwrapimp->getChunk());
@@ -307,10 +297,7 @@ void lld::coff::wrapSymbols(SymbolTable &symtab) {
307297
parallelForEach(symtab.ctx.objFileInstances, [&](ObjFile *file) {
308298
MutableArrayRef<Symbol *> syms = file->getMutableSymbols();
309299
for (auto &sym : syms)
310-
if (Symbol *s = map.lookup(sym)) {
311-
Log(symtab.ctx) << "overriding " << sym->getName() << " by "
312-
<< s->getName() << " (in " << file->getName() << ")";
300+
if (Symbol *s = map.lookup(sym))
313301
sym = s;
314-
}
315302
});
316303
}

lld/COFF/SymbolTable.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,6 @@ void SymbolTable::loadMinGWSymbols() {
257257
}
258258

259259
for (auto sym : undefs) {
260-
Log(ctx) << "trying fixup " << sym->getName() << ": " << sym->kind() << ','
261-
<< !!sym->isUsedInRegularObj;
262260
auto *undef = dyn_cast<Undefined>(sym);
263261
if (!undef)
264262
continue;
@@ -461,13 +459,6 @@ void SymbolTable::resolveRemainingUndefines(std::vector<Undefined *> &aliases) {
461459

462460
for (auto &i : symMap) {
463461
Symbol *sym = i.second;
464-
465-
if (auto name = sym->getName(); !name.ends_with("__") &&
466-
!name.starts_with("__guard") &&
467-
!name.starts_with("__nm_"))
468-
Log(ctx) << "checking for " << name << ": " << sym->kind()
469-
<< " used: " << (sym->isUsedInRegularObj != 0);
470-
471462
auto *undef = dyn_cast<Undefined>(sym);
472463
if (!undef)
473464
continue;
@@ -534,7 +525,6 @@ void SymbolTable::resolveRemainingUndefines(std::vector<Undefined *> &aliases) {
534525
}
535526

536527
std::pair<Symbol *, bool> SymbolTable::insert(StringRef name) {
537-
Log(ctx) << "inserting " << name;
538528
bool inserted = false;
539529
Symbol *&sym = symMap[CachedHashStringRef(name)];
540530
if (!sym) {

lld/COFF/Symbols.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Symbol {
5656
DefinedAbsoluteKind,
5757
DefinedSyntheticKind,
5858

59-
UndefinedKind, // = 7
59+
UndefinedKind,
6060
LazyArchiveKind,
6161
LazyObjectKind,
6262
LazyDLLSymbolKind,

lld/COFF/Writer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,6 @@ void Writer::createImportTables() {
12991299
<< file->symtab.printSymbol(impSym);
13001300
delayIdata.add(impSym);
13011301
} else {
1302-
Log(ctx) << "populating import entry for " << impSym->getName();
13031302
idata.add(impSym);
13041303
}
13051304
}

0 commit comments

Comments
 (0)