From 58ea24d3e3c68ac2e8b568ede0a513896ce7da22 Mon Sep 17 00:00:00 2001
From: peter klausler <pklausler@nvidia.com>
Date: Wed, 7 Aug 2019 09:18:20 -0700
Subject: [PATCH] [flang] Dodge two bogus warnings from g++ 8.1

Original-commit: flang-compiler/f18@aa19aeb92aedb02310a081f794c7a2046e801e2d
Reviewed-on: https://github.com/flang-compiler/f18/pull/633
---
 flang/lib/evaluate/expression.cc | 3 +--
 flang/lib/evaluate/tools.h       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/flang/lib/evaluate/expression.cc b/flang/lib/evaluate/expression.cc
index 0d412c9..4e260bb 100644
--- a/flang/lib/evaluate/expression.cc
+++ b/flang/lib/evaluate/expression.cc
@@ -88,9 +88,8 @@ std::optional<DynamicType> ExpressionBase<A>::GetType() const {
         [&](const auto &x) -> std::optional<DynamicType> {
           if constexpr (!common::HasMember<decltype(x), TypelessExpression>) {
             return x.GetType();
-          } else {
-            return std::nullopt;
           }
+          return std::nullopt;  // w/o "else" to dodge bogus g++ 8.1 warning
         },
         derived().u);
   }
diff --git a/flang/lib/evaluate/tools.h b/flang/lib/evaluate/tools.h
index 0b3dc38..7658dc9 100644
--- a/flang/lib/evaluate/tools.h
+++ b/flang/lib/evaluate/tools.h
@@ -217,9 +217,8 @@ std::optional<DataRef> ExtractDataRef(const Designator<T> &d) {
       [](const auto &x) -> std::optional<DataRef> {
         if constexpr (common::HasMember<decltype(x), decltype(DataRef::u)>) {
           return DataRef{x};
-        } else {
-          return std::nullopt;
         }
+        return std::nullopt;  // w/o "else" to dodge bogus g++ 8.1 warning
       },
       d.u);
 }
-- 
2.7.4