diff options
| -rw-r--r-- | core/intrinsics/intrinsics.odin | 2 | ||||
| -rw-r--r-- | core/simd/simd.odin | 2 | ||||
| -rw-r--r-- | src/check_builtin.cpp | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/core/intrinsics/intrinsics.odin b/core/intrinsics/intrinsics.odin index a24f1d868..8f2ebce13 100644 --- a/core/intrinsics/intrinsics.odin +++ b/core/intrinsics/intrinsics.odin @@ -237,7 +237,7 @@ simd_reduce_or :: proc(a: #simd[N]T) -> T --- simd_reduce_xor :: proc(a: #simd[N]T) -> T --- simd_shuffle :: proc(a, b: #simd[N]T, indices: #simd[max 2*N]u32) -> #simd[len(indices)]T --- -simd_select :: proc(cond: #simd[N]any_boolean, true, false: #simd[N]T) -> #simd[N]T --- +simd_select :: proc(cond: #simd[N]boolean_or_integer, true, false: #simd[N]T) -> #simd[N]T --- // WASM targets only diff --git a/core/simd/simd.odin b/core/simd/simd.odin index ab0d9937b..b26719d56 100644 --- a/core/simd/simd.odin +++ b/core/simd/simd.odin @@ -80,7 +80,7 @@ swizzle :: builtin.swizzle // shuffle :: proc(a, b: #simd[N]T, indices: #simd[max 2*N]u32) -> #simd[len(indices)]T shuffle :: intrinsics.simd_shuffle -// select :: proc(cond: #simd[N]any_boolean, true, false: #simd[N]T) -> #simd[N]T +// select :: proc(cond: #simd[N]boolean_or_integer, true, false: #simd[N]T) -> #simd[N]T select :: intrinsics.simd_select splat :: #force_inline proc "contextless" ($T: typeid/#simd[$LANES]$E, value: E) -> T { diff --git a/src/check_builtin.cpp b/src/check_builtin.cpp index eaf71fdab..add719280 100644 --- a/src/check_builtin.cpp +++ b/src/check_builtin.cpp @@ -824,8 +824,11 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call error(cond.expr, "'%.*s' expected a simd vector boolean type", LIT(builtin_name)); return false; } - if (!is_type_boolean(base_array_type(cond.type))) { - error(cond.expr, "'%.*s' expected a simd vector boolean type", LIT(builtin_name)); + Type *cond_elem = base_array_type(cond.type); + if (!is_type_boolean(cond_elem) && !is_type_integer(cond_elem)) { + gbString cond_str = type_to_string(cond.type); + error(cond.expr, "'%.*s' expected a simd vector boolean or integer type, got '%s'", LIT(builtin_name), cond_str); + gb_string_free(cond_str); return false; } |