Re: [Patch] Batch of basic_string correctness and performance work

[Paolo Carlini <pcarlini at suse dot de>]

Paolo Carlini wrote:

> Please, test a bit the attached and provide some feedback at your ease,
> we have still a good amount of time before 4.0.0...

I have just committed the below: in fact, on x86, some testcases, when 
statically
linked get a little bit of additional performance improvement. This is 
not the
case on x86_64, where we give away a few % on some tests, but I concur that
this is a safer approach and, more important... I don't want Gawain-full 
nightmares
for the next two nights, so... ;) ;)

Paolo.

////////////////
2004-10-26  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/basic_string.h (append(const basic_string&),
	append(size_type, _CharT)): Move out of line...
	* include/bits/basic_string.tcc: ... here.

diff -urN libstdc++-v3-orig/include/bits/basic_string.h libstdc++-v3/include/bits/basic_string.h
--- libstdc++-v3-orig/include/bits/basic_string.h	2004-10-26 22:03:48.000000000 +0200
+++ libstdc++-v3/include/bits/basic_string.h	2004-10-27 00:55:58.000000000 +0200
@@ -776,19 +776,7 @@
        *  @return  Reference to this string.
        */
       basic_string&
-      append(const basic_string& __str)
-      {
-	const size_type __size = __str.size();
-	if (__size)
-	  {
-	    const size_type __len = __size + this->size();
-	    if (__len > this->capacity() || _M_rep()->_M_is_shared())
-	      this->reserve(__len);
-	    _M_copy(_M_data() + this->size(), __str._M_data(), __size);
-	    _M_rep()->_M_set_length_and_sharable(__len);
-	  }
-	return *this;
-      }
+      append(const basic_string& __str);
 
       /**
        *  @brief  Append a substring.
@@ -835,19 +823,7 @@
        *  Appends n copies of c to this string.
        */
       basic_string&
-      append(size_type __n, _CharT __c)
-      {
-	if (__n)
-	  {
-	    _M_check_length(size_type(0), __n, "basic_string::append");	  
-	    const size_type __len = __n + this->size();
-	    if (__len > this->capacity() || _M_rep()->_M_is_shared())
-	      this->reserve(__len);
-	    _M_assign(_M_data() + this->size(), __n, __c);
-	    _M_rep()->_M_set_length_and_sharable(__len);
-	  }
-	return *this;
-      }
+      append(size_type __n, _CharT __c);
 
       /**
        *  @brief  Append a range of characters.
diff -urN libstdc++-v3-orig/include/bits/basic_string.tcc libstdc++-v3/include/bits/basic_string.tcc
--- libstdc++-v3-orig/include/bits/basic_string.tcc	2004-10-26 22:33:20.000000000 +0200
+++ libstdc++-v3/include/bits/basic_string.tcc	2004-10-27 00:56:07.000000000 +0200
@@ -264,6 +264,23 @@
   template<typename _CharT, typename _Traits, typename _Alloc>
     basic_string<_CharT, _Traits, _Alloc>&
     basic_string<_CharT, _Traits, _Alloc>::
+    append(size_type __n, _CharT __c)
+    {
+      if (__n)
+	{
+	  _M_check_length(size_type(0), __n, "basic_string::append");	  
+	  const size_type __len = __n + this->size();
+	  if (__len > this->capacity() || _M_rep()->_M_is_shared())
+	    this->reserve(__len);
+	  _M_assign(_M_data() + this->size(), __n, __c);
+	  _M_rep()->_M_set_length_and_sharable(__len);
+	}
+      return *this;
+    }
+
+  template<typename _CharT, typename _Traits, typename _Alloc>
+    basic_string<_CharT, _Traits, _Alloc>&
+    basic_string<_CharT, _Traits, _Alloc>::
     append(const _CharT* __s, size_type __n)
     {
       __glibcxx_requires_string_len(__s, __n);
@@ -291,6 +308,23 @@
   template<typename _CharT, typename _Traits, typename _Alloc>
     basic_string<_CharT, _Traits, _Alloc>&
     basic_string<_CharT, _Traits, _Alloc>::
+    append(const basic_string& __str)
+    {
+      const size_type __size = __str.size();
+      if (__size)
+	{
+	  const size_type __len = __size + this->size();
+	  if (__len > this->capacity() || _M_rep()->_M_is_shared())
+	    this->reserve(__len);
+	  _M_copy(_M_data() + this->size(), __str._M_data(), __size);
+	  _M_rep()->_M_set_length_and_sharable(__len);
+	}
+      return *this;
+    }    
+
+  template<typename _CharT, typename _Traits, typename _Alloc>
+    basic_string<_CharT, _Traits, _Alloc>&
+    basic_string<_CharT, _Traits, _Alloc>::
     append(const basic_string& __str, size_type __pos, size_type __n)
     {
       __str._M_check(__pos, "basic_string::append");