From 0c4be46253825314223aee85bd404b7157d09ffa Mon Sep 17 00:00:00 2001
From: Adrian Prantl <aprantl@apple.com>
Date: Wed, 17 Aug 2016 16:42:15 +0000
Subject: [PATCH] Simplify condition. (NFC)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@278946 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/AST/Decl.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index cf34c7ab8d..cfdd5579c3 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -2657,13 +2657,14 @@ bool FunctionDecl::isGlobal() const {
 }
 
 bool FunctionDecl::isNoReturn() const {
-  bool HasNoReturnAttr = hasAttr<NoReturnAttr>() || hasAttr<CXX11NoReturnAttr>()
-                         || hasAttr<C11NoReturnAttr>();
-  const auto *FuncType = getType()->getAs<FunctionType>();
-  bool TypeHasNoReturnAttr = false;
-  if (FuncType)
-    TypeHasNoReturnAttr = FuncType->getNoReturnAttr();
-  return HasNoReturnAttr || TypeHasNoReturnAttr;
+  if (hasAttr<NoReturnAttr>() || hasAttr<CXX11NoReturnAttr>() ||
+      hasAttr<C11NoReturnAttr>())
+    return true;
+
+  if (auto *FnTy = getType()->getAs<FunctionType>())
+    return FnTy->getNoReturnAttr();
+
+  return false;
 }
 
 void
-- 
2.40.0