OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/44413 (inefficient code for std::string::compare on x86-64)

Browse Source 
2010-06-09  Paolo Carlini  <paolo.carlini@oracle.com>

	Revert:    
	2010-06-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/44413
	* include/ext/vstring_util.h (__vstring_utility<>::_S_compare):
	Simplify, just return -1, 0, 1.

From-SVN: r160476
This commit is contained in:
Paolo Carlini 2010-06-09 14:02:03 +00:00 committed by Paolo Carlini
parent 1d5360463f
commit 6ef9e52dc6
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2010-06-09 Paolo Carlini <paolo.carlini@oracle.com>
Revert:
2010-06-09 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/44413
* include/ext/vstring_util.h (__vstring_utility<>::_S_compare):
Simplify, just return -1, 0, 1.
2010-06-09 Iain Sandoe <iains@gcc.gnu.org>
PR bootstrap/43170

17
libstdc++-v3/include/ext/vstring_util.h
View File

@ -1,7 +1,6 @@
// Versatile string utility -*- C++ -*-
// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
// Free Software Foundation, Inc.
// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -51,10 +50,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
{
typedef typename _Alloc::template rebind<_CharT>::other _CharT_alloc_type;
typedef _Traits traits_type;
typedef _Traits traits_type;
typedef typename _Traits::char_type value_type;
typedef typename _CharT_alloc_type::size_type size_type;
typedef typename _CharT_alloc_type::difference_type difference_type;
typedef typename _CharT_alloc_type::difference_type difference_type;
typedef typename _CharT_alloc_type::pointer pointer;
typedef typename _CharT_alloc_type::const_pointer const_pointer;
@ -165,8 +164,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
static int
_S_compare(size_type __n1, size_type __n2)
{
const difference_type __d = __n1 - __n2;
return __d == 0 ? 0 : (__d > 0 ? 1 : -1);
const difference_type __d = difference_type(__n1 - __n2);
if (__d > __numeric_traits_integer<int>::__max)
return __numeric_traits_integer<int>::__max;
else if (__d < __numeric_traits_integer<int>::__min)
return __numeric_traits_integer<int>::__min;
else
return int(__d);
}
};