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

Merge pull request #894 from Vsevolod-Livinskij/fix_221024

Browse Source 
Fix for rev. 221024 and 221027
This commit is contained in:
Dmitry Babokin
2014-11-05 16:18:07 -08:00
parent 89f6fdd29c 90d9b91007
commit b45429fc44
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opt.cpp
View File

@@ -103,7 +103,7 @@
#include <llvm/Analysis/Passes.h> #include <llvm/Analysis/Passes.h>
#include <llvm/Support/raw_ostream.h> #include <llvm/Support/raw_ostream.h>
#include <llvm/Support/Dwarf.h> #include <llvm/Support/Dwarf.h>
#if !defined(LLVM_3_2) && !defined(LLVM_3_5) && !defined(LLVM_3_4) && !defined(LLVM_3_5) #if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) && !defined(LLVM_3_5)
#include <llvm/IR/IntrinsicInst.h> #include <llvm/IR/IntrinsicInst.h>
#endif #endif
#ifdef ISPC_IS_LINUX #ifdef ISPC_IS_LINUX
@@ -185,7 +185,11 @@ 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);
@@ -215,11 +219,19 @@ 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;