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

Merge pull request #1120 from ncos/trunk-fixing

Browse Source 
ISPC trunk fix after LLVM commits 252219 and 252380
This commit is contained in:
Dmitry Babokin
2015-11-10 16:09:03 +03:00
parent 48ffdcf169 1948a93584
commit 66b1499ee0
6 changed files with 116 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ctx.cpp
View File

@@ -409,7 +409,7 @@ FunctionEmitContext::FunctionEmitContext(Function *func, Symbol *funSym,
firstLine, flags,
isOptimized, llvmFunction);
AssertPos(currentPos, diSubprogram.Verify());
#else /* LLVM 3.7+ */
#elif ISPC_LLVM_VERSION == ISPC_LLVM_3_7 /* LLVM 3.7 */
diSubprogram =
m->diBuilder->createFunction(diFile /* scope */, funSym->name,
mangledName, diFile,
@@ -417,6 +417,14 @@ FunctionEmitContext::FunctionEmitContext(Function *func, Symbol *funSym,
isStatic, true, /* is defn */
firstLine, flags,
isOptimized, llvmFunction);
#else /* LLVM 3.8+ */
diSubprogram =
m->diBuilder->createFunction(diFile /* scope */, funSym->name,
mangledName, diFile,
firstLine, diSubprogramType_n,
isStatic, true, /* is defn */
firstLine, flags,
isOptimized);
#endif
/* And start a scope representing the initial function scope */