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:
20
expr.cpp
20
expr.cpp
@@ -6284,10 +6284,17 @@ TypeCastExpr::GetValue(FunctionEmitContext *ctx) const {
|
|||||||
|
|
||||||
ctx->SetDebugPos(pos);
|
ctx->SetDebugPos(pos);
|
||||||
const Type *toType = GetType(), *fromType = expr->GetType();
|
const Type *toType = GetType(), *fromType = expr->GetType();
|
||||||
if (!toType || !fromType || Type::Equal(toType, AtomicType::Void) ||
|
if (toType == NULL || fromType == NULL) {
|
||||||
Type::Equal(fromType, AtomicType::Void))
|
Assert(m->errorCount > 0);
|
||||||
// an error should have been issued elsewhere in this case
|
|
||||||
return NULL;
|
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 *fromPointerType = dynamic_cast<const PointerType *>(fromType);
|
||||||
const PointerType *toPointerType = dynamic_cast<const PointerType *>(toType);
|
const PointerType *toPointerType = dynamic_cast<const PointerType *>(toType);
|
||||||
@@ -6590,7 +6597,12 @@ TypeCastExpr::TypeCheck() {
|
|||||||
fromType = lDeconstifyType(fromType);
|
fromType = lDeconstifyType(fromType);
|
||||||
toType = lDeconstifyType(toType);
|
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\"",
|
Error(pos, "Can't type cast from type \"%s\" to type \"%s\"",
|
||||||
fromType->GetString().c_str(), toType->GetString().c_str());
|
fromType->GetString().c_str(), toType->GetString().c_str());
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|||||||
17
tests/typecast-void-funcall-1.ispc
Normal file
17
tests/typecast-void-funcall-1.ispc
Normal 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;
|
||||||
|
}
|
||||||
17
tests/typecast-void-funcall.ispc
Normal file
17
tests/typecast-void-funcall.ispc
Normal 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;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user