From cc7ff9d2f9b8f2562d119b4a00d78c69f40cf6af Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 11 Nov 2008 18:31:06 +0000 Subject: [PATCH] * include/ruby/intern.h (rb_{external,locale}_str_new_cstr): optimized versions for literal strings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ include/ruby/intern.h | 12 ++++++++++++ string.c | 2 ++ 3 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index db0576455b..a4ce409c77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 12 03:30:59 2008 Nobuyoshi Nakada + + * include/ruby/intern.h (rb_{external,locale}_str_new_cstr): optimized + versions for literal strings. + Wed Nov 12 03:28:41 2008 Nobuyoshi Nakada * load.c (rb_require_safe): destroys barrier after successfully diff --git a/include/ruby/intern.h b/include/ruby/intern.h index a04ae309b8..a2d4fcb91a 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -621,6 +621,18 @@ size_t rb_str_capacity(VALUE); rb_usascii_str_new(str, strlen(str)) : \ rb_usascii_str_new_cstr(str); \ }) +#define rb_external_str_new_cstr(str) __extension__ ( \ +{ \ + (__builtin_constant_p(str)) ? \ + rb_external_str_new(str, strlen(str)) : \ + rb_external_str_new_cstr(str); \ +}) +#define rb_locale_str_new_cstr(str) __extension__ ( \ +{ \ + (__builtin_constant_p(str)) ? \ + rb_locale_str_new(str, strlen(str)) : \ + rb_locale_str_new_cstr(str); \ +}) #define rb_str_buf_new_cstr(str) __extension__ ( \ { \ (__builtin_constant_p(str)) ? \ diff --git a/string.c b/string.c index 3dd86c9119..d931cd9ca4 100644 --- a/string.c +++ b/string.c @@ -28,6 +28,8 @@ #undef rb_str_new_cstr #undef rb_tainted_str_new_cstr #undef rb_usascii_str_new_cstr +#undef rb_external_str_new_cstr +#undef rb_locale_str_new_cstr #undef rb_str_new2 #undef rb_str_new3 #undef rb_str_new4