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

Add files inadvertently missed in c58d92d46b.

Browse Source 
Truly fixes issue #363.
This commit is contained in:
Matt Pharr
2012-09-07 13:27:07 -07:00
parent 0ce67f37ac
commit 9e9f266e52
2 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
module.cpp
View File

@@ -544,27 +544,37 @@ Module::AddGlobalVariable(const std::string &name, const Type *type, Expr *initE
types are found and returns false otherwise.
*/
static bool
lRecursiveCheckValidParamType(const Type *t) {
lRecursiveCheckValidParamType(const Type *t, bool vectorOk) {
const StructType *st = CastType<StructType>(t);
if (st != NULL) {
for (int i = 0; i < st->GetElementCount(); ++i)
if (lRecursiveCheckValidParamType(st->GetElementType(i)))
return true;
return false;
if (!lRecursiveCheckValidParamType(st->GetElementType(i),
vectorOk))
return false;
return true;
}
// Vector types are also not supported, pending ispc properly
// supporting the platform ABI. (Pointers to vector types are ok,
// though.) (https://github.com/ispc/ispc/issues/363)...
if (vectorOk == false && CastType<VectorType>(t) != NULL)
return false;
const SequentialType *seqt = CastType<SequentialType>(t);
if (seqt != NULL)
return lRecursiveCheckValidParamType(seqt->GetElementType());
return lRecursiveCheckValidParamType(seqt->GetElementType(), vectorOk);
const PointerType *pt = CastType<PointerType>(t);
if (pt != NULL) {
if (pt->IsSlice() || pt->IsVaryingType())
return true;
return lRecursiveCheckValidParamType(pt->GetBaseType());
return false;
return lRecursiveCheckValidParamType(pt->GetBaseType(), true);
}
return t->IsVaryingType();
if (t->IsVaryingType())
return false;
else
return true;
}
@@ -574,15 +584,18 @@ lRecursiveCheckValidParamType(const Type *t) {
varying parameters is illegal.
*/
static void
lCheckForVaryingParameter(const Type *type, const std::string &name,
SourcePos pos) {
if (lRecursiveCheckValidParamType(type)) {
lCheckExportedParameterTypes(const Type *type, const std::string &name,
SourcePos pos) {
if (lRecursiveCheckValidParamType(type, false) == false) {
if (CastType<PointerType>(type))
Error(pos, "Varying pointer type parameter \"%s\" is illegal "
"in an exported function.", name.c_str());
else if (CastType<StructType>(type->GetBaseType()))
Error(pos, "Struct parameter \"%s\" with varying member(s) is illegal "
"in an exported function.", name.c_str());
Error(pos, "Struct parameter \"%s\" with varying or vector typed "
"member(s) is illegal in an exported function.", name.c_str());
else if (CastType<VectorType>(type))
Error(pos, "Vector-typed parameter \"%s\" is illegal in an exported "
"function.", name.c_str());
else
Error(pos, "Varying parameter \"%s\" is illegal in an exported function.",
name.c_str());
@@ -747,12 +760,12 @@ Module::AddFunctionDeclaration(const std::string &name,
// This also applies transitively to members I think?
function->setDoesNotAlias(1, true);
// Make sure that the return type isn't 'varying' if the function is
// 'export'ed.
// Make sure that the return type isn't 'varying' or vector typed if
// the function is 'export'ed.
if (functionType->isExported &&
lRecursiveCheckValidParamType(functionType->GetReturnType()))
Error(pos, "Illegal to return a \"varying\" type from exported "
"function \"%s\"", name.c_str());
lRecursiveCheckValidParamType(functionType->GetReturnType(), false) == false)
Error(pos, "Illegal to return a \"varying\" or vector type from "
"exported function \"%s\"", name.c_str());
if (functionType->isTask &&
Type::Equal(functionType->GetReturnType(), AtomicType::Void) == false)
@@ -774,7 +787,7 @@ Module::AddFunctionDeclaration(const std::string &name,
// If the function is exported, make sure that the parameter
// doesn't have any varying stuff going on in it.
if (functionType->isExported)
lCheckForVaryingParameter(argType, argName, argPos);
lCheckExportedParameterTypes(argType, argName, argPos);
// ISPC assumes that no pointers alias. (It should be possible to
// specify when this is not the case, but this should be the

2
tests_errors/export-vector-param.ispc
View File

@@ -1,4 +1,4 @@
// dsgsdhg
// Vector-typed parameter "x" is illegal
export void foo(uniform float<3> x) {
}