From 3e92bb77aa888da17bfe5a12dcb9585ef2b863ee Mon Sep 17 00:00:00 2001
From: peter klausler <pklausler@nvidia.com>
Date: Fri, 7 Jun 2019 12:00:32 -0700
Subject: [PATCH] [flang] Address review comment

Original-commit: flang-compiler/f18@d6964fdd9f5ef3a34caa33922430ce5578a2e2a9
Reviewed-on: https://github.com/flang-compiler/f18/pull/488
---
 flang/lib/evaluate/tools.h | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/flang/lib/evaluate/tools.h b/flang/lib/evaluate/tools.h
index ff4d420..f5a1fd3 100644
--- a/flang/lib/evaluate/tools.h
+++ b/flang/lib/evaluate/tools.h
@@ -76,11 +76,7 @@ template<typename T> bool IsVariable(const Expr<T> &expr) {
   return std::visit([](const auto &x) { return IsVariable(x); }, expr.u);
 }
 template<typename A> bool IsVariable(const std::optional<A> &x) {
-  if (x.has_value()) {
-    return IsVariable(*x);
-  } else {
-    return false;
-  }
+  return x.has_value() && IsVariable(*x);
 }
 
 // Predicate: true when an expression is assumed-rank
@@ -99,11 +95,7 @@ template<typename T> bool IsAssumedRank(const Expr<T> &expr) {
   return std::visit([](const auto &x) { return IsAssumedRank(x); }, expr.u);
 }
 template<typename A> bool IsAssumedRank(const std::optional<A> &x) {
-  if (x.has_value()) {
-    return IsAssumedRank(*x);
-  } else {
-    return false;
-  }
+  return x.has_value() && IsAssumedRank(*x);
 }
 
 // Generalizing packagers: these take operations and expressions of more
@@ -667,11 +659,7 @@ inline bool IsProcedurePointer(const Expr<SomeType> &expr) {
       [](const auto &x) { return IsProcedurePointer(x); }, expr.u);
 }
 template<typename A> bool IsProcedurePointer(const std::optional<A> &x) {
-  if (x.has_value()) {
-    return IsProcedurePointer(*x);
-  } else {
-    return false;
-  }
+  return x.has_value() && IsProcedurePointer(*x);
 }
 }
 #endif  // FORTRAN_EVALUATE_TOOLS_H_
-- 
2.7.4