[flang] Address comments, clean up warnings

Original-commit: flang-compiler/f18@a5eeeb4430825020e14141c0d51d1bb7160546e5
Reviewed-on: https://github.com/flang-compiler/f18/pull/378

diff --git a/flang/lib/evaluate/formatting.cc b/flang/lib/evaluate/formatting.cc
index e5ebc2acaab1cad44ab14aef6ecd806832906942..8b5cb8ece1ac691e3988bbb34ffb3de876fd563a 100644 (file)
--- a/flang/lib/evaluate/formatting.cc
+++ b/flang/lib/evaluate/formatting.cc
@@ -207,20 +207,6 @@ template<TypeCategory CAT>
 static constexpr Precedence GetPrecedence(const Expr<SomeKind<CAT>> &expr) {
   return std::visit([](const auto &x) { return GetPrecedence(x); }, expr.u);
 }
-static constexpr Precedence GetPrecedence(const Expr<SomeDerived> &expr) {
-  return std::visit(
-      [](const auto &x) { return ToPrecedence<std::decay_t<decltype(x)>>; },
-      expr.u);
-}
-static constexpr Precedence GetPrecedence(const BOZLiteralConstant &) {
-  return Precedence::Primary;
-}
-static constexpr Precedence GetPrecedence(const NullPointer &) {
-  return Precedence::Primary;
-}
-static constexpr Precedence GetPrecedence(const Expr<SomeType> &expr) {
-  return std::visit([](const auto &x) { return GetPrecedence(x); }, expr.u);
-}
 
 template<typename T> static bool IsNegatedScalarConstant(const Expr<T> &expr) {
   static constexpr TypeCategory cat{T::category};

diff --git a/flang/lib/semantics/mod-file.cc b/flang/lib/semantics/mod-file.cc
index 1cac33998a63f96ad66997bac52fbda70da212a8..d0c05007407106277aa54dc2b69fa632a33cc6d1 100644 (file)
--- a/flang/lib/semantics/mod-file.cc
+++ b/flang/lib/semantics/mod-file.cc
@@ -98,7 +98,6 @@ private:
       DoSymbol(*symbol);
     }
   }
-
 };
 
 bool ModFileWriter::WriteAll() {
@@ -391,7 +390,6 @@ std::vector<const Symbol *> CollectSymbols(const Scope &scope) {
   }
   for (const auto &pair : scope.commonBlocks()) {
     const Symbol *symbol{pair.second};
-    SourceName name{pair.first};
     if (symbols.insert(symbol).second) {
       common.push_back(symbol);
     }

diff --git a/flang/lib/semantics/scope.cc b/flang/lib/semantics/scope.cc
index 2186dda59b74fa699dfa695c5ffdf8e7d3dde0d9..c4bc84029ee15d0c0a18307abf03067a0c0d718c 100644 (file)
--- a/flang/lib/semantics/scope.cc
+++ b/flang/lib/semantics/scope.cc
@@ -186,8 +186,7 @@ bool Scope::CanImport(const SourceName &name) const {
 }
 
 const Scope *Scope::FindScope(parser::CharBlock source) const {
-  return const_cast<const Scope *>(
-      const_cast<Scope *>(this)->FindScope(source));
+  return const_cast<Scope *>(this)->FindScope(source);
 }
 
 Scope *Scope::FindScope(parser::CharBlock source) {

diff --git a/flang/lib/semantics/semantics.cc b/flang/lib/semantics/semantics.cc
index 6efff1bd21d55ee3735be1f4df849dc7a87f07eb..0c5ca158acf65cad92835972f4b370b98730e670 100644 (file)
--- a/flang/lib/semantics/semantics.cc
+++ b/flang/lib/semantics/semantics.cc
@@ -116,8 +116,7 @@ bool SemanticsContext::AnyFatalError() const {
 }
 
 const Scope &SemanticsContext::FindScope(parser::CharBlock source) const {
-  return const_cast<const Scope &>(
-      const_cast<SemanticsContext *>(this)->FindScope(source));
+  return const_cast<SemanticsContext *>(this)->FindScope(source);
 }
 
 Scope &SemanticsContext::FindScope(parser::CharBlock source) {