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

Be careful to not inadvertently match NULL functions in optimization passes.

Browse Source
This commit is contained in:
Matt Pharr
2011-10-01 08:29:50 -07:00
parent 0b02f94988
commit 2df9da2524
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
opt.cpp
View File

@@ -678,7 +678,8 @@ IntrinsicsOpt::runOnBasicBlock(llvm::BasicBlock &bb) {
bool bool
IntrinsicsOpt::matchesMaskInstruction(llvm::Function *function) { IntrinsicsOpt::matchesMaskInstruction(llvm::Function *function) {
for (unsigned int i = 0; i < maskInstructions.size(); ++i) for (unsigned int i = 0; i < maskInstructions.size(); ++i)
if (function == maskInstructions[i].function) if (maskInstructions[i].function != NULL &&
function == maskInstructions[i].function)
return true; return true;
return false; return false;
} }
@@ -687,7 +688,8 @@ IntrinsicsOpt::matchesMaskInstruction(llvm::Function *function) {
IntrinsicsOpt::BlendInstruction * IntrinsicsOpt::BlendInstruction *
IntrinsicsOpt::matchingBlendInstruction(llvm::Function *function) { IntrinsicsOpt::matchingBlendInstruction(llvm::Function *function) {
for (unsigned int i = 0; i < blendInstructions.size(); ++i) for (unsigned int i = 0; i < blendInstructions.size(); ++i)
if (function == blendInstructions[i].function) if (blendInstructions[i].function != NULL &&
function == blendInstructions[i].function)
return &blendInstructions[i]; return &blendInstructions[i];
return NULL; return NULL;
} }
@@ -1147,7 +1149,8 @@ GatherScatterFlattenOpt::runOnBasicBlock(llvm::BasicBlock &bb) {
continue; continue;
GSInfo *info = NULL; GSInfo *info = NULL;
for (int i = 0; i < numGSFuncs; ++i) for (int i = 0; i < numGSFuncs; ++i)
if (callInst->getCalledFunction() == gsFuncs[i].func) { if (gsFuncs[i].func != NULL &&
callInst->getCalledFunction() == gsFuncs[i].func) {
info = &gsFuncs[i]; info = &gsFuncs[i];
break; break;
} }
@@ -1288,7 +1291,7 @@ MaskedStoreOptPass::runOnBasicBlock(llvm::BasicBlock &bb) {
int nMSFuncs = sizeof(msInfo) / sizeof(msInfo[0]); int nMSFuncs = sizeof(msInfo) / sizeof(msInfo[0]);
MSInfo *info = NULL; MSInfo *info = NULL;
for (int i = 0; i < nMSFuncs; ++i) { for (int i = 0; i < nMSFuncs; ++i) {
if (called == msInfo[i].func) { if (msInfo[i].func != NULL && called == msInfo[i].func) {
info = &msInfo[i]; info = &msInfo[i];
break; break;
} }
@@ -1428,7 +1431,8 @@ LowerMaskedStorePass::runOnBasicBlock(llvm::BasicBlock &bb) {
continue; continue;
LMSInfo *info = NULL; LMSInfo *info = NULL;
for (unsigned int i = 0; i < sizeof(msInfo) / sizeof(msInfo[0]); ++i) { for (unsigned int i = 0; i < sizeof(msInfo) / sizeof(msInfo[0]); ++i) {
if (callInst->getCalledFunction() == msInfo[i].pseudoFunc) { if (msInfo[i].pseudoFunc != NULL &&
callInst->getCalledFunction() == msInfo[i].pseudoFunc) {
info = &msInfo[i]; info = &msInfo[i];
break; break;
} }
@@ -2151,13 +2155,15 @@ GSImprovementsPass::runOnBasicBlock(llvm::BasicBlock &bb) {
GatherImpInfo *gatherInfo = NULL; GatherImpInfo *gatherInfo = NULL;
ScatterImpInfo *scatterInfo = NULL; ScatterImpInfo *scatterInfo = NULL;
for (unsigned int i = 0; i < sizeof(gInfo) / sizeof(gInfo[0]); ++i) { for (unsigned int i = 0; i < sizeof(gInfo) / sizeof(gInfo[0]); ++i) {
if (calledFunc == gInfo[i].pseudoFunc) { if (gInfo[i].pseudoFunc != NULL &&
calledFunc == gInfo[i].pseudoFunc) {
gatherInfo = &gInfo[i]; gatherInfo = &gInfo[i];
break; break;
} }
} }
for (unsigned int i = 0; i < sizeof(sInfo) / sizeof(sInfo[0]); ++i) { for (unsigned int i = 0; i < sizeof(sInfo) / sizeof(sInfo[0]); ++i) {
if (calledFunc == sInfo[i].pseudoFunc) { if (sInfo[i].pseudoFunc != NULL &&
calledFunc == sInfo[i].pseudoFunc) {
scatterInfo = &sInfo[i]; scatterInfo = &sInfo[i];
break; break;
} }
@@ -2402,7 +2408,8 @@ LowerGSPass::runOnBasicBlock(llvm::BasicBlock &bb) {
llvm::Function *calledFunc = callInst->getCalledFunction(); llvm::Function *calledFunc = callInst->getCalledFunction();
LowerGSInfo *info = NULL; LowerGSInfo *info = NULL;
for (unsigned int i = 0; i < sizeof(lgsInfo) / sizeof(lgsInfo[0]); ++i) { for (unsigned int i = 0; i < sizeof(lgsInfo) / sizeof(lgsInfo[0]); ++i) {
if (calledFunc == lgsInfo[i].pseudoFunc) { if (lgsInfo[i].pseudoFunc != NULL &&
calledFunc == lgsInfo[i].pseudoFunc) {
info = &lgsInfo[i]; info = &lgsInfo[i];
break; break;
} }
@@ -2488,7 +2495,7 @@ IsCompileTimeConstantPass::runOnBasicBlock(llvm::BasicBlock &bb) {
int j; int j;
int nFuncs = sizeof(funcs) / sizeof(funcs[0]); int nFuncs = sizeof(funcs) / sizeof(funcs[0]);
for (j = 0; j < nFuncs; ++j) { for (j = 0; j < nFuncs; ++j) {
if (callInst->getCalledFunction() == funcs[j]) if (funcs[j] != NULL && callInst->getCalledFunction() == funcs[j])
break; break;
} }
if (j == nFuncs) if (j == nFuncs)