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

Merge pull request #1081 from ncos/trunk-fixing

Browse Source 
Fix ISPC buildfail after LLVM API change in r243764
This commit is contained in:
Dmitry Babokin
2015-08-03 12:13:47 +03:00
parent ab0e8bba00 f3548037fe
commit a80706af2b
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ctx.cpp
View File

@@ -1773,6 +1773,8 @@ FunctionEmitContext::EmitVariableDebugInfo(Symbol *sym) {
//llvm::MDType *diType = sym->type->GetDIType(scope); //llvm::MDType *diType = sym->type->GetDIType(scope);
//llvm::MDLocalVariable *var = //llvm::MDLocalVariable *var =
#endif #endif
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_7 /* 3.2, 3.3, 3.4, 3.5, 3.6, 3.7*/
m->diBuilder->createLocalVariable(llvm::dwarf::DW_TAG_auto_variable, m->diBuilder->createLocalVariable(llvm::dwarf::DW_TAG_auto_variable,
scope, scope,
sym->name, sym->name,
@@ -1780,6 +1782,16 @@ FunctionEmitContext::EmitVariableDebugInfo(Symbol *sym) {
sym->pos.first_line, sym->pos.first_line,
diType, diType,
true /* preserve through opts */); true /* preserve through opts */);
#else /* LLVM 3.8+ */
m->diBuilder->createAutoVariable(scope,
sym->name,
sym->pos.GetDIFile(),
sym->pos.first_line,
diType,
true /* preserve through opts */);
#endif
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6 /* 3.2, 3.3, 3.4, 3.5, 3.6 */ #if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6 /* 3.2, 3.3, 3.4, 3.5, 3.6 */
AssertPos(currentPos, var.Verify()); AssertPos(currentPos, var.Verify());
llvm::Instruction *declareInst = llvm::Instruction *declareInst =
@@ -1820,6 +1832,8 @@ FunctionEmitContext::EmitFunctionParameterDebugInfo(Symbol *sym, int argNum) {
//llvm::MDType *diType = sym->type->GetDIType(scope); //llvm::MDType *diType = sym->type->GetDIType(scope);
//llvm::MDLocalVariable *var = //llvm::MDLocalVariable *var =
#endif #endif
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_7 /* 3.2, 3.3, 3.4, 3.5, 3.6, 3.7 */
m->diBuilder->createLocalVariable(llvm::dwarf::DW_TAG_arg_variable, m->diBuilder->createLocalVariable(llvm::dwarf::DW_TAG_arg_variable,
scope, scope,
sym->name, sym->name,
@@ -1829,6 +1843,17 @@ FunctionEmitContext::EmitFunctionParameterDebugInfo(Symbol *sym, int argNum) {
true /* preserve through opts */, true /* preserve through opts */,
flags, flags,
argNum + 1); argNum + 1);
#else /* LLVM 3.8+ */
m->diBuilder->createParameterVariable(scope,
sym->name,
argNum + 1,
sym->pos.GetDIFile(),
sym->pos.first_line,
diType,
true /* preserve through opts */,
flags);
#endif
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6 /* 3.2, 3.3, 3.4, 3.5, 3.6 */ #if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6 /* 3.2, 3.3, 3.4, 3.5, 3.6 */
AssertPos(currentPos, var.Verify()); AssertPos(currentPos, var.Verify());
llvm::Instruction *declareInst = llvm::Instruction *declareInst =