From c2d293ea25ccff560bcb32a7d60b102bf9a8426f Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Thu, 11 Aug 2022 11:06:24 -0700 Subject: [PATCH] Compiler.h: remove unused LLVM_NODISCARD Reviewed By: kazu Differential Revision: https://reviews.llvm.org/D131695 --- llvm/include/llvm/Support/Compiler.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h index 8a79d19e446e..c4cfea1fb3c8 100644 --- a/llvm/include/llvm/Support/Compiler.h +++ b/llvm/include/llvm/Support/Compiler.h @@ -144,23 +144,6 @@ #define LLVM_DEPRECATED(MSG, FIX) [[deprecated(MSG)]] #endif -/// LLVM_NODISCARD - Warn if a type or return value is discarded. - -// Use the 'nodiscard' attribute in C++17 or newer mode. -#if defined(__cplusplus) && __cplusplus > 201402L && LLVM_HAS_CPP_ATTRIBUTE(nodiscard) -#define LLVM_NODISCARD [[nodiscard]] -#elif LLVM_HAS_CPP_ATTRIBUTE(clang::warn_unused_result) -#define LLVM_NODISCARD [[clang::warn_unused_result]] -// Clang in C++14 mode claims that it has the 'nodiscard' attribute, but also -// warns in the pedantic mode that 'nodiscard' is a C++17 extension (PR33518). -// Use the 'nodiscard' attribute in C++14 mode only with GCC. -// TODO: remove this workaround when PR33518 is resolved. -#elif defined(__GNUC__) && LLVM_HAS_CPP_ATTRIBUTE(nodiscard) -#define LLVM_NODISCARD [[nodiscard]] -#else -#define LLVM_NODISCARD -#endif - // Indicate that a non-static, non-const C++ member function reinitializes // the entire object to a known state, independent of the previous state of // the object.