From 73fc15a9891f59ce46f65e19f2b89b589c154b20 Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Mon, 17 Oct 2016 07:37:11 +0000 Subject: [PATCH] Support: Drop LLVM_ATTRIBUTE_UNUSED_RESULT Uses of this have all been updated to use LLVM_NODISCARD, which matches the C++17 [[nodiscard]] semantics rather than those of GCC's __attribute__((warn_unused_result)). llvm-svn: 284367 --- llvm/docs/ReleaseNotes.rst | 4 ++++ llvm/include/llvm/Support/Compiler.h | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/llvm/docs/ReleaseNotes.rst b/llvm/docs/ReleaseNotes.rst index 286cb8f..b6dfc3d 100644 --- a/llvm/docs/ReleaseNotes.rst +++ b/llvm/docs/ReleaseNotes.rst @@ -41,6 +41,10 @@ Non-comprehensive list of changes in this release functionality, or simply have a lot to talk about), see the `NOTE` below for adding a new subsection. +* The definition and uses of LLVM_ATRIBUTE_UNUSED_RESULT in the LLVM source + were replaced with LLVM_NODISCARD, which matches the C++17 [[nodiscard]] + semantics rather than gcc's __attribute__((warn_unused_result)). + * ... next change ... .. NOTE diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h index c6e8875..eebf59a 100644 --- a/llvm/include/llvm/Support/Compiler.h +++ b/llvm/include/llvm/Support/Compiler.h @@ -130,15 +130,6 @@ #define LLVM_ATTRIBUTE_USED #endif -/// LLVM_ATTRIBUTE_UNUSED_RESULT - Deprecated. Use LLVM_NODISCARD instead. -#if __has_attribute(warn_unused_result) || LLVM_GNUC_PREREQ(3, 4, 0) -#define LLVM_ATTRIBUTE_UNUSED_RESULT __attribute__((__warn_unused_result__)) -#elif defined(_MSC_VER) -#define LLVM_ATTRIBUTE_UNUSED_RESULT _Check_return_ -#else -#define LLVM_ATTRIBUTE_UNUSED_RESULT -#endif - /// LLVM_NODISCARD - Warn if a type or return value is discarded. #if __cplusplus > 201402L && __has_cpp_attribute(nodiscard) #define LLVM_NODISCARD [[nodiscard]] -- 2.7.4