Skip to content

[cling] Keep deferred decls #456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Axel-Naumann wants to merge 3 commits into from
Closed

[cling] Keep deferred decls #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ad0cdf
Do not remove DeferredDecls when they become EmittedDeferredDecls.
Axel-Naumann Mar 3, 2017
0e9172b
We can now remove leftover symbols.
Axel-Naumann Mar 6, 2017
89b3b13
Rip out EmittedDeferredDecls; decls are now kept in DeferredDecls.
Axel-Naumann Mar 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion interpreter/llvm/src/lib/Transforms/IPO/Inliner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ bool Inliner::inlineCalls(CallGraphSCC &SCC) {

// If we inlined or deleted the last possible call site to the function,
// delete the function body now.
if (false && Callee && Callee->use_empty() && Callee->hasLocalLinkage() &&
if (Callee && Callee->use_empty() && Callee->hasLocalLinkage() &&
// TODO: Can remove if in SCC now.
!SCCFunctions.count(Callee) &&

Expand Down
6 changes: 2 additions & 4 deletions interpreter/llvm/src/tools/clang/lib/CodeGen/CodeGenModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,8 +1970,7 @@ CodeGenModule::GetOrCreateLLVMFunction(StringRef MangledName,
// DeferredDeclsToEmit list, and remove it from DeferredDecls (since we
// don't need it anymore).
addDeferredDeclToEmit(F, DDI->second);
EmittedDeferredDecls[F] = std::make_pair(DDI->first, DDI->second);
DeferredDecls.erase(DDI);
//DeferredDecls.erase(DDI);

// Otherwise, there are cases we have to worry about where we're
// using a declaration for which we must emit a definition but where
Expand Down Expand Up @@ -2168,8 +2167,7 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName,
// Move the potentially referenced deferred decl to the DeferredDeclsToEmit
// list, and remove it from DeferredDecls (since we don't need it anymore).
addDeferredDeclToEmit(GV, DDI->second);
EmittedDeferredDecls[GV] = std::make_pair(DDI->first, DDI->second);
DeferredDecls.erase(DDI);
//DeferredDecls.erase(DDI);
}

// Handle things which are present even on external declarations.
Expand Down
8 changes: 0 additions & 8 deletions interpreter/llvm/src/tools/clang/lib/CodeGen/CodeGenModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,6 @@ class CodeGenModule : public CodeGenTypeCache {
DeferredDeclsToEmit.emplace_back(GV, GD);
}

/// Enables unloading of emitted symbols that need to become deferred.
/// Key is the emitted definition, value is symbol name + Decl created
/// while marking this deferred, i.e. the content of DeferredDecls.
std::unordered_map<llvm::GlobalValue*,
std::pair<llvm::StringRef, GlobalDecl>>
EmittedDeferredDecls;


/// List of alias we have emitted. Used to make sure that what they point to
/// is defined once we get to the end of the of the translation unit.
std::vector<GlobalDecl> Aliases;
Expand Down
30 changes: 7 additions & 23 deletions interpreter/llvm/src/tools/clang/lib/CodeGen/ModuleBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@ namespace clang {
&& "Newly created module should not have weakRefRefs");
Builder->WeakRefReferences.swap(OldBuilder->WeakRefReferences);

Builder->EmittedDeferredDecls.swap(OldBuilder->EmittedDeferredDecls);

return M.get();
}

Expand Down Expand Up @@ -287,27 +285,13 @@ namespace clang {
}
}

if (GV->isWeakForLinker()) {
if (!GV->isDeclaration()) {
// This is a definition. If if was emitted as deferred, move it
// back into deferred state.
auto IEmittedDeferredDecl
= Builder->EmittedDeferredDecls.find(GV);
if (IEmittedDeferredDecl != Builder->EmittedDeferredDecls.end()) {
// Use the name of the original GV, not that of our definition
// that's soon to be erased.
Builder->DeferredDecls[IEmittedDeferredDecl->second.first]
= IEmittedDeferredDecl->second.second;
Builder->EmittedDeferredDecls.erase(IEmittedDeferredDecl);
}
} else {
// might be an entry in the deferred decls, if so: remove!
auto IDeferredDecl = Builder->DeferredDecls.find(GV->getName());
if (IDeferredDecl != Builder->DeferredDecls.end()) {
// yes, pointer comparison.
if (IDeferredDecl->first.data() == GV->getName().data())
Builder->DeferredDecls.erase(IDeferredDecl);
}
if (GV->isWeakForLinker() && GV->isDeclaration()) {
// might be an entry in the deferred decls, if so: remove!
auto IDeferredDecl = Builder->DeferredDecls.find(GV->getName());
if (IDeferredDecl != Builder->DeferredDecls.end()) {
// yes, pointer comparison.
if (IDeferredDecl->first.data() == GV->getName().data())
Builder->DeferredDecls.erase(IDeferredDecl);
}
}
}
Expand Down