From d6f90f03e09a55424ed8c784cfed92b83dc2a345 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 20 Feb 2012 21:08:48 +0000 Subject: [PATCH] re PR libstdc++/52241 (Performance degradation of 447.dealII on corei7 at spec2006_base32.) 2012-02-20 Paolo Carlini PR libstdc++/52241 * src/c++98/tree.cc (local_Rb_tree_increment, local_Rb_tree_decrement): Add. (_Rb_tree_increment(const _Rb_tree_node_base*), _Rb_tree_decrement(const _Rb_tree_node_base*)): Use the latter. (_Rb_tree_increment(_Rb_tree_node_base*), _Rb_tree_decrement(_Rb_tree_node_base*)): New. From-SVN: r184404 --- libstdc++-v3/ChangeLog | 10 ++++++++++ libstdc++-v3/src/c++98/tree.cc | 26 +++++++++++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b301599de06f..01679dc3c5cc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2012-02-20 Paolo Carlini + + PR libstdc++/52241 + * src/c++98/tree.cc (local_Rb_tree_increment, + local_Rb_tree_decrement): Add. + (_Rb_tree_increment(const _Rb_tree_node_base*), + _Rb_tree_decrement(const _Rb_tree_node_base*)): Use the latter. + (_Rb_tree_increment(_Rb_tree_node_base*), + _Rb_tree_decrement(_Rb_tree_node_base*)): New. + 2012-02-20 Paolo Carlini PR libstdc++/52309 diff --git a/libstdc++-v3/src/c++98/tree.cc b/libstdc++-v3/src/c++98/tree.cc index 0a7f6f9e4859..731ce367a927 100644 --- a/libstdc++-v3/src/c++98/tree.cc +++ b/libstdc++-v3/src/c++98/tree.cc @@ -1,6 +1,6 @@ // RB tree utilities implementation -*- C++ -*- -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 2009, 2012 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 @@ -56,8 +56,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - _Rb_tree_node_base* - _Rb_tree_increment(_Rb_tree_node_base* __x) throw () + static _Rb_tree_node_base* + local_Rb_tree_increment(_Rb_tree_node_base* __x) throw () { if (__x->_M_right != 0) { @@ -79,14 +79,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __x; } + _Rb_tree_node_base* + _Rb_tree_increment(_Rb_tree_node_base* __x) throw () + { + return local_Rb_tree_increment(__x); + } + const _Rb_tree_node_base* _Rb_tree_increment(const _Rb_tree_node_base* __x) throw () { - return _Rb_tree_increment(const_cast<_Rb_tree_node_base*>(__x)); + return local_Rb_tree_increment(const_cast<_Rb_tree_node_base*>(__x)); } - _Rb_tree_node_base* - _Rb_tree_decrement(_Rb_tree_node_base* __x) throw () + static _Rb_tree_node_base* + local_Rb_tree_decrement(_Rb_tree_node_base* __x) throw () { if (__x->_M_color == _S_red && __x->_M_parent->_M_parent == __x) @@ -111,10 +117,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __x; } + _Rb_tree_node_base* + _Rb_tree_decrement(_Rb_tree_node_base* __x) throw () + { + return local_Rb_tree_decrement(__x); + } + const _Rb_tree_node_base* _Rb_tree_decrement(const _Rb_tree_node_base* __x) throw () { - return _Rb_tree_decrement(const_cast<_Rb_tree_node_base*>(__x)); + return local_Rb_tree_decrement(const_cast<_Rb_tree_node_base*>(__x)); } static void