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

Fix issues with LLVM 3.0 and 3.1 build in cbackend.cpp

Browse Source 
Should fix issue #312.
This commit is contained in:
Matt Pharr
2012-06-28 12:11:27 -07:00
parent a91e4e7981
commit 96a6e75b71
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cbackend.cpp
View File

@@ -79,7 +79,6 @@
#undef setjmp #undef setjmp
#endif #endif
#include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetData.h" #include "llvm/Target/TargetData.h"
@@ -811,7 +810,7 @@ void CWriter::printConstantArray(llvm::ConstantArray *CPA, bool Static) {
// Make sure the last character is a null char, as automatically added by C // Make sure the last character is a null char, as automatically added by C
if (isString && (CPA->getNumOperands() == 0 || if (isString && (CPA->getNumOperands() == 0 ||
!cast<llvm::Constant>(*(CPA->op_end()-1))->isNullValue())) !llvm::cast<llvm::Constant>(*(CPA->op_end()-1))->isNullValue()))
isString = false; isString = false;
if (isString) { if (isString) {
@@ -821,7 +820,7 @@ void CWriter::printConstantArray(llvm::ConstantArray *CPA, bool Static) {
// Do not include the last character, which we know is null // Do not include the last character, which we know is null
for (unsigned i = 0, e = CPA->getNumOperands()-1; i != e; ++i) { for (unsigned i = 0, e = CPA->getNumOperands()-1; i != e; ++i) {
unsigned char C = (unsigned char)(cast<llvm::ConstantInt>(CPA->getOperand(i))->getZExtValue()); unsigned char C = (unsigned char)(llvm::cast<llvm::ConstantInt>(CPA->getOperand(i))->getZExtValue());
// Print it out literally if it is a printable character. The only thing // Print it out literally if it is a printable character. The only thing
// to be careful about is when the last letter output was a hex escape // to be careful about is when the last letter output was a hex escape
@@ -3509,7 +3508,9 @@ void CWriter::lowerIntrinsics(llvm::Function &F) {
// builtin, we handle it. // builtin, we handle it.
const char *BuiltinName = ""; const char *BuiltinName = "";
#define GET_GCC_BUILTIN_NAME #define GET_GCC_BUILTIN_NAME
#define Intrinsic llvm::Intrinsic
#include "llvm/Intrinsics.gen" #include "llvm/Intrinsics.gen"
#undef Intrinsic
#undef GET_GCC_BUILTIN_NAME #undef GET_GCC_BUILTIN_NAME
// If we handle it, don't lower it. // If we handle it, don't lower it.
if (BuiltinName[0]) break; if (BuiltinName[0]) break;
@@ -3673,7 +3674,9 @@ bool CWriter::visitBuiltinCall(llvm::CallInst &I, llvm::Intrinsic::ID ID,
llvm::Function *F = I.getCalledFunction(); llvm::Function *F = I.getCalledFunction();
#endif // LLVM_3_0 #endif // LLVM_3_0
#define GET_GCC_BUILTIN_NAME #define GET_GCC_BUILTIN_NAME
#define Intrinsic llvm::Intrinsic
#include "llvm/Intrinsics.gen" #include "llvm/Intrinsics.gen"
#undef Intrinsic
#undef GET_GCC_BUILTIN_NAME #undef GET_GCC_BUILTIN_NAME
assert(BuiltinName[0] && "Unknown LLVM intrinsic!"); assert(BuiltinName[0] && "Unknown LLVM intrinsic!");