6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-19 02:25:01 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Linker: Drop superseded subprograms"

Browse Source 
This reverts commit r224389.  Based on feedback from the bots, the
assertion seems to be going off *more* often, not less (previously I was
just seeing it in an internal bootstrap, now it's happening in public
builds too).

http://lab.llvm.org:8080/green/job/clang-stage2-configure-Rlto_build/936/
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/5325

Reverting in order to investigate.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224416 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith
2014-12-17 07:27:31 +00:00
parent 5fa882a5b7
commit 80c5783c88
3 changed files with 0 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/Linker/LinkModules.cpp
View File

@@ -19,7 +19,6 @@
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/IR/Constants.h"
#include "llvm/IR/DebugInfo.h"
#include "llvm/IR/DiagnosticInfo.h"
#include "llvm/IR/DiagnosticPrinter.h"
#include "llvm/IR/LLVMContext.h"
@@ -417,9 +416,6 @@ class ModuleLinker {
// Vector of GlobalValues to lazily link in.
std::vector<GlobalValue *> LazilyLinkGlobalValues;
/// Functions that have replaced other functions.
SmallPtrSet<const Function *, 16> OverridingFunctions;
Linker::DiagnosticHandlerFunction DiagnosticHandler;
public:
@@ -498,7 +494,6 @@ private:
bool linkGlobalValueBody(GlobalValue &Src);
void linkNamedMDNodes();
void stripReplacedSubprograms();
};
}
@@ -1083,10 +1078,6 @@ bool ModuleLinker::linkGlobalValueProto(GlobalValue *SGV) {
}
NewGV = copyGlobalValueProto(TypeMap, *DstM, SGV);
if (DGV && isa<Function>(DGV))
if (auto *NewF = dyn_cast<Function>(NewGV))
OverridingFunctions.insert(NewF);
}
NewGV->setUnnamedAddr(HasUnnamedAddr);
@@ -1253,48 +1244,6 @@ void ModuleLinker::linkNamedMDNodes() {
}
}
/// Drop DISubprograms that have been superseded.
///
/// FIXME: this creates an asymmetric result: we strip losing subprograms from
/// DstM, but leave losing subprograms in SrcM. Instead we should also strip
/// losers from SrcM, but this requires extra plumbing in MapValue.
void ModuleLinker::stripReplacedSubprograms() {
// Avoid quadratic runtime by returning early when there's nothing to do.
if (OverridingFunctions.empty())
return;
// Move the functions now, so the set gets cleared even on early returns.
auto Functions = std::move(OverridingFunctions);
OverridingFunctions.clear();
// Drop subprograms whose functions have been overridden by the new compile
// unit.
NamedMDNode *CompileUnits = DstM->getNamedMetadata("llvm.dbg.cu");
if (!CompileUnits)
return;
for (unsigned I = 0, E = CompileUnits->getNumOperands(); I != E; ++I) {
DICompileUnit CU(CompileUnits->getOperand(I));
assert(CU && "Expected valid compile unit");
DITypedArray<DISubprogram> SPs(CU.getSubprograms());
assert(SPs && "Expected valid subprogram array");
SmallVector<Metadata *, 16> NewSPs;
NewSPs.reserve(SPs.getNumElements());
for (unsigned S = 0, SE = SPs.getNumElements(); S != SE; ++S) {
DISubprogram SP = SPs.getElement(S);
if (SP && SP.getFunction() && Functions.count(SP.getFunction()))
continue;
NewSPs.push_back(SP);
}
// Redirect operand to the overriding subprogram.
if (NewSPs.size() != SPs.getNumElements())
CU.replaceSubprograms(DIArray(MDNode::get(DstM->getContext(), NewSPs)));
}
}
/// Merge the linker flags in Src into the Dest module.
bool ModuleLinker::linkModuleFlagsMetadata() {
// If the source module has no module flags, we are done.
@@ -1560,9 +1509,6 @@ bool ModuleLinker::run() {
linkGlobalValueBody(Src);
}
// Strip replaced subprograms before linking together compile units.
stripReplacedSubprograms();
// Remap all of the named MDNodes in Src into the DstM module. We do this
// after linking GlobalValues so that MDNodes that reference GlobalValues
// are properly remapped.