[flang-commits] [flang] 0bfa4ac - [flang] Improve "Error reading module file" error message

[peter klausler via flang-commits]

Author: peter klausler
Date: 2021-02-11T11:08:12-08:00
New Revision: 0bfa4ac6c6fceffcffb3ae44027859cf6f5e06c0

URL: https://github.com/llvm/llvm-project/commit/0bfa4ac6c6fceffcffb3ae44027859cf6f5e06c0
DIFF: https://github.com/llvm/llvm-project/commit/0bfa4ac6c6fceffcffb3ae44027859cf6f5e06c0.diff

LOG: [flang] Improve "Error reading module file" error message

Instead of using a message attachment with further details,
emit the details as part of a single message.

Differential Revision: https://reviews.llvm.org/D96465

Added: 
    

Modified: 
    flang/lib/Semantics/mod-file.cpp
    flang/test/Flang-Driver/include-module.f90
    flang/test/Semantics/resolve12.f90
    flang/test/Semantics/resolve26.f90

Removed: 
    


################################################################################
diff  --git a/flang/lib/Semantics/mod-file.cpp b/flang/lib/Semantics/mod-file.cpp
index af3267a1c9a0..c3b95a7836a8 100644
--- a/flang/lib/Semantics/mod-file.cpp
+++ b/flang/lib/Semantics/mod-file.cpp
@@ -861,13 +861,13 @@ Scope *ModFileReader::Read(const SourceName &name, Scope *ancestor) {
 parser::Message &ModFileReader::Say(const SourceName &name,
     const std::string &ancestor, parser::MessageFixedText &&msg,
     const std::string &arg) {
-  return context_
-      .Say(name,
-          ancestor.empty()
-              ? "Error reading module file for module '%s'"_err_en_US
-              : "Error reading module file for submodule '%s' of module '%s'"_err_en_US,
-          name, ancestor)
-      .Attach(name, std::move(msg), arg);
+  return context_.Say(name, "Cannot read module file for %s: %s"_err_en_US,
+      parser::MessageFormattedText{ancestor.empty()
+              ? "module '%s'"_en_US
+              : "submodule '%s' of module '%s'"_en_US,
+          name, ancestor}
+          .MoveString(),
+      parser::MessageFormattedText{std::move(msg), arg}.MoveString());
 }
 
 // program was read from a .mod file for a submodule; return the name of the

diff  --git a/flang/test/Flang-Driver/include-module.f90 b/flang/test/Flang-Driver/include-module.f90
index 3abf6c8afa69..26e26a154599 100644
--- a/flang/test/Flang-Driver/include-module.f90
+++ b/flang/test/Flang-Driver/include-module.f90
@@ -31,8 +31,8 @@
 !-----------------------------------------
 ! EXPECTED OUTPUT FOR MISSING MODULE FILE
 !-----------------------------------------
-! SINGLEINCLUDE:Error reading module file for module 'basictestmoduletwo'
-! SINGLEINCLUDE-NOT:Error reading module file for module 'basictestmoduletwo'
+! SINGLEINCLUDE:error: Cannot read module file for module 'basictestmoduletwo'
+! SINGLEINCLUDE-NOT:error: Cannot read module file for module 'basictestmoduletwo'
 ! SINGLEINCLUDE-NOT:error: Derived type 't1' not found
 ! SINGLEINCLUDE:error: Derived type 't2' not found
 
@@ -44,7 +44,7 @@
 !---------------------------------------
 ! EXPECTED OUTPUT FOR ALL MODULES FOUND
 !---------------------------------------
-! INCLUDED-NOT:Error reading module file
+! INCLUDED-NOT:error: Cannot read module file
 ! INCLUDED-NOT:error: Derived type 't1' not found
 ! INCLUDED:error: Derived type 't2' not found
 

diff  --git a/flang/test/Semantics/resolve12.f90 b/flang/test/Semantics/resolve12.f90
index 967a0dcd8b37..241047a74d00 100644
--- a/flang/test/Semantics/resolve12.f90
+++ b/flang/test/Semantics/resolve12.f90
@@ -6,7 +6,7 @@ subroutine sub
 end
 
 use m1
-!ERROR: Error reading module file for module 'm2'
+!ERROR: Cannot read module file for module 'm2': Source file 'm2.mod' was not found
 use m2
 !ERROR: 'sub' is not a module
 use sub

diff  --git a/flang/test/Semantics/resolve26.f90 b/flang/test/Semantics/resolve26.f90
index daf5fbe15028..6daf8b640741 100644
--- a/flang/test/Semantics/resolve26.f90
+++ b/flang/test/Semantics/resolve26.f90
@@ -16,10 +16,10 @@ module subroutine s()
 submodule(m1) s1
 end
 
-!ERROR: Error reading module file for submodule 's1' of module 'm2'
+!ERROR: Cannot read module file for submodule 's1' of module 'm2': Source file 'm2-s1.mod' was not found
 submodule(m2:s1) s2
 end
 
-!ERROR: Error reading module file for module 'm3'
+!ERROR: Cannot read module file for module 'm3': Source file 'm3.mod' was not found
 submodule(m3:s1) s3
 end