diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-12-10 18:33:17 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-12-10 18:39:48 +0900 |
| commit | a5baf8d6bc4c21259705f9b4f9aa2d9b9d7ab936 (patch) | |
| tree | 48adbcc6bf6ec26c76325b67002836415bd28a3d /include | |
| parent | 787daea6d2199c34d951aa3de0f3048829a8ea13 (diff) | |
Revert zero-check for alloca
Something weird results in int-in-bool-context and
stringop-overflow warnings.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/internal/memory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/ruby/internal/memory.h b/include/ruby/internal/memory.h index 242892d50f..aa3464465d 100644 --- a/include/ruby/internal/memory.h +++ b/include/ruby/internal/memory.h @@ -284,7 +284,7 @@ typedef uint128_t DSIZE_T; * @return A pointer on stack. */ #define ALLOCA_N(type,n) \ - RBIMPL_CAST((type *)(!(n) ? NULL : alloca(rbimpl_size_mul_or_raise(sizeof(type), (n))))) + RBIMPL_CAST((type *)alloca(rbimpl_size_mul_or_raise(sizeof(type), (n)))) /** * Identical to #RB_ALLOCV_N(), except it implicitly assumes the type of array @@ -297,7 +297,7 @@ typedef uint128_t DSIZE_T; */ #define RB_ALLOCV(v, n) \ ((n) < RUBY_ALLOCV_LIMIT ? \ - ((v) = 0, !(n) ? NULL : alloca(n)) : \ + ((v) = 0, alloca(n)) : \ rb_alloc_tmp_buffer(&(v), (n))) /** @@ -330,7 +330,7 @@ typedef uint128_t DSIZE_T; #define RB_ALLOCV_N(type, v, n) \ RBIMPL_CAST((type *) \ (((size_t)(n) < RUBY_ALLOCV_LIMIT / sizeof(type)) ? \ - ((v) = 0, !(n) ? NULL : alloca((n) * sizeof(type))) : \ + ((v) = 0, alloca((n) * sizeof(type))) : \ rb_alloc_tmp_buffer2(&(v), (n), sizeof(type)))) /** |