From 7749d43f3f72b656fe57fab6a4cea84bcab17dd0 Mon Sep 17 00:00:00 2001
From: peter klausler <pklausler@nvidia.com>
Date: Thu, 15 Aug 2019 14:25:05 -0700
Subject: [PATCH] [flang] Another pass with clean builds

Original-commit: flang-compiler/f18@e05dc1f4440fc42f0264f50cc01b4eb072d4c10f
Reviewed-on: https://github.com/flang-compiler/f18/pull/666
---
 flang/CMakeLists.txt              |  2 ++
 flang/lib/common/format.h         |  4 ++--
 flang/test/evaluate/fp-testing.cc |  7 ++++++-
 flang/test/evaluate/real.cc       | 12 +++++++-----
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt
index 15710bf..aecbb6c 100644
--- a/flang/CMakeLists.txt
+++ b/flang/CMakeLists.txt
@@ -29,6 +29,7 @@ if(BUILD_WITH_CLANG)
   if(GCC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${GCC}")
   endif()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument")
 endif()
 
 # Set RPATH in every executable, overriding the default setting.
@@ -96,6 +97,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-qual")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wimplicit-fallthrough")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdelete-non-virtual-dtor")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument")
    set(CMAKE_CXX_FLAGS_RELEASE    "-O2")
    set(CMAKE_CXX_FLAGS_MINSIZEREL "-O2 '-DCHECK=(void)'")
    set(CMAKE_CXX_FLAGS_DEBUG      "-g -DDEBUGF18")
diff --git a/flang/lib/common/format.h b/flang/lib/common/format.h
index 4ae7609..2bf5384 100644
--- a/flang/lib/common/format.h
+++ b/flang/lib/common/format.h
@@ -712,7 +712,7 @@ template<typename CHAR> bool FormatValidator<CHAR>::Check() {
       }
       hasDataEditDesc = false;
       NextToken();
-      // fall through
+      [[fallthrough]];
     case TokenKind::LParen:
       if (knrValue_ == 0) {
         ReportError("List repeat specifier must be positive", knrToken_);
@@ -748,7 +748,7 @@ template<typename CHAR> bool FormatValidator<CHAR>::Check() {
       if (suppressMessageCascade_ || reporterExit_) {
         break;
       }
-      // fall through
+      [[fallthrough]];
     default: ReportError("Unexpected '%s' in format expression"); NextToken();
     }
 
diff --git a/flang/test/evaluate/fp-testing.cc b/flang/test/evaluate/fp-testing.cc
index bf236a4..e2811ac 100644
--- a/flang/test/evaluate/fp-testing.cc
+++ b/flang/test/evaluate/fp-testing.cc
@@ -20,7 +20,12 @@
 using Fortran::evaluate::RealFlag;
 
 ScopedHostFloatingPointEnvironment::ScopedHostFloatingPointEnvironment(
-    bool treatSubnormalOperandsAsZero, bool flushSubnormalResultsToZero) {
+#if __x86_64__
+    bool treatSubnormalOperandsAsZero, bool flushSubnormalResultsToZero
+#else
+    bool, bool
+#endif
+    ) {
   errno = 0;
   if (feholdexcept(&originalFenv_) != 0) {
     std::fprintf(stderr, "feholdexcept() failed: %s\n", std::strerror(errno));
diff --git a/flang/test/evaluate/real.cc b/flang/test/evaluate/real.cc
index 868622a..45f0757 100644
--- a/flang/test/evaluate/real.cc
+++ b/flang/test/evaluate/real.cc
@@ -268,11 +268,13 @@ enum FlagBits {
   Inexact = 16,
 };
 
-std::uint32_t FlagsToBits(const RealFlags &flags) {
+#ifdef __clang__
+// clang support for fenv.h is broken, so tests of flag settings
+// are disabled.
+inline std::uint32_t FlagsToBits(const RealFlags &) { return 0; }
+#else
+inline std::uint32_t FlagsToBits(const RealFlags &flags) {
   std::uint32_t bits{0};
-#ifndef __clang__
-  // TODO: clang support for fenv.h is broken, so tests of flag settings
-  // are disabled.
   if (flags.test(RealFlag::Overflow)) {
     bits |= Overflow;
   }
@@ -288,9 +290,9 @@ std::uint32_t FlagsToBits(const RealFlags &flags) {
   if (flags.test(RealFlag::Inexact)) {
     bits |= Inexact;
   }
-#endif  // __clang__
   return bits;
 }
+#endif  // __clang__
 
 template<typename UINT = std::uint32_t, typename FLT = float, typename REAL>
 void inttest(std::int64_t x, int pass, Rounding rounding) {
-- 
2.7.4