Patchwork fix libstdc++/48541

login
register
mail settings
Submitter Jonathan Wakely
Date April 10, 2011, 4:36 p.m.
Message ID <BANLkTikpWc+y9u18zW7Cy1D9czB38mjokw@mail.gmail.com>
Download mbox | patch
Permalink /patch/90524/
State New
Headers show

Comments

Jonathan Wakely - April 10, 2011, 4:36 p.m.
A simple one.

        PR libstdc++/48541
        * include/std/functional (_Base_manager::_M_get_pointer): Use
        addressof.
        * testsuite/20_util/function/48541.cc: New.

Tested x86_64-linux, committed to trunk and the 4.6 branch.

Patch

Index: include/std/functional
===================================================================
--- include/std/functional	(revision 172239)
+++ include/std/functional	(working copy)
@@ -1586,7 +1586,7 @@  _GLIBCXX_HAS_NESTED_TYPE(result_type)
 	_M_get_pointer(const _Any_data& __source)
 	{
 	  const _Functor* __ptr =
-	    __stored_locally? &__source._M_access<_Functor>()
+	    __stored_locally? std::__addressof(__source._M_access<_Functor>())
 	    /* have stored a pointer */ : __source._M_access<_Functor*>();
 	  return const_cast<_Functor*>(__ptr);
 	}
Index: testsuite/20_util/function/48451.cc
===================================================================
--- testsuite/20_util/function/48451.cc	(revision 0)
+++ testsuite/20_util/function/48451.cc	(revision 0)
@@ -0,0 +1,40 @@ 
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+// Copyright (C) 2011 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// libstdc++/48451
+
+#include <functional>
+
+struct X {
+  void operator () () const { }
+  float operator & () const { return 1.2345; }
+};
+
+void test01()
+{
+  X x;
+  std::function<void()> f(x);
+  f();
+}
+
+int main()
+{
+  test01();
+  return 0;
+}