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

FunctionCallExpr bug: launch count wasn't being type checked, optimized.

Browse Source 
This manifested itself by a call to an overloaded function in a launch count 
expression that wasn't being resolved.
This commit is contained in:
Matt Pharr
2011-12-05 13:23:20 -08:00
parent 48a6c2a35b
commit 6181ce59ae
3 changed files with 74 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
expr.cpp
View File

@@ -2684,6 +2684,9 @@ FunctionCallExpr::Optimize() {
func = func->Optimize();
if (args)
args = args->Optimize();
if (launchCountExpr != NULL)
launchCountExpr = launchCountExpr->Optimize();
if (!func || !args)
return NULL;
@@ -2697,6 +2700,8 @@ FunctionCallExpr::TypeCheck() {
func = func->TypeCheck();
if (args != NULL)
args = args->TypeCheck();
if (launchCountExpr != NULL)
launchCountExpr = launchCountExpr->TypeCheck();
if (args != NULL && func != NULL) {
FunctionSymbolExpr *fse = dynamic_cast<FunctionSymbolExpr *>(func);
@@ -2782,8 +2787,11 @@ FunctionCallExpr::TypeCheck() {
int
FunctionCallExpr::EstimateCost() const {
int callCost = 0;
if (isLaunch)
if (isLaunch) {
callCost = COST_TASK_LAUNCH;
if (launchCountExpr != NULL)
callCost += launchCountExpr->EstimateCost();
}
else if (dynamic_cast<FunctionSymbolExpr *>(func) == NULL) {
// it's going through a function pointer
const Type *fpType = func->GetType();