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

Fix uninitialized memory error introduced in d65c02f3

Browse Source
This commit is contained in:
Matt Pharr
2011-12-04 16:39:56 -08:00
parent 186d0223d2
commit 32904dfa11
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
expr.cpp
View File

@@ -6486,25 +6486,24 @@ FunctionSymbolExpr::tryResolve(int (*matchFunc)(const Type *, const Type *),
// potential match versus detecting this earlier in the // potential match versus detecting this earlier in the
// matching process and just giving up. // matching process and just giving up.
const Type *paramType = ft->GetParameterType(i); const Type *paramType = ft->GetParameterType(i);
if (callTypes[i] == NULL || paramType == NULL || if (callTypes[i] == NULL || paramType == NULL ||
dynamic_cast<const FunctionType *>(callTypes[i]) != NULL) dynamic_cast<const FunctionType *>(callTypes[i]) != NULL)
return false; return false;
int argCost; int argCost = matchFunc(callTypes[i], paramType);
if (argCost == -1 && argCouldBeNULL != NULL && if (argCost == -1) {
(*argCouldBeNULL)[i] == true && if (argCouldBeNULL != NULL && (*argCouldBeNULL)[i] == true &&
dynamic_cast<const PointerType *>(paramType) != NULL) dynamic_cast<const PointerType *>(paramType) != NULL)
// If the passed argument value is zero and this is a // If the passed argument value is zero and this is a
// pointer type, then it can convert to a NULL value of // pointer type, then it can convert to a NULL value of
// that pointer type. // that pointer type.
argCost = 0; argCost = 0;
else else
argCost= matchFunc(callTypes[i], paramType);
if (argCost == -1)
// If the predicate function returns -1, we have failed no // If the predicate function returns -1, we have failed no
// matter what else happens, so we stop trying // matter what else happens, so we stop trying
break; break;
}
cost += argCost; cost += argCost;
} }
if (i == (int)callTypes.size()) { if (i == (int)callTypes.size()) {