remove AddWarning

Author: akuhlens

flang/include/flang/Parser/message.h

@@ -335,24 +335,12 @@ class Messages {
     return messages_.emplace_back(std::forward<A>(args)...);
   }
 
-  // AddWarning bypasses the language feature control, it is only exposed for
-  // legacy code that cannot be easily refactored to use Warn().
-  template <typename... A>
-  Message &AddWarning(common::UsageWarning warning, A &&...args) {
-    return messages_.emplace_back(warning, std::forward<A>(args)...);
-  }
-
-  template <typename... A>
-  Message &AddWarning(common::LanguageFeature feature, A &&...args) {
-    return messages_.emplace_back(feature, std::forward<A>(args)...);
-  }
-
   template <typename... A>
   Message *Warn(bool isInModuleFile,
       const common::LanguageFeatureControl &control,
       common::LanguageFeature feature, A &&...args) {
     if (!isInModuleFile && control.ShouldWarn(feature)) {
-      return &AddWarning(feature, std::forward<A>(args)...);
+      return &addWarning(feature, std::forward<A>(args)...);
     }
     return nullptr;
   }
@@ -362,7 +350,7 @@ class Messages {
       const common::LanguageFeatureControl &control,
       common::UsageWarning warning, A &&...args) {
     if (!isInModuleFile && control.ShouldWarn(warning)) {
-      return &AddWarning(warning, std::forward<A>(args)...);
+      return &addWarning(warning, std::forward<A>(args)...);
     }
     return nullptr;
   }
@@ -383,6 +371,14 @@ class Messages {
   bool AnyFatalError(bool warningsAreErrors = false) const;
 
 private:
+  template <typename... A>
+  Message &addWarning(common::UsageWarning warning, A &&...args) {
+    return messages_.emplace_back(warning, std::forward<A>(args)...);
+  }
+  template <typename... A>
+  Message &addWarning(common::LanguageFeature feature, A &&...args) {
+    return messages_.emplace_back(feature, std::forward<A>(args)...);
+  }
   std::list<Message> messages_;
 };
 

flang/lib/Semantics/check-declarations.cpp

@@ -3134,12 +3134,12 @@ parser::Messages CheckHelper::WhyNotInteroperableDerivedType(
                        *dyType, &context_.languageFeatures())
                         .value_or(false)) {
           if (type->category() == DeclTypeSpec::Logical) {
-            msgs.AddWarning(common::UsageWarning::LogicalVsCBool,
+            context().Warn(msgs, common::UsageWarning::LogicalVsCBool,
                 component.name(),
                 "A LOGICAL component of an interoperable type should have the interoperable KIND=C_BOOL"_port_en_US);
           } else if (type->category() == DeclTypeSpec::Character && dyType &&
               dyType->kind() == 1) {
-            msgs.AddWarning(common::UsageWarning::BindCCharLength,
+            context().Warn(msgs, common::UsageWarning::BindCCharLength,
                 component.name(),
                 "A CHARACTER component of an interoperable type should have length 1"_port_en_US);
           } else {
@@ -3156,7 +3156,7 @@ parser::Messages CheckHelper::WhyNotInteroperableDerivedType(
       }
     }
     if (derived->componentNames().empty()) { // F'2023 C1805
-      msgs.AddWarning(common::LanguageFeature::EmptyBindCDerivedType,
+      context().Warn(msgs, common::LanguageFeature::EmptyBindCDerivedType,
           symbol.name(),
           "A derived type with the BIND attribute should not be empty"_warn_en_US);
     }