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

Merge pull request #850 from Vsevolod-Livinskij/fix_216239

Browse Source 
Fix for llvm revision 216239
This commit is contained in:
Dmitry Babokin
2014-08-24 22:32:09 +04:00
parent 2351f0898a 93c7ddbac5
commit e33cf51b28
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ctx.cpp
View File

@@ -1546,14 +1546,16 @@ FunctionEmitContext::StartScope() {
llvm::DILexicalBlock lexicalBlock = llvm::DILexicalBlock lexicalBlock =
m->diBuilder->createLexicalBlock(parentScope, diFile, m->diBuilder->createLexicalBlock(parentScope, diFile,
currentPos.first_line, currentPos.first_line,
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) // LLVM 3.5+ #if defined(LLVM_3_5)
// Revision 202736 in LLVM adds support of DWARF discriminator // Revision 202736 in LLVM adds support of DWARF discriminator
// to the last argument and revision 202737 in clang adds 0 // to the last argument and revision 202737 in clang adds 0
// for the last argument by default. // for the last argument by default.
currentPos.first_column, 0); currentPos.first_column, 0);
#else #else
// Revision 216239 in LLVM removes support of DWARF discriminator
// as the last argument
currentPos.first_column); currentPos.first_column);
#endif #endif // LLVM 3.2, 3.3, 3.4 and 3.6+
AssertPos(currentPos, lexicalBlock.Verify()); AssertPos(currentPos, lexicalBlock.Verify());
debugScopes.push_back(lexicalBlock); debugScopes.push_back(lexicalBlock);
} }