diff options
| author | Benoit Daloze <eregontp@gmail.com> | 2021-04-29 14:28:08 +0200 |
|---|---|---|
| committer | Benoit Daloze <eregontp@gmail.com> | 2021-05-04 14:56:55 +0200 |
| commit | f1dcc3da5d89b0a03cbc280e7eafb845d63a1f6a (patch) | |
| tree | d1db337b6f82ca54abc90a6c12d179111cf16120 | |
| parent | 68d6bd0873557c12bec6f8e0f8db622f1499d8a7 (diff) | |
Add RBIMPL_RVALUE_EMBED_LEN_MAX neeeded by internal/bignum.h
* It evaluated to 0 before, revealed by -Wundef
* See [Feature #17752]
Co-authored-by: xtkoba (Tee KOBAYASHI) <xtkoba+ruby@gmail.com>
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4428
| -rw-r--r-- | include/ruby/internal/core/rbasic.h | 5 | ||||
| -rw-r--r-- | internal/bignum.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/ruby/internal/core/rbasic.h b/include/ruby/internal/core/rbasic.h index a6093c047a..aafec2422f 100644 --- a/include/ruby/internal/core/rbasic.h +++ b/include/ruby/internal/core/rbasic.h @@ -37,10 +37,11 @@ /** @cond INTERNAL_MACRO */ #define RBIMPL_EMBED_LEN_MAX_OF(T) \ - RBIMPL_CAST((int)(sizeof(VALUE[RVALUE_EMBED_LEN_MAX]) / (sizeof(T)))) + RBIMPL_CAST((int)(sizeof(VALUE[RBIMPL_RVALUE_EMBED_LEN_MAX]) / (sizeof(T)))) /** @endcond */ -enum ruby_rvalue_flags { RVALUE_EMBED_LEN_MAX = 3 }; +#define RBIMPL_RVALUE_EMBED_LEN_MAX 3 +enum ruby_rvalue_flags { RVALUE_EMBED_LEN_MAX = RBIMPL_RVALUE_EMBED_LEN_MAX }; struct RUBY_ALIGNAS(SIZEOF_VALUE) diff --git a/internal/bignum.h b/internal/bignum.h index aaada45ed8..9b89e61f28 100644 --- a/internal/bignum.h +++ b/internal/bignum.h @@ -83,8 +83,8 @@ #define BIGNUM_EMBED_LEN_SHIFT \ (FL_USHIFT+3) /* bit offset of BIGNUM_EMBED_LEN_MASK */ #ifndef BIGNUM_EMBED_LEN_MAX -# if (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1 -# define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) +# if (SIZEOF_VALUE*RBIMPL_RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1 +# define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*RBIMPL_RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) # else # define BIGNUM_EMBED_LEN_MAX ((1 << BIGNUM_EMBED_LEN_NUMBITS)-1) # endif |