Fix bugs where typecasting an expression to void would cause it to disappear.

This was obviously problematic in cases where the expression was a function
call or the like, with side effects.

Fixes issue #199.
This commit is contained in:
Matt Pharr
2012-03-27 09:33:43 -07:00
parent f9dc621ebe
commit ca5c65d032
3 changed files with 50 additions and 4 deletions

View File

@@ -6284,10 +6284,17 @@ TypeCastExpr::GetValue(FunctionEmitContext *ctx) const {
ctx->SetDebugPos(pos);
const Type *toType = GetType(), *fromType = expr->GetType();
if (!toType || !fromType || Type::Equal(toType, AtomicType::Void) ||
Type::Equal(fromType, AtomicType::Void))
// an error should have been issued elsewhere in this case
if (toType == NULL || fromType == NULL) {
Assert(m->errorCount > 0);
return NULL;
}
if (Type::Equal(toType, AtomicType::Void)) {
// emit the code for the expression in case it has side-effects but
// then we're done.
(void)expr->GetValue(ctx);
return NULL;
}
const PointerType *fromPointerType = dynamic_cast<const PointerType *>(fromType);
const PointerType *toPointerType = dynamic_cast<const PointerType *>(toType);
@@ -6590,7 +6597,12 @@ TypeCastExpr::TypeCheck() {
fromType = lDeconstifyType(fromType);
toType = lDeconstifyType(toType);
if (fromType->IsVaryingType() && toType->IsUniformType()) {
// Anything can be cast to void...
if (Type::Equal(toType, AtomicType::Void))
return this;
if (Type::Equal(fromType, AtomicType::Void) ||
fromType->IsVaryingType() && toType->IsUniformType()) {
Error(pos, "Can't type cast from type \"%s\" to type \"%s\"",
fromType->GetString().c_str(), toType->GetString().c_str());
return NULL;

View File

@@ -0,0 +1,17 @@
export uniform int width() { return programCount; }
float add(float a, float b, uniform float * uniform result) {
result[programIndex] = a+b;
return a+b;
}
export void f_f(uniform float RET[], uniform float aFOO[]) {
float a = aFOO[programIndex];
float b = 0.; b = a;
(void)add(a, b, RET);
}
export void result(uniform float RET[]) {
RET[programIndex] = 2 + 2*programIndex;
}

View File

@@ -0,0 +1,17 @@
export uniform int width() { return programCount; }
uniform float add(float a, float b, uniform float * uniform result) {
result[programIndex] = a+b;
return 1;
}
export void f_f(uniform float RET[], uniform float aFOO[]) {
float a = aFOO[programIndex];
float b = 0.; b = a;
(void)add(a, b, RET);
}
export void result(uniform float RET[]) {
RET[programIndex] = 2 + 2*programIndex;
}