This is an archive of the discontinued LLVM Phabricator instance.

Differential D18719

setUsedInRegulawrObj and MustBeInDynSym fixes
AbandonedPublic

Authored by pcc on Apr 1 2016, 5:10 PM.

Details

Reviewers
davide
• rafael
Summary

WIP.

Diff Detail

Event Timeline

pcc updated this revision to Diff 52449.Apr 1 2016, 5:10 PM
pcc retitled this revision from to setUsedInRegulawrObj and MustBeInDynSym fixes.
pcc updated this object.
pcc added reviewers: davide, • rafael.
pcc added a subscriber: llvm-commits.
ruiu added a subscriber: ruiu.Apr 2 2016, 8:25 AM
ruiu added inline comments.
ELF/SymbolTable.cpp
102–103

Please use real types instead of auto.

ELF/Symbols.cpp
188

Now we can make SymbolBody::compare non-template function? (You can do that in a follow-up patch.)

pcc abandoned this revision.Apr 4 2016, 5:44 PM

Obsoleted by D18780 and D18781.

ELF/SymbolTable.cpp
102–103

This part is (I believe) redundant with Davide's r265208.

ELF/Symbols.cpp
188

D18781

davide edited edge metadata.Apr 4 2016, 5:47 PM
In D18719#391920, @pcc wrote:

Obsoleted by D18780 and D18781.

Yes it is.

ELF/SymbolTable.cpp
102–103

Yes it is.

Revision Contents

PathSize
ELF/
5 lines
2 lines

Diff 52449

ELF/SymbolTable.cpp

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines
} }
template <class ELFT> void SymbolTable<ELFT>::addCombinedLtoObject() { template <class ELFT> void SymbolTable<ELFT>::addCombinedLtoObject() {
if (BitcodeFiles.empty()) if (BitcodeFiles.empty())
return; return;
// Compile bitcode files. // Compile bitcode files.
Lto.reset(new BitcodeCompiler); Lto.reset(new BitcodeCompiler);
for (auto &F : ObjectFiles)
for (auto S : F->getSymbols())
ruiuUnsubmitted
Not Done
ReplyInline Actions

Please use real types instead of auto.

ruiu: Please use real types instead of `auto`.
pccAuthorUnsubmitted
Not Done
ReplyInline Actions

This part is (I believe) redundant with Davide's r265208.

pcc: This part is (I believe) redundant with Davide's r265208.
davideUnsubmitted
Not Done
ReplyInline Actions

Yes it is.

davide: Yes it is.
S->repl().setUsedInRegularObj();
for (const std::unique_ptr<BitcodeFile> &F : BitcodeFiles) for (const std::unique_ptr<BitcodeFile> &F : BitcodeFiles)
Lto->add(*F); Lto->add(*F);
std::unique_ptr<InputFile> IF = Lto->compile(); std::unique_ptr<InputFile> IF = Lto->compile();
ObjectFile<ELFT> *Obj = cast<ObjectFile<ELFT>>(IF.release()); ObjectFile<ELFT> *Obj = cast<ObjectFile<ELFT>>(IF.release());
// Replace bitcode symbols. // Replace bitcode symbols.
llvm::DenseSet<StringRef> DummyGroups; llvm::DenseSet<StringRef> DummyGroups;
Obj->parse(DummyGroups); Obj->parse(DummyGroups);
for (SymbolBody *Body : Obj->getNonLocalSymbols()) { for (SymbolBody *Body : Obj->getNonLocalSymbols()) {
Symbol *Sym = insert(Body); Symbol *Sym = insert(Body);
Sym->Body->setUsedInRegularObj(); Sym->Body->setUsedInRegularObj();
if (!Sym->Body->isUndefined() && Body->isUndefined()) if (!Sym->Body->isUndefined() && Body->isUndefined())
continue; continue;
if (Sym->Body->MustBeInDynSym)
Body->MustBeInDynSym = true;
Sym->Body = Body; Sym->Body = Body;
} }
ObjectFiles.emplace_back(Obj); ObjectFiles.emplace_back(Obj);
} }
// Add an undefined symbol. // Add an undefined symbol.
template <class ELFT> template <class ELFT>
SymbolBody *SymbolTable<ELFT>::addUndefined(StringRef Name) { SymbolBody *SymbolTable<ELFT>::addUndefined(StringRef Name) {
▲ Show 20 Lines • Show All 197 Lines • Show Last 20 Lines

ELF/Symbols.cpp

Show First 20 Lines • Show All 179 Lines • ▼ Show 20 Linestemplate <class ELFT> int SymbolBody::compare(SymbolBody *Other) {
if (IsUsedInRegularObj || Other->IsUsedInRegularObj) if (IsUsedInRegularObj || Other->IsUsedInRegularObj)
IsUsedInRegularObj = Other->IsUsedInRegularObj = true; IsUsedInRegularObj = Other->IsUsedInRegularObj = true;
// We want to export all symbols that exist both in the executable // We want to export all symbols that exist both in the executable
// and in DSOs, so that the symbols in the executable can interrupt // and in DSOs, so that the symbols in the executable can interrupt
// symbols in the DSO at runtime. // symbols in the DSO at runtime.
if (isShared() != Other->isShared()) if (isShared() != Other->isShared())
if (isa<DefinedRegular<ELFT>>(isShared() ? Other : this)) if (isa<Defined>(isShared() ? Other : this))
ruiuUnsubmitted
Not Done
ReplyInline Actions

Now we can make SymbolBody::compare non-template function? (You can do that in a follow-up patch.)

ruiu: Now we can make SymbolBody::compare non-template function? (You can do that in a follow-up…
pccAuthorUnsubmitted
Not Done
ReplyInline Actions

D18781

pcc: D18781
MustBeInDynSym = Other->MustBeInDynSym = true; MustBeInDynSym = Other->MustBeInDynSym = true;
if (L != R) if (L != R)
return -1; return -1;
if (!isDefined() || isShared() || isWeak()) if (!isDefined() || isShared() || isWeak())
return 1; return 1;
if (!isCommon() && !Other->isCommon()) if (!isCommon() && !Other->isCommon())
return 0; return 0;
▲ Show 20 Lines • Show All 132 Lines • Show Last 20 Lines