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

New LLVM version macro

Browse Source
This commit is contained in:
Anton Mitrokhin
2015-06-16 15:00:00 +03:00
parent 0b62c28436
commit 0afa3f5713
20 changed files with 559 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ctx.h
View File

@@ -40,19 +40,19 @@
#include "ispc.h"
#include <map>
#if defined(LLVM_3_2)
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_3
#include <llvm/InstrTypes.h>
#include <llvm/Instructions.h>
#else
#else /* >= 3.3 */
#include <llvm/IR/InstrTypes.h>
#include <llvm/IR/Instructions.h>
#endif
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) // LLVM 3.5+
#include <llvm/IR/DebugInfo.h>
#include <llvm/IR/DIBuilder.h>
#else
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_5
#include <llvm/DebugInfo.h>
#include <llvm/DIBuilder.h>
#else /* >= 3.5 */
#include <llvm/IR/DebugInfo.h>
#include <llvm/IR/DIBuilder.h>
#endif
struct CFInfo;
@@ -352,10 +352,11 @@ public:
Instructions stored using Value pointers; the code here returns
silently if it's not actually given an instruction. */
void AddDebugPos(llvm::Value *instruction, const SourcePos *pos = NULL,
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_7
llvm::DIScope *scope = NULL);
#else // LLVM 3.7++
#else /* LLVM 3.7+ */
llvm::DIScope *scope = NULL);
//llvm::MDScope *scope = NULL );
#endif
/** Inform the debugging information generation code that a new scope
@@ -368,7 +369,7 @@ public:
/** Returns the llvm::DIScope corresponding to the current program
scope. */
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_7
llvm::DIScope GetDIScope() const;
#else // LLVM 3.7++
llvm::DIScope *GetDIScope() const;
@@ -683,7 +684,7 @@ private:
emitted. */
std::vector<CFInfo *> controlFlowInfo;
#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) || defined(LLVM_3_6)
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_7
/** DIFile object corresponding to the source file where the current
function was defined (used for debugging info). */
llvm::DIFile diFile;