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

Fix cases in optimization code to not inadvertently match calls to func ptrs.

Browse Source 
If we call a function pointer, CallInst::getCalledFunction() returns NULL; we
need to be careful about this case when we're matching various function calls
in optimization passes.

(Fixes a crash.)
This commit is contained in:
Matt Pharr
2012-01-12 10:33:06 -08:00
parent 0740299860
commit 0f8eee9809
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
opt.cpp
View File

@@ -643,7 +643,7 @@ IntrinsicsOpt::runOnBasicBlock(llvm::BasicBlock &bb) {
restart: restart:
for (llvm::BasicBlock::iterator iter = bb.begin(), e = bb.end(); iter != e; ++iter) { for (llvm::BasicBlock::iterator iter = bb.begin(), e = bb.end(); iter != e; ++iter) {
llvm::CallInst *callInst = llvm::dyn_cast<llvm::CallInst>(&*iter); llvm::CallInst *callInst = llvm::dyn_cast<llvm::CallInst>(&*iter);
if (!callInst) if (callInst == NULL || callInst->getCalledFunction() == NULL)
continue; continue;
BlendInstruction *blend = matchingBlendInstruction(callInst->getCalledFunction()); BlendInstruction *blend = matchingBlendInstruction(callInst->getCalledFunction());
@@ -867,7 +867,7 @@ VSelMovmskOpt::runOnBasicBlock(llvm::BasicBlock &bb) {
continue; continue;
llvm::Function *calledFunc = callInst->getCalledFunction(); llvm::Function *calledFunc = callInst->getCalledFunction();
if (calledFunc != m->module->getFunction("__movmsk")) if (calledFunc == NULL || calledFunc != m->module->getFunction("__movmsk"))
continue; continue;
int mask = lGetMask(callInst->getArgOperand(0)); int mask = lGetMask(callInst->getArgOperand(0));
@@ -1479,10 +1479,13 @@ MaskedStoreOptPass::runOnBasicBlock(llvm::BasicBlock &bb) {
// masked store functions // masked store functions
for (llvm::BasicBlock::iterator iter = bb.begin(), e = bb.end(); iter != e; ++iter) { for (llvm::BasicBlock::iterator iter = bb.begin(), e = bb.end(); iter != e; ++iter) {
llvm::CallInst *callInst = llvm::dyn_cast<llvm::CallInst>(&*iter); llvm::CallInst *callInst = llvm::dyn_cast<llvm::CallInst>(&*iter);
if (!callInst) if (callInst == NULL)
continue; continue;
llvm::Function *called = callInst->getCalledFunction(); llvm::Function *called = callInst->getCalledFunction();
if (called == NULL)
continue;
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) {
@@ -1588,6 +1591,9 @@ MaskedLoadOptPass::runOnBasicBlock(llvm::BasicBlock &bb) {
continue; continue;
llvm::Function *called = callInst->getCalledFunction(); llvm::Function *called = callInst->getCalledFunction();
if (called == NULL)
continue;
int nFuncs = sizeof(mlInfo) / sizeof(mlInfo[0]); int nFuncs = sizeof(mlInfo) / sizeof(mlInfo[0]);
MLInfo *info = NULL; MLInfo *info = NULL;
for (int i = 0; i < nFuncs; ++i) { for (int i = 0; i < nFuncs; ++i) {
@@ -2246,7 +2252,11 @@ GSImprovementsPass::runOnBasicBlock(llvm::BasicBlock &bb) {
llvm::CallInst *callInst = llvm::dyn_cast<llvm::CallInst>(&*iter); llvm::CallInst *callInst = llvm::dyn_cast<llvm::CallInst>(&*iter);
if (callInst == NULL) if (callInst == NULL)
continue; continue;
llvm::Function *calledFunc = callInst->getCalledFunction(); llvm::Function *calledFunc = callInst->getCalledFunction();
if (calledFunc == NULL)
continue;
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) {
@@ -2533,7 +2543,11 @@ LowerGSPass::runOnBasicBlock(llvm::BasicBlock &bb) {
llvm::CallInst *callInst = llvm::dyn_cast<llvm::CallInst>(&*iter); llvm::CallInst *callInst = llvm::dyn_cast<llvm::CallInst>(&*iter);
if (callInst == NULL) if (callInst == NULL)
continue; continue;
llvm::Function *calledFunc = callInst->getCalledFunction(); llvm::Function *calledFunc = callInst->getCalledFunction();
if (calledFunc == NULL)
continue;
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 (lgsInfo[i].pseudoFunc != NULL && if (lgsInfo[i].pseudoFunc != NULL &&