[flang] Add missing symbol names to the error message

[eugeneepshteyn]

Fixes #140485

[eugeneepshteyn]

New output:

$ flang -c snfm_import_err02_2.f90
error: Semantic errors in snfm_import_err02_2.f90
./snfm_import_err02_2.f90:20:15: error: A distinct 'i' is already present in this scope
         import i
                ^
./snfm_import_err02_2.f90:7:14: Previous declaration of 'i'
    integer :: i
               ^
./snfm_import_err02_2.f90:11:14: Declaration of 'i' in host scope
    real    :: i
               ^

There are already semantic tests that check for this error, they are just checking the first error line.

[llvmbot]

@llvm/pr-subscribers-flang-semantics

Author: Eugene Epshteyn (eugeneepshteyn)

Changes

Fixes #140485

---

Full diff: https://github.com/llvm/llvm-project/pull/148888.diff

1 Files Affected:

• (modified) flang/lib/Semantics/resolve-names.cpp (+4-2)

diff --git a/flang/lib/Semantics/resolve-names.cpp b/flang/lib/Semantics/resolve-names.cpp
index 96faa5fd954cd..b3268605e7c0c 100644
--- a/flang/lib/Semantics/resolve-names.cpp
+++ b/flang/lib/Semantics/resolve-names.cpp
@@ -8574,8 +8574,10 @@ bool ResolveNamesVisitor::Pre(const parser::ImportStmt &x) {
         } else {
           Say(name,
               "A distinct '%s' is already present in this scope"_err_en_US)
-              .Attach(symbol->name(), "Previous declaration of '%s'"_en_US)
-              .Attach(outer->name(), "Declaration of '%s' in host scope"_en_US);
+              .Attach(symbol->name(), "Previous declaration of '%s'"_en_US,
+                  symbol->name().ToString())
+              .Attach(outer->name(), "Declaration of '%s' in host scope"_en_US,
+                  outer->name().ToString());
         }
       }
     } else {

[akuhlens]

LGTM, one improvement might be to add a test that checks the error message.