respect modules files

Author: akuhlens

flang/include/flang/Evaluate/common.h

@@ -257,13 +257,13 @@ class FoldingContext {
   }
   template <typename... A>
   parser::Message *Warn(common::LanguageFeature feature, A &&...args) {
-    return messages_.Warn(/*isInModuleFile=*/false, languageFeatures_, feature,
-        std::forward<A>(args)...);
+    return messages_.Warn(
+        IsInModuleFile(), languageFeatures_, feature, std::forward<A>(args)...);
   }
   template <typename... A>
   parser::Message *Warn(common::UsageWarning warning, A &&...args) {
-    return messages_.Warn(/*isInModuleFile=*/false, languageFeatures_, warning,
-        std::forward<A>(args)...);
+    return messages_.Warn(
+        IsInModuleFile(), languageFeatures_, warning, std::forward<A>(args)...);
   }
   std::optional<parser::CharBlock> moduleFileName() const {
     return moduleFileName_;
@@ -272,6 +272,7 @@ class FoldingContext {
     moduleFileName_ = n;
     return *this;
   }
+  bool IsInModuleFile() const { return moduleFileName_.has_value(); }
 
   ConstantSubscript &StartImpliedDo(parser::CharBlock, ConstantSubscript = 1);
   std::optional<ConstantSubscript> GetImpliedDo(parser::CharBlock) const;

flang/include/flang/Parser/message.h

@@ -339,7 +339,7 @@ class Messages {
       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;
   }
@@ -349,7 +349,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;
   }
@@ -371,11 +371,11 @@ class Messages {
 
 private:
   template <typename... A>
-  Message &addWarning(common::UsageWarning warning, A &&...args) {
+  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) {
+  Message &AddWarning(common::LanguageFeature feature, A &&...args) {
     return messages_.emplace_back(feature, std::forward<A>(args)...);
   }
   std::list<Message> messages_;

flang/lib/Evaluate/fold-integer.cpp

@@ -1440,8 +1440,10 @@ Expr<Type<TypeCategory::Integer, KIND>> FoldIntrinsicFunction(
           context.targetCharacteristics().GetByteSize(TypeCategory::Real,
               context.defaults().GetDefaultKind(TypeCategory::Real))};
       if (intBytes != realBytes) {
-        context.Warn(common::UsageWarning::FoldingValueChecks,
-            *context.moduleFileName(),
+        // Using the low-level API to bypass the module file check in this case.
+        context.messages().Warn(
+            /*isInModuleFile=*/false, context.languageFeatures(),
+            common::UsageWarning::FoldingValueChecks, *context.moduleFileName(),
             "NUMERIC_STORAGE_SIZE from ISO_FORTRAN_ENV is not well-defined when default INTEGER and REAL are not consistent due to compiler options"_warn_en_US);
       }
       return Expr<T>{8 * std::min(intBytes, realBytes)};