aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #923 from Vsevolod-Livinskij/fix_223802

Browse Source 
Fix for trunk after rev 223802
This commit is contained in:
Dmitry Babokin
2014-12-25 14:52:43 +03:00
parent 8fa45f20dc 8672aff298
commit 9a56f8fb9a
5 changed files with 130 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
module.cpp
View File

@@ -166,9 +166,11 @@ static void
lStripUnusedDebugInfo(llvm::Module *module) {
if (g->generateDebuggingSymbols == false)
return;
#if defined (LLVM_3_2) || defined (LLVM_3_3)|| defined (LLVM_3_4)|| defined (LLVM_3_5)
std::set<llvm::Value *> SPall;
#else // LLVN 3.6++
std::set<llvm::Metadata *> SPall;
#endif
// OK, now we are to determine which functions actually survived the
// optimization. We will now read all IR instructions in the module.
//
@@ -208,23 +210,28 @@ lStripUnusedDebugInfo(llvm::Module *module) {
// loop over the compile units that contributed to the final module
if (llvm::NamedMDNode *cuNodes = module->getNamedMetadata("llvm.dbg.cu")) {
for (unsigned i = 0, ie = cuNodes->getNumOperands(); i != ie; ++i) {
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5)
llvm::MDNode *cuNode = cuNodes->getOperand(i);
#else // LLVM 3.6+
llvm::MDNode *cuNode = llvm::cast<llvm::MDNode>(cuNodes->getOperand(i));
#endif
llvm::DICompileUnit cu(cuNode);
llvm::DIArray subprograms = cu.getSubprograms();
if (subprograms.getNumElements() == 0)
continue;
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5)
std::set<llvm::Value *> SPset;
std::vector<llvm::Value *> usedSubprograms;
#else // LLVM 3.6+
std::set<llvm::Metadata *> SPset;
std::vector<llvm::Metadata *> usedSubprograms;
#endif
// determine what functions of those extracted belong to the unit
for (unsigned j = 0, je = subprograms.getNumElements(); j != je; ++j)
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5)
SPset.insert(subprograms->getOperand(j));
#else // LLVM 3.6+
SPset.insert(subprograms.getElement(j));
#endif
std::set_intersection(SPall.begin(), SPall.end(),
SPset.begin(), SPset.end(),
@@ -293,7 +300,8 @@ lStripUnusedDebugInfo(llvm::Module *module) {
// And now we can go and stuff it into the unit with some
// confidence...
llvm::MDNode *replNode = llvm::MDNode::get(module->getContext(), usedSubprograms);
llvm::MDNode *replNode = llvm::MDNode::get(module->getContext(),
llvm::ArrayRef<llvm::Metadata *>(usedSubprograms));
cu.replaceSubprograms(llvm::DIArray(replNode));
#endif
}