kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rb_str_new: hoist RB_CONSTANT_P out of function

Browse source 
https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html says:

> GCC never returns 1 when you call the inline function with a string
> constant or ...

Because rb_str_new and familiy take string constants, it was a bad idea
for them to contain RB_CONSTANT_P.  We should instead do so in
corresponding macros. [ruby-core:98212]
This commit is contained in:
卜部昌平 2020-05-10 18:47:03 +09:00
parent 9e41a75255
commit 534277fa7b
Notes: git 2020-05-11 11:08:08 +09:00
1 changed files with 82 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

162
include/ruby/internal/intern/string.h
View file

@ -138,169 +138,133 @@ rbimpl_strlen(const char *str)
return RBIMPL_CAST((long)strlen(str));
}
static inline VALUE
rbimpl_str_new(const char *str, long len)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_str_new(str, len);
}
else if /* constexpr */ (! RBIMPL_CONSTANT_P(len)) {
return rb_str_new(str, len);
}
else {
return rb_str_new_static(str, len);
}
}
static inline VALUE
rbimpl_str_new_cstr(const char *str)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_str_new_cstr(str);
}
else {
long len = rbimpl_strlen(str);
return rb_str_new_static(str, len);
}
}
static inline VALUE
rbimpl_usascii_str_new(const char *str, long len)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_usascii_str_new(str, len);
}
else if /* constexpr */ (! RBIMPL_CONSTANT_P(len)) {
return rb_usascii_str_new(str, len);
}
else {
return rb_usascii_str_new_static(str, len);
}
}
static inline VALUE
rbimpl_utf8_str_new(const char *str, long len)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_utf8_str_new(str, len);
}
else if /* constexpr */ (! RBIMPL_CONSTANT_P(len)) {
return rb_utf8_str_new(str, len);
}
else {
return rb_utf8_str_new_static(str, len);
}
}
static inline VALUE
rbimpl_tainted_str_new_cstr(const char *str)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_tainted_str_new_cstr(str);
}
else {
long len = rbimpl_strlen(str);
return rb_tainted_str_new(str, len);
}
}
static inline VALUE
rbimpl_usascii_str_new_cstr(const char *str)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_usascii_str_new_cstr(str);
}
else {
long len = rbimpl_strlen(str);
return rb_usascii_str_new_static(str, len);
}
}
static inline VALUE
rbimpl_utf8_str_new_cstr(const char *str)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_utf8_str_new_cstr(str);
}
else {
long len = rbimpl_strlen(str);
return rb_utf8_str_new_static(str, len);
}
}
static inline VALUE
rbimpl_external_str_new_cstr(const char *str)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_external_str_new_cstr(str);
}
else {
long len = rbimpl_strlen(str);
return rb_external_str_new(str, len);
}
}
static inline VALUE
rbimpl_locale_str_new_cstr(const char *str)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_locale_str_new_cstr(str);
}
else {
long len = rbimpl_strlen(str);
return rb_locale_str_new(str, len);
}
}
static inline VALUE
rbimpl_str_buf_new_cstr(const char *str)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_str_buf_new_cstr(str);
}
else {
long len = rbimpl_strlen(str);
VALUE buf = rb_str_buf_new(len);
return rb_str_buf_cat(buf, str, len);
}
}
static inline VALUE
rbimpl_str_cat_cstr(VALUE buf, const char *str)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_str_cat_cstr(buf, str);
}
else {
long len = rbimpl_strlen(str);
return rb_str_cat(buf, str, len);
}
}
static inline VALUE
rbimpl_exc_new_cstr(VALUE exc, const char *str)
{
if /* constexpr */ (! RBIMPL_CONSTANT_P(str)) {
return rb_exc_new_cstr(exc, str);
}
else {
long len = rbimpl_strlen(str);
return rb_exc_new(exc, str, len);
}
}
#define rb_str_new rbimpl_str_new
#define rb_str_new_cstr rbimpl_str_new_cstr
#define rb_usascii_str_new rbimpl_usascii_str_new
#define rb_utf8_str_new rbimpl_utf8_str_new
#define rb_tainted_str_new_cstr rbimpl_tainted_str_new_cstr
#define rb_usascii_str_new_cstr rbimpl_usascii_str_new_cstr
#define rb_utf8_str_new_cstr rbimpl_utf8_str_new_cstr
#define rb_external_str_new_cstr rbimpl_external_str_new_cstr
#define rb_locale_str_new_cstr rbimpl_locale_str_new_cstr
#define rb_str_buf_new_cstr rbimpl_str_buf_new_cstr
#define rb_str_cat_cstr rbimpl_str_cat_cstr
#define rb_exc_new_cstr rbimpl_exc_new_cstr
#define rb_str_new(str, len) \
((RBIMPL_CONSTANT_P(str) && \
RBIMPL_CONSTANT_P(len) ? \
rb_str_new_static : \
rb_str_new) ((str), (len)))
#define rb_str_new_cstr(str) \
((RBIMPL_CONSTANT_P(str) ? \
rbimpl_str_new_cstr : \
rb_str_new_cstr) (str))
#define rb_usascii_str_new(str, len) \
((RBIMPL_CONSTANT_P(str) && \
RBIMPL_CONSTANT_P(len) ? \
rb_usascii_str_new_static : \
rb_usascii_str_new) ((str), (len)))
#define rb_utf8_str_new(str, len) \
((RBIMPL_CONSTANT_P(str) && \
RBIMPL_CONSTANT_P(len) ? \
rb_utf8_str_new_static : \
rb_utf8_str_new) ((str), (len)))
#define rb_tainted_str_new_cstr(str) \
((RBIMPL_CONSTANT_P(str) ? \
rbimpl_tainted_str_new_cstr : \
rb_tainted_str_new_cstr) (str))
#define rb_usascii_str_new_cstr(str) \
((RBIMPL_CONSTANT_P(str) ? \
rbimpl_usascii_str_new_cstr : \
rb_usascii_str_new_cstr) (str))
#define rb_utf8_str_new_cstr(str) \
((RBIMPL_CONSTANT_P(str) ? \
rbimpl_utf8_str_new_cstr : \
rb_utf8_str_new_cstr) (str))
#define rb_external_str_new_cstr(str) \
((RBIMPL_CONSTANT_P(str) ? \
rbimpl_external_str_new_cstr : \
rb_external_str_new_cstr) (str))
#define rb_locale_str_new_cstr(str) \
((RBIMPL_CONSTANT_P(str) ? \
rbimpl_locale_str_new_cstr : \
rb_locale_str_new_cstr) (str))
#define rb_str_buf_new_cstr(str) \
((RBIMPL_CONSTANT_P(str) ? \
rbimpl_str_buf_new_cstr : \
rb_str_buf_new_cstr) (str))
#define rb_str_cat_cstr(buf, str) \
((RBIMPL_CONSTANT_P(str) ? \
rbimpl_str_cat_cstr : \
rb_str_cat_cstr) ((buf), (str)))
#define rb_exc_new_cstr(exc, str) \
((RBIMPL_CONSTANT_P(str) ? \
rbimpl_exc_new_cstr : \
rb_exc_new_cstr) ((exc), (str)))
#define rb_str_new2 rb_str_new_cstr
#define rb_str_new3 rb_str_new_shared
#define rb_str_new4 rb_str_new_frozen