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

Merge pull request #901 from ncos/ispc_build_fails

Browse Source 
LLVM trunk build fail fix (MDNode interface change)
This commit is contained in:
Dmitry Babokin
2014-11-13 15:25:35 -08:00
parent 4351fc600b 5cb50eca30
commit d3158d1efe
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cbackend.cpp
View File

@@ -152,11 +152,7 @@ namespace {
incorporateValue(Aliasee); incorporateValue(Aliasee);
} }
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5)
llvm::SmallVector<std::pair<unsigned, llvm::MDNode*>, 4> MDForInst; llvm::SmallVector<std::pair<unsigned, llvm::MDNode*>, 4> MDForInst;
#else // LLVM 3.6+
llvm::SmallVector<std::pair<unsigned, llvm::Value*>, 4> MDForInst;
#endif
// Get types from functions. // Get types from functions.
for (llvm::Module::const_iterator FI = M.begin(), E = M.end(); FI != E; ++FI) { for (llvm::Module::const_iterator FI = M.begin(), E = M.end(); FI != E; ++FI) {

14
opt.cpp
View File

@@ -185,11 +185,8 @@ lCopyMetadata(llvm::Value *vto, const llvm::Instruction *from) {
if (!to) if (!to)
return; return;
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5)
llvm::SmallVector<std::pair<unsigned int, llvm::MDNode *>, 8> metadata; llvm::SmallVector<std::pair<unsigned int, llvm::MDNode *>, 8> metadata;
#else // LLVM 3.6+
llvm::SmallVector<std::pair<unsigned int, llvm::Value *>, 8> metadata;
#endif
from->getAllMetadata(metadata); from->getAllMetadata(metadata);
for (unsigned int i = 0; i < metadata.size(); ++i) for (unsigned int i = 0; i < metadata.size(); ++i)
to->setMetadata(metadata[i].first, metadata[i].second); to->setMetadata(metadata[i].first, metadata[i].second);
@@ -219,19 +216,12 @@ lCopyMetadata(llvm::Value *vto, const llvm::Instruction *from) {
*/ */
static bool static bool
lGetSourcePosFromMetadata(const llvm::Instruction *inst, SourcePos *pos) { lGetSourcePosFromMetadata(const llvm::Instruction *inst, SourcePos *pos) {
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5)
llvm::MDNode *filename = inst->getMetadata("filename"); llvm::MDNode *filename = inst->getMetadata("filename");
llvm::MDNode *first_line = inst->getMetadata("first_line"); llvm::MDNode *first_line = inst->getMetadata("first_line");
llvm::MDNode *first_column = inst->getMetadata("first_column"); llvm::MDNode *first_column = inst->getMetadata("first_column");
llvm::MDNode *last_line = inst->getMetadata("last_line"); llvm::MDNode *last_line = inst->getMetadata("last_line");
llvm::MDNode *last_column = inst->getMetadata("last_column"); llvm::MDNode *last_column = inst->getMetadata("last_column");
#else // LLVM 3.6+
llvm::MDNode *filename = inst->getMDNode("filename");
llvm::MDNode *first_line = inst->getMDNode("first_line");
llvm::MDNode *first_column = inst->getMDNode("first_column");
llvm::MDNode *last_line = inst->getMDNode("last_line");
llvm::MDNode *last_column = inst->getMDNode("last_column");
#endif
if (!filename || !first_line || !first_column || !last_line || !last_column) if (!filename || !first_line || !first_column || !last_line || !last_column)
return false; return false;