Patchwork Implement std::make_unique

login
register
mail settings
Submitter Jonathan Wakely
Date May 18, 2013, 3:11 p.m.
Message ID <CAH6eHdRtOo3pXU2MtTxmptXR8E8F5fvigJzx-DxU9jmZtO4JOA@mail.gmail.com>
Download mbox | patch
Permalink /patch/244762/
State New
Headers show

Comments

Jonathan Wakely - May 18, 2013, 3:11 p.m.
* include/bits/unique_ptr.h (make_unique): Define.
        * testsuite/20_util/unique_ptr/creation/single.cc: New.
        * testsuite/20_util/unique_ptr/creation/array.cc: New.
        * testsuite/20_util/unique_ptr/creation/array_neg.cc: New.

Tested x86_64-linux, committed to trunk.

This is safe for 4.8.2 so I'll commit it there once the branch reopens.

It might even be nice to provide this for C++11, maybe when using
-std=gnu++11 not -std=c++11, or by putting the declarations in
namespace std::__cxx14, which is inline in C++14 but not in C++11
mode.
commit d0ee6a7b7520d0386c4dbc4189f86ade9268462f
Author: Jonathan Wakely <jwakely.gcc@gmail.com>
Date:   Sat May 18 15:23:07 2013 +0100

    	* include/bits/unique_ptr.h (make_unique): Define.
    	* testsuite/20_util/unique_ptr/creation/single.cc: New.
    	* testsuite/20_util/unique_ptr/creation/array.cc: New.
    	* testsuite/20_util/unique_ptr/creation/array_neg.cc: New.
Paolo Carlini - May 18, 2013, 3:36 p.m.
Hi,

Jonathan Wakely <jwakely.gcc@gmail.com> ha scritto:

>        * include/bits/unique_ptr.h (make_unique): Define.
>        * testsuite/20_util/unique_ptr/creation/single.cc: New.
>        * testsuite/20_util/unique_ptr/creation/array.cc: New.
>        * testsuite/20_util/unique_ptr/creation/array_neg.cc: New.
>
>Tested x86_64-linux, committed to trunk.

Great! Don't we want it inline?

Thanks,
Paolo
Paolo Carlini - May 18, 2013, 3:57 p.m.
Hi again,

>This is safe for 4.8.2 so I'll commit it there once the branch reopens.

... note that this will be tricky because in the branch __cplusplus doesn't have the right value. And then at least the std::fgets tweak also needs backporting.

Paolo
Jonathan Wakely - May 18, 2013, 4:01 p.m.
On 18 May 2013 16:57, Paolo Carlini wrote:
>
>
> Hi again,
>
>>This is safe for 4.8.2 so I'll commit it there once the branch reopens.
>
> ... note that this will be tricky because in the branch __cplusplus doesn't have the right value. And then at least the std::fgets tweak also needs backporting.

Ah I didn't realise that change was only for trunk, I won't add it to
the branch then.

I'll make them inline though, thanks.

Patch

diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h
index 66d73b2..e98b85f 100644
--- a/libstdc++-v3/include/bits/unique_ptr.h
+++ b/libstdc++-v3/include/bits/unique_ptr.h
@@ -607,6 +607,37 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
       }
     };
 
+#if __cplusplus > 201103L
+  template<typename _Tp>
+    struct _MakeUniq
+    { typedef unique_ptr<_Tp> __single_object; };
+
+  template<typename _Tp>
+    struct _MakeUniq<_Tp[]>
+    { typedef unique_ptr<_Tp[]> __array; };
+
+  template<typename _Tp, size_t _Bound>
+    struct _MakeUniq<_Tp[_Bound]>
+    { struct __invalid_type { }; };
+
+  /// std::make_unique for single objects
+  template<typename _Tp, typename... _Args>
+    typename _MakeUniq<_Tp>::__single_object
+    make_unique(_Args&&... __args)
+    { return unique_ptr<_Tp>(new _Tp(std::forward<_Args>(__args)...)); }
+
+  /// std::make_unique for arrays of unknown bound
+  template<typename _Tp>
+    typename _MakeUniq<_Tp>::__array
+    make_unique(size_t __num)
+    { return unique_ptr<_Tp>(new typename remove_extent<_Tp>::type[__num]()); }
+
+  /// Disable std::make_unique for arrays of known bound
+  template<typename _Tp, typename... _Args>
+    typename _MakeUniq<_Tp>::__invalid_type
+    make_unique(_Args&&...) = delete;
+#endif
+
   // @} group pointer_abstractions
 
 _GLIBCXX_END_NAMESPACE_VERSION
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc
new file mode 100644
index 0000000..8943310
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc
@@ -0,0 +1,46 @@ 
+// { dg-options "-std=gnu++1y" }
+
+// Copyright (C) 2013 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/>.
+
+// 20.9.1.4 unique_ptr creation [unique.ptr.create]
+
+#include <memory>
+#include <testsuite_hooks.h>
+
+struct A
+{
+  A() : b(true) { }
+  A(int) : b(false) { }
+  bool b;
+};
+
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  std::unique_ptr<A[]> a = std::make_unique<A[]>(3);
+  VERIFY( a != nullptr );
+  VERIFY( a[0].b && a[1].b && a[2].b );
+}
+
+int
+main()
+{
+  test01();
+}
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array_neg.cc
new file mode 100644
index 0000000..1e55622
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array_neg.cc
@@ -0,0 +1,34 @@ 
+// { dg-options "-std=gnu++1y" }
+// { dg-do compile }
+
+// Copyright (C) 2013 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/>.
+
+// 20.9.1.4 unique_ptr creation [unique.ptr.create]
+
+#include <memory>
+#include <testsuite_hooks.h>
+
+struct A { };
+
+auto p1 = std::make_unique<A[]>();      // { dg-error "no matching function" }
+auto p2 = std::make_unique<A[]>(1, 2);  // { dg-error "no matching function" }
+auto p3 = std::make_unique<A[1]>();     // { dg-error "deleted" }
+auto p4 = std::make_unique<A[1]>(1);    // { dg-error "deleted" }
+
+// { dg-prune-output "declared here" }
+// { dg-prune-output "no type named" }
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc
new file mode 100644
index 0000000..689e849
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc
@@ -0,0 +1,53 @@ 
+// { dg-options "-std=gnu++1y" }
+
+// Copyright (C) 2013 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/>.
+
+// 20.9.1.4 unique_ptr creation [unique.ptr.create]
+
+#include <memory>
+#include <testsuite_hooks.h>
+
+struct A
+{
+  A() : b(false) { }
+  A(int, double&, char&&, void*) : b(true) { }
+  bool b;
+};
+
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  int i = 0;
+  double d = 0;
+  char c = 0;
+  std::unique_ptr<A> a = std::make_unique<A>(i, d, std::move(c), nullptr);
+  VERIFY( a != nullptr );
+  VERIFY( a->b );
+
+  a = std::make_unique<A>();
+  VERIFY( a != nullptr );
+  VERIFY( !a->b );
+}
+
+int
+main()
+{
+  test01();
+}