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

Add missing NULL check in CanBeType

Browse Source
This commit is contained in:
Aaron Gutierrez
2017-05-02 22:26:21 -04:00
parent b3b02df569
commit 93c563e073
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests_ispcpp/error_0.ispc
View File

@@ -1,6 +1,6 @@
//@error //@error
//assigning mismatched polymorphic types //assigning mismatched polymorphic types
export void foo(floating$0 bar) { export void foo(uniform floating$0 bar) {
floating$1 baz = bar; floating$1 baz = bar;
} }

4
tests_ispcpp/error_2.ispc
View File

@@ -1,6 +1,6 @@
//@error //@error
//assigning mismatched polymorphic types //assigning mismatched polymorphic types
export void foo(number$0 bar) { export void foo(uniform floating$0 bar) {
floating$0 baz = bar; integer baz = bar;
} }

20
type.cpp
View File

@@ -855,15 +855,17 @@ PolyType::CanBeType(const Type *t) const {
const AtomicType *at = CastType<AtomicType>(t); const AtomicType *at = CastType<AtomicType>(t);
switch (restriction) { if (at) {
case TYPE_INTEGER: switch (restriction) {
return at->IsIntType(); case TYPE_INTEGER:
case TYPE_FLOATING: return at->IsIntType();
return at->IsFloatType(); case TYPE_FLOATING:
case TYPE_NUMBER: return at->IsFloatType();
return at->IsIntType() || at->IsFloatType(); case TYPE_NUMBER:
default: return at->IsIntType() || at->IsFloatType();
FATAL("Unmatched case for polymorphic restriction"); default:
FATAL("Unmatched case for polymorphic restriction");
}
} }
// not an atomic type or polymorphic type // not an atomic type or polymorphic type