maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Support: Prefer the LLVM_NODISCARD spelling 

Update functions annotated with LLVM_ATTRIBUTE_UNUSED_RESULT to use
LLVM_NODISCARD instead.

llvm-svn: 284344
This commit is contained in:
Justin Bogner 2016-10-16 20:56:20 +00:00
parent e7e65c9164
commit d563b13803
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
llvm/include/llvm/Support/Casting.h
View File

@ -128,8 +128,7 @@ struct isa_impl_wrap<To, FromTy, FromTy> {
// //
// if (isa<Type>(myVal)) { ... } // if (isa<Type>(myVal)) { ... }
// //
template <class X, class Y> template <class X, class Y> LLVM_NODISCARD inline bool isa(const Y &Val) {
LLVM_ATTRIBUTE_UNUSED_RESULT inline bool isa(const Y &Val) {
return isa_impl_wrap<X, const Y, return isa_impl_wrap<X, const Y,
typename simplify_type<const Y>::SimpleType>::doit(Val); typename simplify_type<const Y>::SimpleType>::doit(Val);
} }
@ -243,9 +242,10 @@ inline typename cast_retty<X, Y *>::ret_type cast(Y *Val) {
// accepted. // accepted.
// //
template <class X, class Y> template <class X, class Y>
LLVM_ATTRIBUTE_UNUSED_RESULT inline typename std::enable_if< LLVM_NODISCARD inline
!is_simple_type<Y>::value, typename cast_retty<X, const Y>::ret_type>::type typename std::enable_if<!is_simple_type<Y>::value,
cast_or_null(const Y &Val) { typename cast_retty<X, const Y>::ret_type>::type
cast_or_null(const Y &Val) {
if (!Val) if (!Val)
return nullptr; return nullptr;
assert(isa<X>(Val) && "cast_or_null<Ty>() argument of incompatible type!"); assert(isa<X>(Val) && "cast_or_null<Ty>() argument of incompatible type!");
@ -253,9 +253,10 @@ cast_or_null(const Y &Val) {
} }
template <class X, class Y> template <class X, class Y>
LLVM_ATTRIBUTE_UNUSED_RESULT inline typename std::enable_if< LLVM_NODISCARD inline
!is_simple_type<Y>::value, typename cast_retty<X, Y>::ret_type>::type typename std::enable_if<!is_simple_type<Y>::value,
cast_or_null(Y &Val) { typename cast_retty<X, Y>::ret_type>::type
cast_or_null(Y &Val) {
if (!Val) if (!Val)
return nullptr; return nullptr;
assert(isa<X>(Val) && "cast_or_null<Ty>() argument of incompatible type!"); assert(isa<X>(Val) && "cast_or_null<Ty>() argument of incompatible type!");
@ -263,7 +264,7 @@ cast_or_null(Y &Val) {
} }
template <class X, class Y> template <class X, class Y>
LLVM_ATTRIBUTE_UNUSED_RESULT inline typename cast_retty<X, Y *>::ret_type LLVM_NODISCARD inline typename cast_retty<X, Y *>::ret_type
cast_or_null(Y *Val) { cast_or_null(Y *Val) {
if (!Val) return nullptr; if (!Val) return nullptr;
assert(isa<X>(Val) && "cast_or_null<Ty>() argument of incompatible type!"); assert(isa<X>(Val) && "cast_or_null<Ty>() argument of incompatible type!");
@ -280,21 +281,20 @@ cast_or_null(Y *Val) {
// //
template <class X, class Y> template <class X, class Y>
LLVM_ATTRIBUTE_UNUSED_RESULT inline typename std::enable_if< LLVM_NODISCARD inline
!is_simple_type<Y>::value, typename cast_retty<X, const Y>::ret_type>::type typename std::enable_if<!is_simple_type<Y>::value,
dyn_cast(const Y &Val) { typename cast_retty<X, const Y>::ret_type>::type
dyn_cast(const Y &Val) {
return isa<X>(Val) ? cast<X>(Val) : nullptr; return isa<X>(Val) ? cast<X>(Val) : nullptr;
} }
template <class X, class Y> template <class X, class Y>
LLVM_ATTRIBUTE_UNUSED_RESULT inline typename cast_retty<X, Y>::ret_type LLVM_NODISCARD inline typename cast_retty<X, Y>::ret_type dyn_cast(Y &Val) {
dyn_cast(Y &Val) {
return isa<X>(Val) ? cast<X>(Val) : nullptr; return isa<X>(Val) ? cast<X>(Val) : nullptr;
} }
template <class X, class Y> template <class X, class Y>
LLVM_ATTRIBUTE_UNUSED_RESULT inline typename cast_retty<X, Y *>::ret_type LLVM_NODISCARD inline typename cast_retty<X, Y *>::ret_type dyn_cast(Y *Val) {
dyn_cast(Y *Val) {
return isa<X>(Val) ? cast<X>(Val) : nullptr; return isa<X>(Val) ? cast<X>(Val) : nullptr;
} }
@ -302,21 +302,23 @@ dyn_cast(Y *Val) {
// value is accepted. // value is accepted.
// //
template <class X, class Y> template <class X, class Y>
LLVM_ATTRIBUTE_UNUSED_RESULT inline typename std::enable_if< LLVM_NODISCARD inline
!is_simple_type<Y>::value, typename cast_retty<X, const Y>::ret_type>::type typename std::enable_if<!is_simple_type<Y>::value,
dyn_cast_or_null(const Y &Val) { typename cast_retty<X, const Y>::ret_type>::type
dyn_cast_or_null(const Y &Val) {
return (Val && isa<X>(Val)) ? cast<X>(Val) : nullptr; return (Val && isa<X>(Val)) ? cast<X>(Val) : nullptr;
} }
template <class X, class Y> template <class X, class Y>
LLVM_ATTRIBUTE_UNUSED_RESULT inline typename std::enable_if< LLVM_NODISCARD inline
!is_simple_type<Y>::value, typename cast_retty<X, Y>::ret_type>::type typename std::enable_if<!is_simple_type<Y>::value,
dyn_cast_or_null(Y &Val) { typename cast_retty<X, Y>::ret_type>::type
dyn_cast_or_null(Y &Val) {
return (Val && isa<X>(Val)) ? cast<X>(Val) : nullptr; return (Val && isa<X>(Val)) ? cast<X>(Val) : nullptr;
} }
template <class X, class Y> template <class X, class Y>
LLVM_ATTRIBUTE_UNUSED_RESULT inline typename cast_retty<X, Y *>::ret_type LLVM_NODISCARD inline typename cast_retty<X, Y *>::ret_type
dyn_cast_or_null(Y *Val) { dyn_cast_or_null(Y *Val) {
return (Val && isa<X>(Val)) ? cast<X>(Val) : nullptr; return (Val && isa<X>(Val)) ? cast<X>(Val) : nullptr;
} }