maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[llvm-jitlink] Don't demote unreferenced definitions in -harness mode." 

This reverts commit e137b55058.

This commit broke a test case. Reverting while I investigate.
This commit is contained in:
Lang Hames 2020-08-13 11:44:42 -07:00
parent 0462aef5f3
commit 759f9a7acd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/tools/llvm-jitlink/llvm-jitlink.cpp
View File

@ -187,7 +187,7 @@ static Error applyHarnessPromotions(Session &S, LinkGraph &G) {
// If this graph is part of the test then promote any symbols referenced by // If this graph is part of the test then promote any symbols referenced by
// the harness to default scope, remove all symbols that clash with harness // the harness to default scope, remove all symbols that clash with harness
// definitions. // definitions, demote all other definitions.
std::vector<Symbol *> DefinitionsToRemove; std::vector<Symbol *> DefinitionsToRemove;
for (auto *Sym : G.defined_symbols()) { for (auto *Sym : G.defined_symbols()) {
@ -219,6 +219,10 @@ static Error applyHarnessPromotions(Session &S, LinkGraph &G) {
} else if (S.HarnessDefinitions.count(Sym->getName())) { } else if (S.HarnessDefinitions.count(Sym->getName())) {
LLVM_DEBUG(dbgs() << " Externalizing " << Sym->getName() << "\n"); LLVM_DEBUG(dbgs() << " Externalizing " << Sym->getName() << "\n");
DefinitionsToRemove.push_back(Sym); DefinitionsToRemove.push_back(Sym);
} else {
LLVM_DEBUG(dbgs() << " Demoting " << Sym->getName() << "\n");
Sym->setScope(Scope::Local);
Sym->setLive(false);
} }
} }
@ -517,8 +521,7 @@ Error LLVMJITLinkObjectLinkingLayer::add(JITDylib &JD,
return SymFlagsOrErr.takeError(); return SymFlagsOrErr.takeError();
// Skip symbols not defined in this object file. // Skip symbols not defined in this object file.
if ((*SymFlagsOrErr & object::BasicSymbolRef::SF_Undefined) || if (*SymFlagsOrErr & object::BasicSymbolRef::SF_Undefined)
!(*SymFlagsOrErr & object::BasicSymbolRef::SF_Global))
continue; continue;
auto Name = Sym.getName(); auto Name = Sym.getName();
@ -548,8 +551,10 @@ Error LLVMJITLinkObjectLinkingLayer::add(JITDylib &JD,
*SymFlags &= ~JITSymbolFlags::Exported; *SymFlags &= ~JITSymbolFlags::Exported;
} else if (S.HarnessExternals.count(*Name)) { } else if (S.HarnessExternals.count(*Name)) {
*SymFlags |= JITSymbolFlags::Exported; *SymFlags |= JITSymbolFlags::Exported;
} else if (S.HarnessDefinitions.count(*Name)) } else {
// Skip symbols that aren't in the HarnessExternals set.
continue; continue;
}
auto InternedName = S.ES.intern(*Name); auto InternedName = S.ES.intern(*Name);
SymbolFlags[InternedName] = std::move(*SymFlags); SymbolFlags[InternedName] = std::move(*SymFlags);