This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[v3] Fix libstdc++/10378 (DR 402 [Ready])


Hi,

tested x86-linux, committed.

Paolo.

///////////////
2003-12-01  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/10378
	* include/bits/allocator.h (allocator::construct): Implement
	resolution of DR 402 [Ready] (in Revision 28).
	* include/bits/allocator_traits.h (__allocator::construct):
	Likewise.
	* include/bits/stl_construct.h (_Construct): Likewise.
	* testsuite/20_util/allocator_members.cc: Move to...
	* testsuite/20_util/allocator/1.cc: ... here.
	* testsuite/20_util/allocator/10378.cc: New.
	* docs/html/ext/howto.html: Add an entry for DR 402.
diff -urN libstdc++-v3-orig/docs/html/ext/howto.html libstdc++-v3/docs/html/ext/howto.html
--- libstdc++-v3-orig/docs/html/ext/howto.html	2003-11-22 10:54:25.000000000 +0100
+++ libstdc++-v3/docs/html/ext/howto.html	2003-11-30 22:26:19.000000000 +0100
@@ -694,6 +694,12 @@
     </dt>
     <dd>Change the format string to &quot;%.0Lf&quot;.
     </dd>
+
+    <dt><a href="lwg-active.html#402">402</a>:
+        <em>Wrong new expression in [some_]allocator::construct</em>
+    </dt>
+    <dd>Replace &quot;new&quot; with &quot;::new&quot;.
+    </dd>
 <!--
     <dt><a href="lwg-defects.html#"></a>:
         <em></em>
diff -urN libstdc++-v3-orig/include/bits/allocator.h libstdc++-v3/include/bits/allocator.h
--- libstdc++-v3-orig/include/bits/allocator.h	2003-11-24 22:02:38.000000000 +0100
+++ libstdc++-v3/include/bits/allocator.h	2003-11-30 21:21:38.000000000 +0100
@@ -172,8 +172,10 @@
       size_type
       max_size() const throw() { return size_t(-1) / sizeof(_Tp); }
 
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 402. wrong new expression in [some_]allocator::construct
       void 
-      construct(pointer __p, const _Tp& __val) { new(__p) _Tp(__val); }
+      construct(pointer __p, const _Tp& __val) { ::new(__p) _Tp(__val); }
 
       void 
       destroy(pointer __p) { __p->~_Tp(); }
diff -urN libstdc++-v3-orig/include/bits/allocator_traits.h libstdc++-v3/include/bits/allocator_traits.h
--- libstdc++-v3-orig/include/bits/allocator_traits.h	2003-07-06 06:37:22.000000000 +0200
+++ libstdc++-v3/include/bits/allocator_traits.h	2003-11-30 21:22:16.000000000 +0100
@@ -149,9 +149,11 @@
       
       size_type
       max_size() const throw() { return size_t(-1) / sizeof(_Tp); }
-      
+
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 402. wrong new expression in [some_]allocator::construct
       void
-      construct(pointer __p, const _Tp& __val) { new(__p) _Tp(__val); }
+      construct(pointer __p, const _Tp& __val) { ::new(__p) _Tp(__val); }
       
       void
       destroy(pointer __p) { __p->~_Tp(); }
diff -urN libstdc++-v3-orig/include/bits/stl_construct.h libstdc++-v3/include/bits/stl_construct.h
--- libstdc++-v3-orig/include/bits/stl_construct.h	2003-07-05 06:05:35.000000000 +0200
+++ libstdc++-v3/include/bits/stl_construct.h	2003-11-30 21:41:55.000000000 +0100
@@ -75,7 +75,11 @@
   template <class _T1, class _T2>
     inline void
     _Construct(_T1* __p, const _T2& __value)
-    { new (static_cast<void*>(__p)) _T1(__value); }
+    {
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 402. wrong new expression in [some_]allocator::construct
+      ::new (static_cast<void*>(__p)) _T1(__value); 
+    }
   
   /**
    * @if maint
@@ -86,7 +90,11 @@
   template <class _T1>
     inline void
     _Construct(_T1* __p)
-    { new (static_cast<void*>(__p)) _T1(); }
+    {
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 402. wrong new expression in [some_]allocator::construct     
+      ::new (static_cast<void*>(__p)) _T1();
+    }
 
   /**
    * @if maint
diff -urN libstdc++-v3-orig/testsuite/20_util/allocator/1.cc libstdc++-v3/testsuite/20_util/allocator/1.cc
--- libstdc++-v3-orig/testsuite/20_util/allocator/1.cc	1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/20_util/allocator/1.cc	2003-09-23 22:02:03.000000000 +0200
@@ -0,0 +1,89 @@
+// 2001-06-14  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 20.4.1.1 allocator members
+
+#include <memory>
+#include <stdexcept>
+#include <cstdlib>
+#include <testsuite_hooks.h>
+
+struct gnu { };
+
+bool check_new = false;
+bool check_delete = false;
+
+void* 
+operator new(std::size_t n) throw(std::bad_alloc)
+{
+  check_new = true;
+  return std::malloc(n);
+}
+
+void operator delete(void *v) throw()
+{
+  check_delete = true;
+  return std::free(v);
+}
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  std::allocator<gnu> obj;
+
+  // XXX These should work for various size allocation and
+  // deallocations.  Currently, they only work as expected for sizes >
+  // _MAX_BYTES as defined in stl_alloc.h, which happes to be 128. 
+  gnu* pobj = obj.allocate(256);
+  VERIFY( check_new );
+
+  obj.deallocate(pobj, 256);
+  VERIFY( check_delete );
+}
+
+// libstdc++/8230
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  try 
+    {
+      std::allocator<int> alloc;
+      const std::allocator<int>::size_type n = alloc.max_size();
+      int* p = alloc.allocate(n + 1);
+      p[n] = 2002;
+    } 
+  catch(const std::bad_alloc& e) 
+    {
+      // Allowed.
+      test = true;
+    }
+  catch(...) 
+    {
+      test = false;
+    }
+  VERIFY( test );
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff -urN libstdc++-v3-orig/testsuite/20_util/allocator/10378.cc libstdc++-v3/testsuite/20_util/allocator/10378.cc
--- libstdc++-v3-orig/testsuite/20_util/allocator/10378.cc	1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/20_util/allocator/10378.cc	2003-11-30 21:57:25.000000000 +0100
@@ -0,0 +1,46 @@
+// Copyright (C) 2003 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 20.1.5 allocator requirements / 20.4.1.1 allocator members
+
+#include <list>
+#include <cstdlib>
+#include <testsuite_hooks.h>
+
+class Bob
+{
+public:
+  static void* operator new(size_t sz)
+  { return std::malloc(sz); }
+};
+
+// libstdc++/10378
+void test01()
+{
+  using namespace std;
+  bool test __attribute__((unused)) = true;
+
+  list<Bob> uniset;
+  uniset.push_back(Bob());
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff -urN libstdc++-v3-orig/testsuite/20_util/allocator_members.cc libstdc++-v3/testsuite/20_util/allocator_members.cc
--- libstdc++-v3-orig/testsuite/20_util/allocator_members.cc	2003-09-23 22:02:03.000000000 +0200
+++ libstdc++-v3/testsuite/20_util/allocator_members.cc	1970-01-01 01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-// 2001-06-14  Benjamin Kosnik  <bkoz@redhat.com>
-
-// Copyright (C) 2001, 2002 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 2, 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 COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// 20.4.1.1 allocator members
-
-#include <memory>
-#include <stdexcept>
-#include <cstdlib>
-#include <testsuite_hooks.h>
-
-struct gnu { };
-
-bool check_new = false;
-bool check_delete = false;
-
-void* 
-operator new(std::size_t n) throw(std::bad_alloc)
-{
-  check_new = true;
-  return std::malloc(n);
-}
-
-void operator delete(void *v) throw()
-{
-  check_delete = true;
-  return std::free(v);
-}
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-  std::allocator<gnu> obj;
-
-  // XXX These should work for various size allocation and
-  // deallocations.  Currently, they only work as expected for sizes >
-  // _MAX_BYTES as defined in stl_alloc.h, which happes to be 128. 
-  gnu* pobj = obj.allocate(256);
-  VERIFY( check_new );
-
-  obj.deallocate(pobj, 256);
-  VERIFY( check_delete );
-}
-
-// libstdc++/8230
-void test02()
-{
-  bool test __attribute__((unused)) = true;
-  try 
-    {
-      std::allocator<int> alloc;
-      const std::allocator<int>::size_type n = alloc.max_size();
-      int* p = alloc.allocate(n + 1);
-      p[n] = 2002;
-    } 
-  catch(const std::bad_alloc& e) 
-    {
-      // Allowed.
-      test = true;
-    }
-  catch(...) 
-    {
-      test = false;
-    }
-  VERIFY( test );
-}
-
-int main()
-{
-  test01();
-  test02();
-  return 0;
-}

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]