1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add RBIMPL_ATTR_NONSTRING_ARRAY() macro for GCC 15

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2025-05-05 16:16:26 +09:00 committed by Nobuyoshi Nakada
parent ce51ef30df
commit bbf1130f91
Notes: git 2025-05-05 09:25:18 +00:00 
Merged: https://github.com/ruby/ruby/pull/13256
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
enc/trans/iso2022.trans
View File

@ -437,7 +437,7 @@ rb_cp50221_encoder = {
/* JIS0201 to JIS0208 conversion table */ /* JIS0201 to JIS0208 conversion table */
enum {tbl0208_num = 0xDF - 0xA1 + 1}; enum {tbl0208_num = 0xDF - 0xA1 + 1};
RBIMPL_ATTR_NONSTRING() static const char tbl0208[tbl0208_num][2] = { RBIMPL_ATTR_NONSTRING_ARRAY() static const char tbl0208[tbl0208_num][2] = {
"\x21\x23", "\x21\x56", "\x21\x57", "\x21\x22", "\x21\x23", "\x21\x56", "\x21\x57", "\x21\x22",
"\x21\x26", "\x25\x72", "\x25\x21", "\x25\x23", "\x21\x26", "\x25\x72", "\x25\x21", "\x25\x23",
"\x25\x25", "\x25\x27", "\x25\x29", "\x25\x63", "\x25\x25", "\x25\x27", "\x25\x29", "\x25\x63",

6
include/ruby/internal/attr/nonstring.h
View File

@ -25,8 +25,14 @@
/** Wraps (or simulates) `__attribute__((nonstring))` */ /** Wraps (or simulates) `__attribute__((nonstring))` */
#if RBIMPL_HAS_ATTRIBUTE(nonstring) #if RBIMPL_HAS_ATTRIBUTE(nonstring)
# define RBIMPL_ATTR_NONSTRING() __attribute__((nonstring)) # define RBIMPL_ATTR_NONSTRING() __attribute__((nonstring))
# if RBIMPL_COMPILER_SINCE(GCC, 15, 0, 0)
# define RBIMPL_ATTR_NONSTRING_ARRAY() RBIMPL_ATTR_NONSTRING()
# else
# define RBIMPL_ATTR_NONSTRING_ARRAY() /* void */
# endif
#else #else
# define RBIMPL_ATTR_NONSTRING() /* void */ # define RBIMPL_ATTR_NONSTRING() /* void */
# define RBIMPL_ATTR_NONSTRING_ARRAY() /* void */
#endif #endif
#endif /* RBIMPL_ATTR_NONSTRING_H */ #endif /* RBIMPL_ATTR_NONSTRING_H */

2
symbol.c
View File

@ -172,7 +172,7 @@ rb_id_attrset(ID id)
/* make new symbol and ID */ /* make new symbol and ID */
if (!(str = lookup_id_str(id))) { if (!(str = lookup_id_str(id))) {
static const char id_types[][8] = { RBIMPL_ATTR_NONSTRING_ARRAY() static const char id_types[][8] = {
"local", "local",
"instance", "instance",
"invalid", "invalid",