Skip to content

Commit ebc47d0

Browse files
ncosncos
committed
remove several redundant #if - clauses
1 parent 0afa3f5 commit ebc47d0

19 files changed

+273
-275
lines changed

‎builtins.cpp

+15-20
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,8 @@
4747

4848
#include <math.h>
4949
#include <stdlib.h>
50-
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_3
50+
#if ISPC_LLVM_VERSION == ISPC_LLVM_3_2
5151
#include <llvm/Attributes.h>
52-
#endif
53-
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_3
5452
#include <llvm/LLVMContext.h>
5553
#include <llvm/Module.h>
5654
#include <llvm/Type.h>
@@ -784,7 +782,7 @@ void
784782
AddBitcodeToModule(const unsigned char *bitcode, int length,
785783
llvm::Module *module, SymbolTable *symbolTable, bool warn) {
786784
llvm::StringRef sb = llvm::StringRef((char *)bitcode, length);
787-
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_6
785+
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_5
788786
llvm::MemoryBuffer *bcBuf = llvm::MemoryBuffer::getMemBuffer(sb);
789787
#else // LLVM 3.6+
790788
llvm::MemoryBufferRef bcBuf = llvm::MemoryBuffer::getMemBuffer(sb)->getMemBufferRef();
@@ -880,7 +878,7 @@ AddBitcodeToModule(const unsigned char *bitcode, int length,
880878

881879
std::string(linkError);
882880
if (llvm::Linker::LinkModules(module, bcModule
883-
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_6
881+
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_5
884882
, llvm::Linker::DestroySource,
885883
&linkError))
886884
Error(SourcePos(), "Error linking stdlib bitcode: %s", linkError.c_str());
@@ -917,7 +915,7 @@ lDefineConstantInt(const char *name, int val, llvm::Module *module,
917915
symbolTable->AddVariable(sym);
918916

919917
if (m->diBuilder != NULL) {
920-
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_7
918+
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6
921919
llvm::DIFile file;
922920
llvm::DIType diType = sym->type->GetDIType(file);
923921
Assert(diType.Verify());
@@ -932,15 +930,15 @@ lDefineConstantInt(const char *name, int val, llvm::Module *module,
932930
// have the DW_AT_artifical attribute. It's not clear if this
933931
// matters for anything though.
934932

935-
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_6
933+
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_5
936934
llvm::DIGlobalVariable var = m->diBuilder->createGlobalVariable(
937935
name,
938936
file,
939937
0 /* line */,
940938
diType,
941939
true /* static */,
942940
sym->storagePtr);
943-
#elif ISPC_LLVM_VERSION < ISPC_LLVM_3_7 /* i.e., 3.6 */
941+
#elif ISPC_LLVM_VERSION == ISPC_LLVM_3_6 // LLVM 3.6
944942
llvm::Constant *sym_const_storagePtr = llvm::dyn_cast<llvm::Constant>(sym->storagePtr);
945943
Assert(sym_const_storagePtr);
946944
llvm::DIGlobalVariable var = m->diBuilder->createGlobalVariable(
@@ -965,7 +963,7 @@ lDefineConstantInt(const char *name, int val, llvm::Module *module,
965963
true /* static */,
966964
sym_const_storagePtr);
967965
#endif
968-
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_7
966+
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6
969967
Assert(var.Verify());
970968
#else // LLVM 3.7+
971969
//coming soon
@@ -984,7 +982,7 @@ lDefineConstantIntFunc(const char *name, int val, llvm::Module *module,
984982

985983
llvm::Function *func = module->getFunction(name);
986984
Assert(func != NULL); // it should be declared already...
987-
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_3
985+
#if ISPC_LLVM_VERSION == ISPC_LLVM_3_2
988986
func->addFnAttr(llvm::Attributes::AlwaysInline);
989987
#else // LLVM 3.3+
990988
func->addFnAttr(llvm::Attribute::AlwaysInline);
@@ -1019,7 +1017,7 @@ lDefineProgramIndex(llvm::Module *module, SymbolTable *symbolTable) {
10191017
symbolTable->AddVariable(sym);
10201018

10211019
if (m->diBuilder != NULL) {
1022-
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_7
1020+
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6
10231021
llvm::DIFile file;
10241022
llvm::DIType diType = sym->type->GetDIType(file);
10251023
Assert(diType.Verify());
@@ -1030,13 +1028,10 @@ lDefineProgramIndex(llvm::Module *module, SymbolTable *symbolTable) {
10301028
llvm::DIType *diType = sym->type->GetDIType(file);
10311029
// Assert(diType.Verify());
10321030
#endif
1033-
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_6
1031+
#if ISPC_LLVM_VERSION == ISPC_LLVM_3_6 // LLVM 3.6
10341032
llvm::Constant *sym_const_storagePtr = llvm::dyn_cast<llvm::Constant>(sym->storagePtr);
10351033
Assert(sym_const_storagePtr);
1036-
#if ISPC_LLVM_VERSION < ISPC_LLVM_3_7
1037-
llvm::DIGlobalVariable var =
1038-
#endif
1039-
m->diBuilder->createGlobalVariable(
1034+
llvm::DIGlobalVariable var = m->diBuilder->createGlobalVariable(
10401035
file,
10411036
sym->name.c_str(),
10421037
sym->name.c_str(),
@@ -1045,15 +1040,15 @@ lDefineProgramIndex(llvm::Module *module, SymbolTable *symbolTable) {
10451040
diType,
10461041
false /* static */,
10471042
sym_const_storagePtr);
1048-
#elif ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 /* && ISPC_LLVM_VERSION < ISPC_LLVM_3_6 */
1043+
#elif ISPC_LLVM_VERSION <= ISPC_LLVM_3_5
10491044
llvm::DIGlobalVariable var = m->diBuilder->createGlobalVariable(
10501045
sym->name.c_str(),
10511046
file,
10521047
0 /* line */,
10531048
diType,
10541049
false /* static */,
10551050
sym->storagePtr);
1056-
#else
1051+
#else // LLVM 3.7+
10571052
llvm::Constant *sym_const_storagePtr = llvm::dyn_cast<llvm::Constant>(sym->storagePtr);
10581053
Assert(sym_const_storagePtr);
10591054
m->diBuilder->createGlobalVariable(
@@ -1065,8 +1060,8 @@ lDefineProgramIndex(llvm::Module *module, SymbolTable *symbolTable) {
10651060
diType,
10661061
false /* static */,
10671062
sym_const_storagePtr);
1068-
#endif
1069-
#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_2 && ISPC_LLVM_VERSION < ISPC_LLVM_3_7
1063+
#endif
1064+
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6
10701065
Assert(var.Verify());
10711066
#else // LLVM 3.7+
10721067
//coming soon

0 commit comments

Comments
 (0)