nobu	2008-06-28 21:15:55 +0900 (Sat, 28 Jun 2008)

  New Revision: 17634

  Modified files:
    branches/mvm/.merged-trunk-revision
    branches/mvm/ChangeLog
    branches/mvm/include/ruby/intern.h
    trunk/ChangeLog
    trunk/include/ruby/intern.h

  Log:
    * include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
      rb_usascii_str_new2): use inline versions only for constant
      literals.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17634&r2=17633&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/ChangeLog?r1=17634&r2=17633&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/intern.h?r1=17634&r2=17633&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/include/ruby/intern.h?r1=17634&r2=17633&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/.merged-trunk-revision?r1=17634&r2=17633&diff_format=u

Index: include/ruby/intern.h
===================================================================
--- include/ruby/intern.h	(revision 17633)
+++ include/ruby/intern.h	(revision 17634)
@@ -535,10 +535,25 @@
 VALUE rb_str_tmp_new(long);
 VALUE rb_usascii_str_new(const char*, long);
 VALUE rb_usascii_str_new2(const char*);
-#if __GNUC__ >= 4 && defined __OPTIMIZE__ && __OPTIMIZE__
-#define rb_str_new2(str) ({const char *_s = (str); rb_str_new(_s, strlen(_s));})
-#define rb_tainted_str_new2(str) ({const char *_s = (str); rb_tainted_str_new(_s, strlen(_s));})
-#define rb_usascii_str_new2(str) ({const char *_s = (str); rb_usascii_str_new(_s, strlen(_s));})
+#if defined __GNUC__
+#define rb_str_new2(str) (			\
+{						\
+    (__builtin_constant_p(str)) ?	       \
+	rb_str_new(str, strlen(str)) :		\
+	rb_str_new2(str);			\
+})
+#define rb_tainted_str_new2(str) ( \
+{					       \
+    (__builtin_constant_p(str)) ?	       \
+	rb_tainted_str_new(str, strlen(str)) : \
+	rb_tainted_str_new2(str);	       \
+})
+#define rb_usascii_str_new2(str) ( \
+{					       \
+    (__builtin_constant_p(str)) ?	       \
+	rb_usascii_str_new(str, strlen(str)) : \
+	rb_usascii_str_new2(str);	       \
+})
 #endif
 void rb_str_free(VALUE);
 void rb_str_shared_replace(VALUE, VALUE);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17633)
+++ ChangeLog	(revision 17634)
@@ -1,7 +1,8 @@
-Sat Jun 28 20:50:35 2008  Nobuyoshi Nakada  <nobu@r...>
+Sat Jun 28 21:15:43 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
-	  rb_usascii_str_new2): use inline versions for gcc 4 or lator.
+	  rb_usascii_str_new2): use inline versions only for constant
+	  literals.
 
 Sat Jun 28 13:12:06 2008  Tanaka Akira  <akr@f...>
 
Index: mvm/include/ruby/intern.h
===================================================================
--- mvm/include/ruby/intern.h	(revision 17633)
+++ mvm/include/ruby/intern.h	(revision 17634)
@@ -535,10 +535,25 @@
 VALUE rb_str_tmp_new(long);
 VALUE rb_usascii_str_new(const char*, long);
 VALUE rb_usascii_str_new2(const char*);
-#if __GNUC__ >= 4 && defined __OPTIMIZE__ && __OPTIMIZE__
-#define rb_str_new2(str) ({const char *_s = (str); rb_str_new(_s, strlen(_s));})
-#define rb_tainted_str_new2(str) ({const char *_s = (str); rb_tainted_str_new(_s, strlen(_s));})
-#define rb_usascii_str_new2(str) ({const char *_s = (str); rb_usascii_str_new(_s, strlen(_s));})
+#if defined __GNUC__
+#define rb_str_new2(str) (			\
+{						\
+    (__builtin_constant_p(str)) ?	       \
+	rb_str_new(str, strlen(str)) :		\
+	rb_str_new2(str);			\
+})
+#define rb_tainted_str_new2(str) ( \
+{					       \
+    (__builtin_constant_p(str)) ?	       \
+	rb_tainted_str_new(str, strlen(str)) : \
+	rb_tainted_str_new2(str);	       \
+})
+#define rb_usascii_str_new2(str) ( \
+{					       \
+    (__builtin_constant_p(str)) ?	       \
+	rb_usascii_str_new(str, strlen(str)) : \
+	rb_usascii_str_new2(str);	       \
+})
 #endif
 void rb_str_free(VALUE);
 void rb_str_shared_replace(VALUE, VALUE);
Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 17633)
+++ mvm/ChangeLog	(revision 17634)
@@ -1,7 +1,8 @@
-Sat Jun 28 20:50:35 2008  Nobuyoshi Nakada  <nobu@r...>
+Sat Jun 28 21:15:43 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
-	  rb_usascii_str_new2): use inline versions for gcc 4 or lator.
+	  rb_usascii_str_new2): use inline versions only for constant
+	  literals.
 
 Sat Jun 28 13:12:06 2008  Tanaka Akira  <akr@f...>
 
Index: mvm/.merged-trunk-revision
===================================================================
--- mvm/.merged-trunk-revision	(revision 17633)
+++ mvm/.merged-trunk-revision	(revision 17634)
@@ -1 +1 @@
-17632
+17634

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/