From 22bd95ded46f7163bde16e4782648de2ce5e87a1 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 29 Oct 2009 19:47:28 +0000 Subject: [PATCH] * include/ruby/ruby.h (RSTRING_END): trivial optimization. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- include/ruby/ruby.h | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b4ce9af8e..cfd295c69c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -Fri Oct 30 04:44:01 2009 Nobuyoshi Nakada +Fri Oct 30 04:47:26 2009 Nobuyoshi Nakada + + * include/ruby/ruby.h (RSTRING_END): trivial optimization. * string.c (rb_str_sub_bang): trivial optimization. diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 19f146e4ad..55836a8fd4 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -619,7 +619,12 @@ struct RString { (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \ RSTRING(str)->as.ary : \ RSTRING(str)->as.heap.ptr) -#define RSTRING_END(str) (RSTRING_PTR(str)+RSTRING_LEN(str)) +#define RSTRING_END(str) \ + (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \ + (RSTRING(str)->as.ary + \ + ((RBASIC(str)->flags >> RSTRING_EMBED_LEN_SHIFT) & \ + (RSTRING_EMBED_LEN_MASK >> RSTRING_EMBED_LEN_SHIFT))) : \ + (RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len)) #define RARRAY_EMBED_LEN_MAX 3 struct RArray {