Author: marshall
Date: Wed Nov 22 17:25:03 2017
New Revision: 318889
URL: http://llvm.org/viewvc/llvm-project?rev=318889&view=rev
Log:
Add [[nodiscard]] to std::async as part of P0600.
Added:
libcxx/trunk/test/std/thread/futures/futures.async/async.fail.cpp
Modified:
libcxx/trunk/include/future
libcxx/trunk/include/new
Modified: libcxx/trunk/include/future
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/future?rev=318889&r1=318888&r2=318889&view=diff
==============================================================================
--- libcxx/trunk/include/future (original)
+++ libcxx/trunk/include/future Wed Nov 22 17:25:03 2017
@@ -2335,6 +2335,7 @@ inline _LIBCPP_INLINE_VISIBILITY bool __
{ return (int(__policy) & int(__value)) != 0; }
template <class _Fp, class... _Args>
+_LIBCPP_NODISCARD_AFTER_CXX17
future<typename __invoke_of<typename decay<_Fp>::type, typename
decay<_Args>::type...>::type>
async(launch __policy, _Fp&& __f, _Args&&... __args)
{
@@ -2360,7 +2361,7 @@ async(launch __policy, _Fp&& __f, _Args&
}
template <class _Fp, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_NODISCARD_AFTER_CXX17 inline _LIBCPP_INLINE_VISIBILITY
future<typename __invoke_of<typename decay<_Fp>::type, typename
decay<_Args>::type...>::type>
async(_Fp&& __f, _Args&&... __args)
{
Modified: libcxx/trunk/include/new
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/new?rev=318889&r1=318888&r2=318889&view=diff
==============================================================================
--- libcxx/trunk/include/new (original)
+++ libcxx/trunk/include/new Wed Nov 22 17:25:03 2017
@@ -271,7 +271,7 @@ template <class _Tp>
_LIBCPP_NODISCARD_AFTER_CXX17 inline _LIBCPP_INLINE_VISIBILITY
constexpr _Tp* launder(_Tp* __p) noexcept
{
- return __launder(__p);
+ return _VSTD::__launder(__p);
}
#endif
Added: libcxx/trunk/test/std/thread/futures/futures.async/async.fail.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/thread/futures/futures.async/async.fail.cpp?rev=318889&view=auto
==============================================================================
--- libcxx/trunk/test/std/thread/futures/futures.async/async.fail.cpp (added)
+++ libcxx/trunk/test/std/thread/futures/futures.async/async.fail.cpp Wed Nov
22 17:25:03 2017
@@ -0,0 +1,37 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: c++98, c++03
+
+// <future>
+
+// template <class F, class... Args>
+// future<typename result_of<F(Args...)>::type>
+// async(F&& f, Args&&... args);
+
+// template <class F, class... Args>
+// future<typename result_of<F(Args...)>::type>
+// async(launch policy, F&& f, Args&&... args);
+
+
+#include <future>
+#include <atomic>
+#include <memory>
+#include <cassert>
+
+#include "test_macros.h"
+
+int foo (int x) { return x; }
+
+int main ()
+{
+ std::async( foo, 3); // expected-error {{ignoring
return value of function declared with 'nodiscard' attribute}}
+ std::async(std::launch::async, foo, 3); // expected-error {{ignoring
return value of function declared with 'nodiscard' attribute}}
+}
\ No newline at end of file
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
